diff options
| author | gkodinov@dl145s.mysql.com <> | 2006-10-19 14:37:49 +0200 |
|---|---|---|
| committer | gkodinov@dl145s.mysql.com <> | 2006-10-19 14:37:49 +0200 |
| commit | 892495acaffb5a773b72fce40d7d98f27ee6a0ae (patch) | |
| tree | c3a1127047a1868f79176592df1bdfc289fd4abf /sql/mysql_priv.h | |
| parent | 9c0b8726621b38ec4880fb225315f141bc978372 (diff) | |
| parent | 3a4a9521d84292f8df21cdd484ac10c62087bb7b (diff) | |
| download | mariadb-git-892495acaffb5a773b72fce40d7d98f27ee6a0ae.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 381f2a989b5..75525b5ac33 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -659,6 +659,9 @@ int quick_rm_table(enum db_type base,const char *db, const char *table_name); void close_cached_table(THD *thd, TABLE *table); bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list); +bool do_rename(THD *thd, TABLE_LIST *ren_table, char *new_db, + char *new_table_name, char *new_table_alias, + bool skip_error); bool mysql_change_db(THD *thd,const char *name,bool no_access_check); void mysql_parse(THD *thd,char *inBuf,uint length); bool mysql_test_parse_for_slave(THD *thd,char *inBuf,uint length); @@ -722,7 +725,8 @@ bool mysql_xa_recover(THD *thd); bool check_simple_select(); -SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length); +SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length, + SORT_FIELD *sortorder); int setup_order(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, List<Item> &fields, List <Item> &all_fields, ORDER *order); int setup_group(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, |