summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-08-23 12:26:08 +0300
committerunknown <monty@narttu.mysql.fi>2003-08-23 12:26:08 +0300
commit2ad17fa6e0e99ddd5d78a941bee7221808ee773f (patch)
tree9494dedeb03c63a32edf2a67eea121fc3dab1906 /sql/sql_table.cc
parent2d2f57654521df494afc41545322e0ebb0ec47a4 (diff)
parentaf9b771a32e232788c82f34590c47037c194e177 (diff)
downloadmariadb-git-2ad17fa6e0e99ddd5d78a941bee7221808ee773f.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0 sql/mysql_priv.h: Auto merged sql/sql_table.cc: Auto merged
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 16fe3e0db5a..3250db75a6a 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -747,7 +747,10 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
thd->proc_info="creating table";
+ if (thd->sql_mode & MODE_NO_DIR_IN_CREATE)
+ create_info->data_file_name= create_info->index_file_name= 0;
create_info->table_options=db_options;
+
if (rea_create_table(path, create_info, fields, key_count,
key_info_buffer))
{