diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 11:02:56 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 11:02:56 +0200 |
| commit | 8cc480915f51c29b1334b28fb84e92721a1b3914 (patch) | |
| tree | f61c971fc2f173b68efd04f3f22adc538934ec92 /sql/mysql_priv.h | |
| parent | 3ad2baa17293a8e2a5dc7f3803e97b380f1c1d5d (diff) | |
| parent | 5e1fe0f80043993c1db64169e4d87eb787762763 (diff) | |
| download | mariadb-git-8cc480915f51c29b1334b28fb84e92721a1b3914.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
mysql-test/r/myisam.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 48d638bee9c..1636b5a31e4 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, |