1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge with 3.23.51

Fixed wrong usage of sprintf() in ha_innodb.cc
This commit is contained in:
monty@mashka.mysql.fi
2002-07-25 22:46:28 +03:00
134 changed files with 4227 additions and 4734 deletions

View File

@ -23,6 +23,10 @@
#include <my_dir.h>
#include <assert.h>
#ifdef HAVE_INNOBASE_DB
#include "ha_innobase.h"
#endif
#ifdef HAVE_OPENSSL
/*
Without SSL the handshake consists of one packet. This packet
@ -1427,6 +1431,16 @@ mysql_execute_command(void)
res = load_master_data(thd);
break;
#ifdef HAVE_INNOBASE_DB
case SQLCOM_SHOW_INNODB_STATUS:
{
if (check_process_priv(thd))
goto error;
res = innodb_show_status(thd);
break;
}
#endif
case SQLCOM_LOAD_MASTER_TABLE:
{
if (!tables->db)