diff options
| author | unknown <jcole@tetra.spaceapes.com> | 2000-11-11 23:27:23 -0600 |
|---|---|---|
| committer | unknown <jcole@tetra.spaceapes.com> | 2000-11-11 23:27:23 -0600 |
| commit | 09b4480ed1b52a2aba0780c8de3d523badd9b761 (patch) | |
| tree | 9d4ddae9f8a105ea62f9c8286bb4dce860339b59 /sql/mysql_priv.h | |
| parent | 6147228097979d230294d8607f462f2f0c56c397 (diff) | |
| parent | 23f2aaf76bcb39e919d66dc48f0a25d1b7b6eab5 (diff) | |
| download | mariadb-git-09b4480ed1b52a2aba0780c8de3d523badd9b761.tar.gz | |
Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
BitKeeper/etc/logging_ok:
Auto merged
Docs/manual.texi:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 384d98de40a..bc76b128d54 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -268,6 +268,10 @@ bool net_store_data(String *packet,const char *from,uint length); bool net_store_data(String *packet,struct tm *tmp); bool net_store_data(String* packet, I_List<i_string>* str_list); +SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length); +int setup_order(THD *thd,TABLE_LIST *tables, List<Item> &fields, + List <Item> &all_fields, ORDER *order); + int mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &list,COND *conds, List<Item_func_match> &ftfuncs, ORDER *order, ORDER *group,Item *having,ORDER *proc_param, @@ -294,6 +298,7 @@ int mysql_alter_table(THD *thd, char *new_db, char *new_name, List<create_field> &fields, List<Key> &keys,List<Alter_drop> &drop_list, List<Alter_column> &alter_list, + ORDER *order, bool drop_primary, enum enum_duplicates handle_duplicates); bool mysql_rename_table(enum db_type base, |