Skip to content

M
MariaDB
Commit b396d858 authored by serg@sergbook.mysql.com's avatar serg@sergbook.mysql.com
Browse files
Options

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
parents 9ac28241 b9cb8c9d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
sql/sql_lex.cc
View file @ b396d858
...@@ -1772,8 +1772,10 @@ st_lex::st_lex() ...@@ -1772,8 +1772,10 @@ 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)
{ {
#ifndef __WIN__
/* 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);
#endif
my_init_dynamic_array2(&plugins, sizeof(plugin_ref), my_init_dynamic_array2(&plugins, sizeof(plugin_ref),
plugins_static_buffer, 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7