mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for Hand-Merge

Browse source
This commit is contained in:
unknown 2004-04-07 16:06:09 +02:00
parent cc168fc6fd
commit 1bfdb17777
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/sql_table.cc
View file

@ -418,9 +418,7 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
ulong pos;
KEY *key_info;
KEY_PART_INFO *key_part_info;
int auto_increment=0;
int timestamps= 0, timestamps_with_niladic= 0;
handler *file;
int field_no,dup_no;
int select_field_pos,auto_increment=0;
DBUG_ENTER("mysql_prepare_table");
@ -2501,6 +2499,7 @@ int real_alter_table(THD *thd,char *new_db, char *new_name,
char tmp_name[80],old_name[32],new_name_buff[FN_REFLEN];
char new_alias_buff[FN_REFLEN], *table_name, *db, *new_alias, *alias;
char index_file[FN_REFLEN], data_file[FN_REFLEN];
bool use_timestamp=0;
ha_rows copied,deleted;
ulonglong next_insert_id;
uint db_create_options, used_fields;