1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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.
This commit is contained in:
unknown
2008-03-04 17:13:34 +02:00
parent 79ca1004cb
commit 09e4e954c3
6 changed files with 93 additions and 28 deletions

View File

@ -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':