diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-09-07 15:14:32 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-09-07 15:14:32 +0300 |
| commit | c9d1bdfac3956f5b32e338e620bd5698439bb43c (patch) | |
| tree | be7b1a2d3f4e095333e132c4c05dff1654b94589 /sql/sql_table.cc | |
| parent | 08e274758715ead9d55f6b838a36dd1e732facf6 (diff) | |
| parent | 84b296e24230f43bff0129ff06d33efd7db33f2c (diff) | |
| download | mariadb-git-c9d1bdfac3956f5b32e338e620bd5698439bb43c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-tmp
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 6ea7003eba6..0a2821e02e3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -916,7 +916,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(thd, path, create_info, fields, key_count, key_info_buffer)) { |