diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-03-04 17:13:34 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-03-04 17:13:34 +0200 |
| commit | 09e4e954c36663bb7824b9b8b5daff706f53a2a6 (patch) | |
| tree | 9e10c98a209dd0ecefc7b4e3b81d5c549ec3c088 /sql/mysqld.cc | |
| parent | 79ca1004cb5c5470569e03f6200b351a3e390bbc (diff) | |
| download | mariadb-git-09e4e954c36663bb7824b9b8b5daff706f53a2a6.tar.gz | |
Fixed crashing bug when starting mysqld with --dbug
Fixed crash when using other maria block size than 8192
Fixed bug that caused tables to be reported as crashed if maria_log_control was deleted
mysql-test/valgrind.supp:
Suppress leaks on SuSE 10.3, x86 64 bit
sql/mysqld.cc:
Don't give warning in case of timeout for pthread_cond_timedwait
Fixed crashing bug when starting mysqld with --dbug
storage/maria/ha_maria.cc:
Fixed crash when using other block size than 8192 (Crash happend later in bitmap page handling)
storage/maria/ma_locking.c:
When we write a new uuid for a zerofilled file, also update the lsn's
storage/maria/ma_open.c:
Don't update lsn on open. Wait until first time file is changed
Fixed bug that caused tables to be reported as crashed if maria_log_control was deleted
strings/strmake.c:
Fixed warnings for strings without end 0 when running under valgrind.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 36dda2a4178..b2d2f4cae92 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -800,7 +800,7 @@ static void close_connections(void) break; } #ifdef EXTRA_DEBUG - if (error != 0 && !count++) + if (error != 0 && error != ETIMEDOUT && !count++) sql_print_error("Got error %d from pthread_cond_timedwait",error); #endif close_server_sock(); @@ -7445,15 +7445,17 @@ mysqld_get_one_option(int optid, { switch(optid) { case '#': - if (*argument == '0') + if (!argument) + argument= (char*) default_dbug_option; + if (argument[0] == '0' && !argument[1]) { DEBUGGER_OFF; break; } DEBUGGER_ON; - if (*argument == '1') + if (argument[0] == '1' && !argument[1]) break; - DBUG_SET_INITIAL(argument ? argument : default_dbug_option); + DBUG_SET_INITIAL(argument); opt_endinfo=1; /* unireg: memory allocation */ break; case 'a': |