diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-18 20:04:01 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-18 20:04:01 +0500 |
| commit | f0abfddf07d55368cf758b267eec2df37fc7abb5 (patch) | |
| tree | ffabc9ad4be9f55e1d0a61dbddd9679188670eaf /sql/sql_lex.cc | |
| parent | 10797328dab604be3696e4dd8351fc4bf358702e (diff) | |
| parent | e0d006f348624cab63d0b193ca4f4c810dee3df5 (diff) | |
| download | mariadb-git-f0abfddf07d55368cf758b267eec2df37fc7abb5.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 0d2621e9b9c..65e5f8035e4 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1784,7 +1784,7 @@ void Query_tables_list::destroy_query_tables_list() st_lex::st_lex() :result(0), yacc_yyss(0), yacc_yyvs(0), - sql_command(SQLCOM_END) + sql_command(SQLCOM_END), option_type(OPT_DEFAULT) { /* Check that plugins_static_buffer is declared immediately after plugins */ compile_time_assert((&plugins + 1) == (DYNAMIC_ARRAY*)plugins_static_buffer); |