database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

merged

Browse Source 
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2004-07-21 23:32:11 +02:00
parent 3efc721a3c 062ac038df
commit a9856042bc
42 changed files with 262 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_lex.h
View File

@@ -406,7 +406,7 @@ public:
int change_result(select_subselect *result, select_subselect *old_result);
void set_limit(st_select_lex *values, st_select_lex *sl);
friend void mysql_init_query(THD *thd, bool lexonly);
friend void mysql_init_query(THD *thd, uchar *buf, uint length, bool lexonly);
friend int subselect_union_engine::exec();
};
typedef class st_select_lex_unit SELECT_LEX_UNIT;
@@ -560,7 +560,7 @@ public:
bool test_limit();
friend void mysql_init_query(THD *thd, bool lexonly);
friend void mysql_init_query(THD *thd, uchar *buf, uint length, bool lexonly);
st_select_lex() {}
void make_empty_select()
{
@@ -765,7 +765,7 @@ struct st_lex_local: public st_lex
void lex_init(void);
void lex_free(void);
LEX *lex_start(THD *thd, uchar *buf,uint length);
void lex_start(THD *thd, uchar *buf,uint length);
void lex_end(LEX *lex);
extern pthread_key(LEX*,THR_LEX);