Commit 5d8c8803 authored by unknown's avatar unknown

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

parents d200346e d2250317
...@@ -1770,7 +1770,7 @@ void Query_tables_list::destroy_query_tables_list() ...@@ -1770,7 +1770,7 @@ void Query_tables_list::destroy_query_tables_list()
st_lex::st_lex() st_lex::st_lex()
:result(0), yacc_yyss(0), yacc_yyvs(0), :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 */ /* Check that plugins_static_buffer is declared immediately after plugins */
compile_time_assert((&plugins + 1) == (DYNAMIC_ARRAY*)plugins_static_buffer); compile_time_assert((&plugins + 1) == (DYNAMIC_ARRAY*)plugins_static_buffer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment