diff options
| author | unknown <serg@serg.mylan> | 2004-09-07 16:56:31 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-09-07 16:56:31 +0200 |
| commit | 49d90b09f558b30adf1578dfcaf7d094e51609bd (patch) | |
| tree | 591d9095c5fdaf5a6a4b5e8aa59d0dff5a84c6aa /sql/sql_table.cc | |
| parent | 77a86154880e0e4b8528f2363317c480dff62fe0 (diff) | |
| download | mariadb-git-49d90b09f558b30adf1578dfcaf7d094e51609bd.tar.gz | |
after merge fixes
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 129d63ff529..7f9898df76e 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -35,8 +35,7 @@ #define reenable_binlog(A) (A)->options= save_options; -//extern HASH open_cache; // leftover from the merge. to be deleted -static const char *primary_key_name="PRIMARY"; +const char *primary_key_name="PRIMARY"; static bool check_if_keyname_exists(const char *name,KEY *start, KEY *end); static char *make_unique_key_name(const char *field_name,KEY *start,KEY *end); @@ -1398,7 +1397,7 @@ TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, open_table(). */ tmp_disable_binlog(thd); - if (mysql_create_table(thd,db,name,create_info,*extra_fields, + if (!mysql_create_table(thd,db,name,create_info,*extra_fields, *keys,0,select_field_count)) { if (!(table=open_table(thd,db,name,name,(bool*) 0))) |