diff options
author | unknown <kostja@vajra.(none)> | 2007-05-24 19:23:52 +0400 |
---|---|---|
committer | unknown <kostja@vajra.(none)> | 2007-05-24 19:23:52 +0400 |
commit | c8236f564c3e7fc5e12efb108e8b378a455290aa (patch) | |
tree | 2aabe5fa8318146f9e0c470b21d49e3cdf39338d /sql/mysql_priv.h | |
parent | 351abe5a893d3ae2a0fe004f4a7d73cdd4e9ae14 (diff) | |
parent | f9d7642e7b46d911cda5512ac0bcb55dd85dcd95 (diff) | |
download | mariadb-git-c8236f564c3e7fc5e12efb108e8b378a455290aa.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into vajra.(none):/opt/local/work/mysql-5.0-runtime
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
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 ea472691760..7a307c3be85 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -816,9 +816,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, |