diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 17:28:49 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 17:28:49 +0200 |
| commit | 1c72c3a8c1c0456e7bef9b3850d4ede9dfd5365d (patch) | |
| tree | e7c3ff175d2ecad48c72ce1b883e1b4ba2fdf561 /sql/mysql_priv.h | |
| parent | 986b92dee4dc640cc64027cd0032c92b90482107 (diff) | |
| parent | e21076463c4c1721bfd7150ff2350d634009755a (diff) | |
| download | mariadb-git-1c72c3a8c1c0456e7bef9b3850d4ede9dfd5365d.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index b2a5bc31eb3..0aaa1744fe1 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -813,9 +813,8 @@ bool mysql_alter_table(THD *thd, char *new_db, char *new_name, Alter_info *alter_info, uint order_num, ORDER *order, bool ignore); bool mysql_recreate_table(THD *thd, TABLE_LIST *table_list); -bool mysql_create_like_table(THD *thd, TABLE_LIST *table, - HA_CREATE_INFO *create_info, - Table_ident *src_table); +bool mysql_create_like_table(THD *thd, TABLE_LIST *table, TABLE_LIST *src_table, + HA_CREATE_INFO *create_info); bool mysql_rename_table(enum db_type base, const char *old_db, const char * old_name, |