summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-02-02 17:39:27 +0200
committerunknown <bell@sanja.is.com.ua>2003-02-02 17:39:27 +0200
commit982262333345aab1644ba80fae457d0400a10b16 (patch)
tree01db95e610e731f6b73024681bedd580db4c0a8c /sql/sql_class.cc
parentc7c45bf28bb76ddce9aa92c4205ab51cde49197f (diff)
parentb58dd39b9923cfe0bb30cdc3d1c533ea1976c278 (diff)
downloadmariadb-git-982262333345aab1644ba80fae457d0400a10b16.tar.gz
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1 sql/item_func.cc: Auto merged sql/log_event.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index f70bd304618..3975f65a43c 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -146,6 +146,17 @@ THD::THD():user_time(0), is_fatal_error(0),
(hash_get_key) get_var_key,
(hash_free_key) free_user_var,0);
+ /* For user vars replication*/
+ if (opt_bin_log)
+ my_init_dynamic_array(&user_var_events,
+ sizeof(BINLOG_USER_VAR_EVENT *),
+ 16,
+ 16);
+ else
+ bzero((char*) &user_var_events, sizeof(user_var_events));
+
+
+
/* Prepared statements */
last_prepared_stmt= 0;
init_tree(&prepared_statements, 0, 0, sizeof(PREP_STMT),
@@ -244,6 +255,7 @@ void THD::cleanup(void)
close_thread_tables(this);
}
close_temporary_tables(this);
+ delete_dynamic(&user_var_events);
hash_free(&user_vars);
if (global_read_lock)
unlock_global_read_lock(this);