database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-02-01 00:54:03 +01:00
parent ce02738d7f 6b6d40fa6c
commit 59d9d08e2b
304 changed files with 12473 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/handler.cc
View File

@@ -44,6 +44,7 @@
#include "probes_mysql.h"
#include "debug_sync.h" // DEBUG_SYNC
#include "sql_audit.h"
#include <my_handler_errors.h>
#ifdef WITH_PARTITION_STORAGE_ENGINE
#include "ha_partition.h"
@@ -3260,7 +3261,7 @@ void handler::print_error(int error, myf errflag)
}
}
else
my_error(ER_GET_ERRNO, errflag, error, table_type());
my_error(ER_GET_ERRNO, errflag, error, table_type());
DBUG_VOID_RETURN;
}
}
@@ -5181,8 +5182,10 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
"", 0, "DISABLED", 8) ? 1 : 0;
}
else
{
result= db_type->show_status &&
db_type->show_status(db_type, thd, stat_print, stat) ? 1 : 0;
}
}
/*