1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
This commit is contained in:
tsmith@siva.hindu.god
2007-01-18 09:53:30 -07:00
31 changed files with 272 additions and 147 deletions

View File

@@ -2503,6 +2503,12 @@ mysql_execute_command(THD *thd)
create_info.alias= create_table->alias;
#ifndef HAVE_READLINK
if (create_info.data_file_name)
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
"DATA DIRECTORY option ignored");
if (create_info.index_file_name)
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
"INDEX DIRECTORY option ignored");
create_info.data_file_name= create_info.index_file_name= NULL;
#else
/* Fix names if symlinked tables */