diff options
| author | unknown <thek@adventure.(none)> | 2007-11-21 11:25:17 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-11-21 11:25:17 +0100 |
| commit | bc54a3736f64fa320475a290903d987b6aea97ea (patch) | |
| tree | 8d7492ebc1f5101e4152cfe287baaa8e2b10a809 /sql/sql_prepare.cc | |
| parent | ded7fe7fd16d35b0a63a7a417b67fdd31df5033d (diff) | |
| parent | bb681dbc883343ed2c503c15833720f8da499317 (diff) | |
| download | mariadb-git-bc54a3736f64fa320475a290903d987b6aea97ea.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153
into adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_yacc.yy:
Null merge.
sql/sql_base.cc:
Manual merge
sql/sql_lex.h:
Manual merge
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 05743b6dfe3..3ae4f152edf 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'; } |