Commit 445b5ebe authored by konstantin@mysql.com's avatar konstantin@mysql.com

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-prep
parents 3382eea7 2d4fbe5a
...@@ -1193,7 +1193,7 @@ Prepared_statement::Prepared_statement(THD *thd_arg) ...@@ -1193,7 +1193,7 @@ Prepared_statement::Prepared_statement(THD *thd_arg)
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
setup_params= insert_params; // not fully qualified query setup_params= insert_params; // not fully qualified query
#else #else
setup_params_data= setup_params_data; setup_params_data= ::setup_params_data;
#endif #endif
} }
......
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