diff options
| author | unknown <thek@adventure.(none)> | 2007-11-21 20:57:28 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-11-21 20:57:28 +0100 |
| commit | 569c2dcd12735d249e3fc6b7eb41d61c4b565432 (patch) | |
| tree | 56a4502f7ac333265e9987599f455992b346a5e2 /sql/sql_prepare.cc | |
| parent | dd98703b482a6d39772129c658f40679778c57b0 (diff) | |
| parent | bc54a3736f64fa320475a290903d987b6aea97ea (diff) | |
| download | mariadb-git-569c2dcd12735d249e3fc6b7eb41d61c4b565432.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index b1b1502f015..9d4d62e57b6 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2700,7 +2700,7 @@ Prepared_statement::Prepared_statement(THD *thd_arg, Protocol *protocol_arg) last_errno(0), flags((uint) IS_IN_USE) { - init_alloc_root(&main_mem_root, thd_arg->variables.query_alloc_block_size, + init_sql_alloc(&main_mem_root, thd_arg->variables.query_alloc_block_size, thd_arg->variables.query_prealloc_size); *last_error= '\0'; } |