summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-10-11 22:00:24 +0300
committermonty@mashka.mysql.fi <>2003-10-11 22:00:24 +0300
commitc95d142f8f602b717c6c10d13e37b2b3ecf069d4 (patch)
tree50a7bfd87153439907087d4b3529d622cfc75313 /sql/log_event.cc
parent9bba878b8c6b6abd9be97a9d5a6c89bda8762693 (diff)
downloadmariadb-git-c95d142f8f602b717c6c10d13e37b2b3ecf069d4.tar.gz
Add new user variables for tuning memory usage:
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size Add more checks for "out of memory" detection in range optimization
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 3e9064a78ea..699d1ff866d 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1771,7 +1771,7 @@ void Unknown_log_event::print(FILE* file, bool short_form, char* last_db)
int Query_log_event::exec_event(struct st_relay_log_info* rli)
{
int expected_error, actual_error= 0;
- init_sql_alloc(&thd->mem_root, 8192,0);
+ init_sql_alloc(&thd->mem_root, thd->variables.query_alloc_block_size,0);
thd->db= (char*) rewrite_db(db);
/*
@@ -1912,7 +1912,7 @@ Default database: '%s'",
int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
bool use_rli_only_for_errors)
{
- init_sql_alloc(&thd->mem_root, 8192,0);
+ init_sql_alloc(&thd->mem_root, thd->variables.query_alloc_block_size, 0);
thd->db= (char*) rewrite_db(db);
DBUG_ASSERT(thd->query == 0);
thd->query = 0; // Should not be needed