diff options
| author | unknown <monty@mysql.com> | 2004-11-08 01:15:26 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-08 01:15:26 +0200 |
| commit | 8793e2197aeab3a2d434a180f804f295de3a3cce (patch) | |
| tree | ddbbaad823b7a741dae3314b9b8bbe356fe88f7b /sql/repl_failsafe.cc | |
| parent | d93ff572cde923210d902988e4aeedcd0d56e99b (diff) | |
| parent | 435b20aa6897b142f90267ea3ed7a7cef1cc385a (diff) | |
| download | mariadb-git-8793e2197aeab3a2d434a180f804f295de3a3cce.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_select.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 83fceca80ef..720e82f414e 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -92,7 +92,7 @@ static int init_failsafe_rpl_thread(THD* thd) VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals)); #endif - thd->mem_root.free=thd->mem_root.used=0; + thd->mem_root->free= thd->mem_root->used= 0; if (thd->variables.max_join_size == HA_POS_ERROR) thd->options|= OPTION_BIG_SELECTS; |