diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-07 13:36:29 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-07 13:36:29 +0400 |
| commit | b0087312df0e6ad7913c105df98031d39cc2691c (patch) | |
| tree | 675057cb210faaf2f823943a2bd8fde385087fc2 /sql/sql_parse.cc | |
| parent | 1d298246e4c1d3d856e5131d582cbca70073f646 (diff) | |
| parent | 2f7bf9fc873e47b618fc90bb65458b7474d53496 (diff) | |
| download | mariadb-git-b0087312df0e6ad7913c105df98031d39cc2691c.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.pass
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 54cb3ade404..c867112bb2a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2905,6 +2905,12 @@ mysql_init_query(THD *thd) thd->lex.select_lex.table_list.first=0; thd->lex.select_lex.table_list.next= (byte**) &thd->lex.select_lex.table_list.first; thd->lex.select_lex.next=0; + /* + select_lex.options is also inited in dispatch_command(), but for + replication (which bypasses dispatch_command() and calls mysql_parse() + directly) we must do it here. + */ + thd->lex.select_lex.options=0; thd->lex.olap=0; thd->lex.select->olap= UNSPECIFIED_OLAP_TYPE; thd->fatal_error=0; // Safety |