diff options
| author | unknown <serg@serg.mylan> | 2005-01-24 15:50:13 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-24 15:50:13 +0100 |
| commit | ba3b78d968c56806d8606e47bc4555a8436004c6 (patch) | |
| tree | 8f16454d52b7844621e51a609323f1638a14e22e /mysys | |
| parent | 343e9bbd34ecd89deb7d28214e23171894b8b2a0 (diff) | |
| parent | 8bdb500105f97e3007e652f73d99c373d38f2aad (diff) | |
| download | mariadb-git-ba3b78d968c56806d8606e47bc4555a8436004c6.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
mysys/mf_keycache.c:
Auto merged
sql/item.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_keycache.c | 1 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index a1227989a4b..9feaf8dcd57 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -352,6 +352,7 @@ int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size, MYF(0)))) break; my_free_lock(keycache->block_mem, MYF(0)); + keycache->block_mem= 0; } if (blocks < 8) { diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index caef1caaf3d..19611a6027a 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -248,7 +248,7 @@ void thr_end_alarm(thr_alarm_t *alarmed) if (alarm_data->malloced) my_free((gptr) alarm_data,MYF(0)); found++; -#ifndef DBUG_OFF +#ifdef DBUG_OFF break; #endif } |