Skip to content

M
mariadb
Commit fa5feec0 authored by unknown's avatar unknown
Browse files
Options

Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667 

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667


include/my_sys.h:
  Auto merged
mysys/Makefile.am:
  Auto merged
tests/Makefile.am:
  Auto merged
parents fb2c04a1 28d799f1
Hide whitespace changes
Inline Side-by-side
Showing with 385 additions and 397 deletions
include/my_sys.h
View file @ fa5feec0
...@@ -601,6 +601,11 @@ extern char *_my_strndup(const byte *from, uint length, ...@@ -601,6 +601,11 @@ extern char *_my_strndup(const byte *from, uint length,
const char *sFile, uint uLine, const char *sFile, uint uLine,
myf MyFlag); myf MyFlag);
/* implemented in my_memmem.c */
extern void *my_memmem(const void *haystack, size_t haystacklen,
const void *needle, size_t needlelen);
#ifdef __WIN__ #ifdef __WIN__
extern int my_access(const char *path, int amode); extern int my_access(const char *path, int amode);
extern File my_sopen(const char *path, int oflag, int shflag, int pmode); extern File my_sopen(const char *path, int oflag, int shflag, int pmode);
......
mysys/Makefile.am
View file @ fa5feec0
...@@ -53,6 +53,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ ...@@ -53,6 +53,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
charset.c charset-def.c my_bitmap.c my_bit.c md5.c \ charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
my_gethostbyname.c rijndael.c my_aes.c sha1.c \ my_gethostbyname.c rijndael.c my_aes.c sha1.c \
my_handler.c my_netware.c my_largepage.c \ my_handler.c my_netware.c my_largepage.c \
my_memmem.c \
my_windac.c my_access.c base64.c my_windac.c my_access.c base64.c
EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
thr_mutex.c thr_rwlock.c \ thr_mutex.c thr_rwlock.c \
......
mysys/mf_iocache2.c
View file @ fa5feec0
...@@ -252,37 +252,89 @@ uint my_b_printf(IO_CACHE *info, const char* fmt, ...) ...@@ -252,37 +252,89 @@ uint my_b_printf(IO_CACHE *info, const char* fmt, ...)
uint my_b_vprintf(IO_CACHE *info, const char* fmt, va_list args) uint my_b_vprintf(IO_CACHE *info, const char* fmt, va_list args)
{ {
uint out_length=0; uint out_length=0;
uint minimum_width; /* as yet unimplemented */
uint minimum_width_sign;
uint precision; /* as yet unimplemented for anything but %b */
for (; *fmt ; fmt++) /*
Store the location of the beginning of a format directive, for the
case where we learn we shouldn't have been parsing a format string
at all, and we don't want to lose the flag/precision/width/size
information.
*/
const char* backtrack;
for (; *fmt != '\0'; fmt++)
{ {
if (*fmt++ != '%') /* Copy everything until '%' or end of string */
const char *start=fmt;
uint length;
for (; (*fmt != '\0') && (*fmt != '%'); fmt++) ;
length= (uint) (fmt - start);
out_length+=length;
if (my_b_write(info, start, length))
goto err;
if (*fmt == '\0') /* End of format */
{ {
/* Copy everything until '%' or end of string */ return out_length;
const char *start=fmt-1;
uint length;
for (; *fmt && *fmt != '%' ; fmt++ ) ;
length= (uint) (fmt - start);
out_length+=length;
if (my_b_write(info, start, length))
goto err;
if (!*fmt) /* End of format */
{
return out_length;
}
fmt++;
/* Found one '%' */
} }
/*
By this point, *fmt must be a percent; Keep track of this location and
skip over the percent character.
*/
DBUG_ASSERT(*fmt == '%');
backtrack= fmt;
fmt++;
minimum_width= 0;
precision= 0;
minimum_width_sign= 1;
/* Skip if max size is used (to be compatible with printf) */ /* Skip if max size is used (to be compatible with printf) */
while (my_isdigit(&my_charset_latin1, *fmt) || *fmt == '.' || *fmt == '-') while (*fmt == '-') { fmt++; minimum_width_sign= -1; }
if (*fmt == '*') {
precision= (int) va_arg(args, int);
fmt++;
} else {
while (my_isdigit(&my_charset_latin1, *fmt)) {
minimum_width=(minimum_width * 10) + (*fmt - '0');
fmt++;
}
}
minimum_width*= minimum_width_sign;
if (*fmt == '.') {
fmt++; fmt++;
if (*fmt == '*') {
precision= (int) va_arg(args, int);
fmt++;
} else {
while (my_isdigit(&my_charset_latin1, *fmt)) {
precision=(precision * 10) + (*fmt - '0');
fmt++;
}
}
}
if (*fmt == 's') /* String parameter */ if (*fmt == 's') /* String parameter */
{ {
reg2 char *par = va_arg(args, char *); reg2 char *par = va_arg(args, char *);
uint length = (uint) strlen(par); uint length = (uint) strlen(par);
/* TODO: implement minimum width and precision */
out_length+=length; out_length+=length;
if (my_b_write(info, par, length)) if (my_b_write(info, par, length))
goto err; goto err;
} }
else if (*fmt == 'b') /* Sized buffer parameter, only precision makes sense */
{
char *par = va_arg(args, char *);
out_length+= precision;
if (my_b_write(info, par, precision))
goto err;
}
else if (*fmt == 'd' || *fmt == 'u') /* Integer parameter */ else if (*fmt == 'd' || *fmt == 'u') /* Integer parameter */
{ {
register int iarg; register int iarg;
...@@ -317,9 +369,9 @@ uint my_b_vprintf(IO_CACHE *info, const char* fmt, va_list args) ...@@ -317,9 +369,9 @@ uint my_b_vprintf(IO_CACHE *info, const char* fmt, va_list args)
else else
{ {
/* %% or unknown code */ /* %% or unknown code */
if (my_b_write(info, "%", 1)) if (my_b_write(info, backtrack, fmt-backtrack))
goto err; goto err;
out_length++; out_length+= fmt-backtrack;
} }
} }
return out_length; return out_length;
......
mysys/my_memmem.c 0 → 100644
View file @ fa5feec0
#include "my_base.h"
/*
my_memmem, port of a GNU extension.
Returns a pointer to the beginning of the substring, needle, or NULL if the
substring is not found in haystack.
*/
void *my_memmem(const void *haystack, size_t haystacklen,
const void *needle, size_t needlelen)
{
const void *cursor;
const void *last_possible_needle_location = haystack + haystacklen - needlelen;
/* Easy answers */
if (needlelen > haystacklen) return(NULL);
if (needle == NULL) return(NULL);
if (haystack == NULL) return(NULL);
if (needlelen == 0) return(NULL);
if (haystacklen == 0) return(NULL);
for (cursor = haystack; cursor <= last_possible_needle_location; cursor++) {
if (memcmp(needle, cursor, needlelen) == 0) {
return((void *) cursor);
}
}
return(NULL);
}
#ifdef MAIN
#include <assert.h>
int main(int argc, char *argv[]) {
char haystack[10], needle[3];
memmove(haystack, "0123456789", 10);
memmove(needle, "no", 2);
assert(my_memmem(haystack, 10, needle, 2) == NULL);
memmove(needle, "345", 3);
assert(my_memmem(haystack, 10, needle, 3) != NULL);
memmove(needle, "789", 3);
assert(my_memmem(haystack, 10, needle, 3) != NULL);
assert(my_memmem(haystack, 9, needle, 3) == NULL);
memmove(needle, "012", 3);
assert(my_memmem(haystack, 10, needle, 3) != NULL);
assert(my_memmem(NULL, 10, needle, 3) == NULL);
assert(my_memmem(NULL, 10, needle, 3) == NULL);
assert(my_memmem(haystack, 0, needle, 3) == NULL);
assert(my_memmem(haystack, 10, NULL, 3) == NULL);
assert(my_memmem(haystack, 10, needle, 0) == NULL);
assert(my_memmem(haystack, 1, needle, 3) == NULL);
printf("success\n");
return(0);
}
#endif
sql/sql_parse.cc
View file @ fa5feec0
...@@ -17,16 +17,22 @@ ...@@ -17,16 +17,22 @@
#define MYSQL_LEX 1 #define MYSQL_LEX 1
#include "mysql_priv.h" #include "mysql_priv.h"
#include "sql_repl.h" #include "sql_repl.h"
#include "rpl_filter.h"
#include "repl_failsafe.h" #include "repl_failsafe.h"
#include <m_ctype.h> #include <m_ctype.h>
#include <myisam.h> #include <myisam.h>
#include <my_dir.h> #include <my_dir.h>
#ifdef HAVE_INNOBASE_DB
#include "ha_innodb.h"
#endif
#ifdef HAVE_NDBCLUSTER_DB
#include "ha_ndbcluster.h"
#endif
#include "sp_head.h" #include "sp_head.h"
#include "sp.h" #include "sp.h"
#include "sp_cache.h" #include "sp_cache.h"
#include "event.h"
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
/* /*
...@@ -68,41 +74,19 @@ static void decrease_user_connections(USER_CONN *uc); ...@@ -68,41 +74,19 @@ static void decrease_user_connections(USER_CONN *uc);
static bool check_db_used(THD *thd,TABLE_LIST *tables); static bool check_db_used(THD *thd,TABLE_LIST *tables);
static bool check_multi_update_lock(THD *thd); static bool check_multi_update_lock(THD *thd);
static void remove_escape(char *name); static void remove_escape(char *name);
static bool append_file_to_dir(THD *thd, const char **filename_ptr,
const char *table_name);
const char *any_db="*any*"; // Special symbol for check_access const char *any_db="*any*"; // Special symbol for check_access
LEX_STRING command_name[]={ const char *command_name[]={
(char *)STRING_WITH_LEN("Sleep"), "Sleep", "Quit", "Init DB", "Query", "Field List", "Create DB",
(char *)STRING_WITH_LEN("Quit"), "Drop DB", "Refresh", "Shutdown", "Statistics", "Processlist",
(char *)STRING_WITH_LEN("Init DB"), "Connect","Kill","Debug","Ping","Time","Delayed insert","Change user",
(char *)STRING_WITH_LEN("Query"), "Binlog Dump","Table Dump", "Connect Out", "Register Slave",
(char *)STRING_WITH_LEN("Field List"), "Prepare", "Execute", "Long Data", "Close stmt",
(char *)STRING_WITH_LEN("Create DB"), "Reset stmt", "Set option", "Fetch",
(char *)STRING_WITH_LEN("Drop DB"), "Error" // Last command number
(char *)STRING_WITH_LEN("Refresh"),
(char *)STRING_WITH_LEN("Shutdown"),
(char *)STRING_WITH_LEN("Statistics"),
(char *)STRING_WITH_LEN("Processlist"),
(char *)STRING_WITH_LEN("Connect"),
(char *)STRING_WITH_LEN("Kill"),
(char *)STRING_WITH_LEN("Debug"),
(char *)STRING_WITH_LEN("Ping"),
(char *)STRING_WITH_LEN("Time"),
(char *)STRING_WITH_LEN("Delayed insert"),
(char *)STRING_WITH_LEN("Change user"),
(char *)STRING_WITH_LEN("Binlog Dump"),
(char *)STRING_WITH_LEN("Table Dump"),
(char *)STRING_WITH_LEN("Connect Out"),
(char *)STRING_WITH_LEN("Register Slave"),
(char *)STRING_WITH_LEN("Prepare"),
(char *)STRING_WITH_LEN("Execute"),
(char *)STRING_WITH_LEN("Long Data"),
(char *)STRING_WITH_LEN("Close stmt"),
(char *)STRING_WITH_LEN("Reset stmt"),
(char *)STRING_WITH_LEN("Set option"),
(char *)STRING_WITH_LEN("Fetch"),
(char *)STRING_WITH_LEN("Daemon"),
(char *)STRING_WITH_LEN("Error") // Last command number
}; };
const char *xa_state_names[]={ const char *xa_state_names[]={
...@@ -117,6 +101,10 @@ static void test_signal(int sig_ptr) ...@@ -117,6 +101,10 @@ static void test_signal(int sig_ptr)
#if !defined( DBUG_OFF) #if !defined( DBUG_OFF)
MessageBox(NULL,"Test signal","DBUG",MB_OK); MessageBox(NULL,"Test signal","DBUG",MB_OK);
#endif #endif
#if defined(OS2)
fprintf(stderr, "Test signal %d\n", sig_ptr);
fflush(stderr);
#endif
} }
static void init_signals(void) static void init_signals(void)
{ {
...@@ -167,7 +155,7 @@ static bool end_active_trans(THD *thd) ...@@ -167,7 +155,7 @@ static bool end_active_trans(THD *thd)
DBUG_RETURN(error); DBUG_RETURN(error);
} }
bool begin_trans(THD *thd) static bool begin_trans(THD *thd)
{ {
int error=0; int error=0;
if (unlikely(thd->in_sub_stmt)) if (unlikely(thd->in_sub_stmt))
...@@ -201,8 +189,7 @@ bool begin_trans(THD *thd) ...@@ -201,8 +189,7 @@ bool begin_trans(THD *thd)
*/ */
inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables) inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables)
{ {
return rpl_filter->is_on() && tables && !thd->spcont && return table_rules_on && tables && !tables_ok(thd,tables);
!rpl_filter->tables_ok(thd->db, tables);
} }
#endif #endif
...@@ -340,7 +327,7 @@ int check_user(THD *thd, enum enum_server_command command, ...@@ -340,7 +327,7 @@ int check_user(THD *thd, enum enum_server_command command,
if (opt_secure_auth_local && passwd_len == SCRAMBLE_LENGTH_323) if (opt_secure_auth_local && passwd_len == SCRAMBLE_LENGTH_323)
{ {
net_printf_error(thd, ER_NOT_SUPPORTED_AUTH_MODE); net_printf_error(thd, ER_NOT_SUPPORTED_AUTH_MODE);
general_log_print(thd, COM_CONNECT, ER(ER_NOT_SUPPORTED_AUTH_MODE)); mysql_log.write(thd, COM_CONNECT, ER(ER_NOT_SUPPORTED_AUTH_MODE));
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
if (passwd_len != 0 && if (passwd_len != 0 &&
...@@ -374,9 +361,9 @@ int check_user(THD *thd, enum enum_server_command command, ...@@ -374,9 +361,9 @@ int check_user(THD *thd, enum enum_server_command command,
net_printf_error(thd, ER_SERVER_IS_IN_SECURE_AUTH_MODE, net_printf_error(thd, ER_SERVER_IS_IN_SECURE_AUTH_MODE,
thd->main_security_ctx.user, thd->main_security_ctx.user,
thd->main_security_ctx.host_or_ip); thd->main_security_ctx.host_or_ip);
general_log_print(thd, COM_CONNECT, ER(ER_SERVER_IS_IN_SECURE_AUTH_MODE), mysql_log.write(thd, COM_CONNECT, ER(ER_SERVER_IS_IN_SECURE_AUTH_MODE),
thd->main_security_ctx.user, thd->main_security_ctx.user,
thd->main_security_ctx.host_or_ip); thd->main_security_ctx.host_or_ip);
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
/* We have to read very specific packet size */ /* We have to read very specific packet size */
...@@ -424,14 +411,14 @@ int check_user(THD *thd, enum enum_server_command command, ...@@ -424,14 +411,14 @@ int check_user(THD *thd, enum enum_server_command command,
} }
/* Why logging is performed before all checks've passed? */ /* Why logging is performed before all checks've passed? */
general_log_print(thd, command, mysql_log.write(thd, command,
(thd->main_security_ctx.priv_user == (thd->main_security_ctx.priv_user ==
thd->main_security_ctx.user ? thd->main_security_ctx.user ?
(char*) "%s@%s on %s" : (char*) "%s@%s on %s" :
(char*) "%s@%s as anonymous on %s"), (char*) "%s@%s as anonymous on %s"),
thd->main_security_ctx.user, thd->main_security_ctx.user,
thd->main_security_ctx.host_or_ip, thd->main_security_ctx.host_or_ip,
db ? db : (char*) ""); db ? db : (char*) "");
/* /*
This is the default access rights for the current database. It's This is the default access rights for the current database. It's
...@@ -478,17 +465,17 @@ int check_user(THD *thd, enum enum_server_command command, ...@@ -478,17 +465,17 @@ int check_user(THD *thd, enum enum_server_command command,
else if (res == 2) // client gave short hash, server has long hash else if (res == 2) // client gave short hash, server has long hash
{ {
net_printf_error(thd, ER_NOT_SUPPORTED_AUTH_MODE); net_printf_error(thd, ER_NOT_SUPPORTED_AUTH_MODE);
general_log_print(thd, COM_CONNECT, ER(ER_NOT_SUPPORTED_AUTH_MODE)); mysql_log.write(thd,COM_CONNECT,ER(ER_NOT_SUPPORTED_AUTH_MODE));
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
net_printf_error(thd, ER_ACCESS_DENIED_ERROR, net_printf_error(thd, ER_ACCESS_DENIED_ERROR,
thd->main_security_ctx.user, thd->main_security_ctx.user,
thd->main_security_ctx.host_or_ip, thd->main_security_ctx.host_or_ip,
passwd_len ? ER(ER_YES) : ER(ER_NO)); passwd_len ? ER(ER_YES) : ER(ER_NO));
general_log_print(thd, COM_CONNECT, ER(ER_ACCESS_DENIED_ERROR), mysql_log.write(thd, COM_CONNECT, ER(ER_ACCESS_DENIED_ERROR),
thd->main_security_ctx.user, thd->main_security_ctx.user,
thd->main_security_ctx.host_or_ip, thd->main_security_ctx.host_or_ip,
passwd_len ? ER(ER_YES) : ER(ER_NO)); passwd_len ? ER(ER_YES) : ER(ER_NO));
DBUG_RETURN(-1); DBUG_RETURN(-1);
#endif /* NO_EMBEDDED_ACCESS_CHECKS */ #endif /* NO_EMBEDDED_ACCESS_CHECKS */
} }
...@@ -661,9 +648,6 @@ void init_update_queries(void) ...@@ -661,9 +648,6 @@ void init_update_queries(void)
uc_update_queries[SQLCOM_DROP_INDEX]=1; uc_update_queries[SQLCOM_DROP_INDEX]=1;
uc_update_queries[SQLCOM_CREATE_VIEW]=1; uc_update_queries[SQLCOM_CREATE_VIEW]=1;
uc_update_queries[SQLCOM_DROP_VIEW]=1; uc_update_queries[SQLCOM_DROP_VIEW]=1;
uc_update_queries[SQLCOM_CREATE_EVENT]=1;
uc_update_queries[SQLCOM_ALTER_EVENT]=1;
uc_update_queries[SQLCOM_DROP_EVENT]=1;
} }
bool is_update_query(enum enum_sql_command command) bool is_update_query(enum enum_sql_command command)
...@@ -1103,7 +1087,7 @@ pthread_handler_t handle_one_connection(void *arg) ...@@ -1103,7 +1087,7 @@ pthread_handler_t handle_one_connection(void *arg)
pthread_detach_this_thread(); pthread_detach_this_thread();
#if !defined( __WIN__) // Win32 calls this in pthread_create #if !defined( __WIN__) && !defined(OS2) // Win32 calls this in pthread_create
/* The following calls needs to be done before we call DBUG_ macros */ /* The following calls needs to be done before we call DBUG_ macros */
if (!(test_flags & TEST_NO_THREADS) & my_thread_init()) if (!(test_flags & TEST_NO_THREADS) & my_thread_init())
{ {
...@@ -1127,7 +1111,7 @@ pthread_handler_t handle_one_connection(void *arg) ...@@ -1127,7 +1111,7 @@ pthread_handler_t handle_one_connection(void *arg)
#if defined(__WIN__) #if defined(__WIN__)
init_signals(); init_signals();
#elif !defined(__NETWARE__) #elif !defined(OS2) && !defined(__NETWARE__)
sigset_t set; sigset_t set;
VOID(sigemptyset(&set)); // Get mask in use VOID(sigemptyset(&set)); // Get mask in use
VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals)); VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));
...@@ -1251,7 +1235,7 @@ pthread_handler_t handle_bootstrap(void *arg) ...@@ -1251,7 +1235,7 @@ pthread_handler_t handle_bootstrap(void *arg)
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
pthread_detach_this_thread(); pthread_detach_this_thread();
thd->thread_stack= (char*) &thd; thd->thread_stack= (char*) &thd;
#if !defined(__WIN__) && !defined(__NETWARE__) #if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
sigset_t set; sigset_t set;
VOID(sigemptyset(&set)); // Get mask in use VOID(sigemptyset(&set)); // Get mask in use
VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals)); VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));
...@@ -1265,7 +1249,6 @@ pthread_handler_t handle_bootstrap(void *arg) ...@@ -1265,7 +1249,6 @@ pthread_handler_t handle_bootstrap(void *arg)
thd->version=refresh_version; thd->version=refresh_version;
thd->security_ctx->priv_user= thd->security_ctx->priv_user=
thd->security_ctx->user= (char*) my_strdup("boot", MYF(MY_WME)); thd->security_ctx->user= (char*) my_strdup("boot", MYF(MY_WME));
thd->security_ctx->priv_host[0]=0;
buff= (char*) thd->net.buff; buff= (char*) thd->net.buff;
thd->init_for_queries(); thd->init_for_queries();
...@@ -1605,7 +1588,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1605,7 +1588,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
packet, strlen(packet), thd->charset()); packet, strlen(packet), thd->charset());
if (!mysql_change_db(thd, tmp.str, FALSE)) if (!mysql_change_db(thd, tmp.str, FALSE))
{ {
general_log_print(thd, command, "%s",thd->db); mysql_log.write(thd,command,"%s",thd->db);
send_ok(thd); send_ok(thd);
} }
break; break;
...@@ -1753,7 +1736,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1753,7 +1736,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
if (alloc_query(thd, packet, packet_length)) if (alloc_query(thd, packet, packet_length))
break; // fatal error is set break; // fatal error is set
char *packet_end= thd->query + thd->query_length; char *packet_end= thd->query + thd->query_length;
general_log_print(thd, command, "%s", thd->query); mysql_log.write(thd,command, "%.*b", thd->query_length, thd->query);
DBUG_PRINT("query",("%-.4096s",thd->query)); DBUG_PRINT("query",("%-.4096s",thd->query));
if (!(specialflag & SPECIAL_NO_PRIOR)) if (!(specialflag & SPECIAL_NO_PRIOR))
...@@ -1809,9 +1792,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1809,9 +1792,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
TABLE_LIST table_list; TABLE_LIST table_list;
LEX_STRING conv_name; LEX_STRING conv_name;
/* Saved variable value */ /* Saved variable value */
my_bool old_innodb_table_locks= thd->variables.innodb_table_locks; my_bool old_innodb_table_locks=
IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE);
/* used as fields initializator */ /* used as fields initializator */
lex_start(thd, 0, 0); lex_start(thd, 0, 0);
...@@ -1841,7 +1823,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1841,7 +1823,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
thd->query_length= strlen(packet); // for simplicity: don't optimize thd->query_length= strlen(packet); // for simplicity: don't optimize
if (!(thd->query=fields=thd->memdup(packet,thd->query_length+1))) if (!(thd->query=fields=thd->memdup(packet,thd->query_length+1)))
break; break;
general_log_print(thd, command, "%s %s", table_list.table_name, fields); mysql_log.write(thd,command,"%s %s",table_list.table_name, fields);
if (lower_case_table_names) if (lower_case_table_names)
my_casedn_str(files_charset_info, table_list.table_name); my_casedn_str(files_charset_info, table_list.table_name);
remove_escape(table_list.table_name); // This can't have wildcards remove_escape(table_list.table_name); // This can't have wildcards
...@@ -1870,7 +1852,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1870,7 +1852,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
#endif #endif
case COM_QUIT: case COM_QUIT:
/* We don't calculate statistics for this command */ /* We don't calculate statistics for this command */
general_log_print(thd, command, NullS); mysql_log.write(thd,command,NullS);
net->error=0; // Don't give 'abort' message net->error=0; // Don't give 'abort' message
error=TRUE; // End server error=TRUE; // End server
break; break;
...@@ -1890,7 +1872,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1890,7 +1872,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
} }
if (check_access(thd,CREATE_ACL,db,0,1,0,is_schema_db(db))) if (check_access(thd,CREATE_ACL,db,0,1,0,is_schema_db(db)))
break; break;
general_log_print(thd, command, packet); mysql_log.write(thd,command,packet);
bzero(&create_info, sizeof(create_info)); bzero(&create_info, sizeof(create_info));
mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db), mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),
&create_info, 0); &create_info, 0);
...@@ -1915,7 +1897,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1915,7 +1897,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0)); ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
break; break;
} }
general_log_print(thd, command, db); mysql_log.write(thd,command,db);
mysql_rm_db(thd, db, 0, 0); mysql_rm_db(thd, db, 0, 0);
break; break;
} }
...@@ -1939,7 +1921,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1939,7 +1921,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
kill_zombie_dump_threads(slave_server_id); kill_zombie_dump_threads(slave_server_id);
thd->server_id = slave_server_id; thd->server_id = slave_server_id;
general_log_print(thd, command, "Log: '%s' Pos: %ld", packet+10, mysql_log.write(thd, command, "Log: '%s' Pos: %ld", packet+10,
(long) pos); (long) pos);
mysql_binlog_send(thd, thd->strdup(packet + 10), (my_off_t) pos, flags); mysql_binlog_send(thd, thd->strdup(packet + 10), (my_off_t) pos, flags);
unregister_slave(thd,1,1); unregister_slave(thd,1,1);
...@@ -1957,7 +1939,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1957,7 +1939,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
ulong options= (ulong) (uchar) packet[0]; ulong options= (ulong) (uchar) packet[0];
if (check_global_access(thd,RELOAD_ACL)) if (check_global_access(thd,RELOAD_ACL))
break; break;
general_log_print(thd, command, NullS); mysql_log.write(thd,command,NullS);
if (!reload_acl_and_cache(thd, options, (TABLE_LIST*) 0, &not_used)) if (!reload_acl_and_cache(thd, options, (TABLE_LIST*) 0, &not_used))
send_ok(thd); send_ok(thd);
break; break;
...@@ -1985,12 +1967,14 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1985,12 +1967,14 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break; break;
} }
DBUG_PRINT("quit",("Got shutdown command for level %u", level)); DBUG_PRINT("quit",("Got shutdown command for level %u", level));
general_log_print(thd, command, NullS); mysql_log.write(thd,command,NullS);
send_eof(thd); send_eof(thd);
#ifdef __WIN__ #ifdef __WIN__
sleep(1); // must wait after eof() sleep(1); // must wait after eof()
#endif #endif
#ifndef OS2
send_eof(thd); // This is for 'quit request' send_eof(thd); // This is for 'quit request'
#endif
close_connection(thd, 0, 1); close_connection(thd, 0, 1);
close_thread_tables(thd); // Free before kill close_thread_tables(thd); // Free before kill
kill_mysql(); kill_mysql();
...@@ -2000,7 +1984,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -2000,7 +1984,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
#endif #endif
case COM_STATISTICS: case COM_STATISTICS:
{ {
general_log_print(thd, command, NullS); mysql_log.write(thd,command,NullS);
statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_STATUS], statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_STATUS],
&LOCK_status); &LOCK_status);
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
...@@ -2014,8 +1998,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -2014,8 +1998,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
uptime, uptime,
(int) thread_count, (ulong) thd->query_id, (int) thread_count, (ulong) thd->query_id,
(ulong) thd->status_var.long_query_count, (ulong) thd->status_var.long_query_count,
thd->status_var.opened_tables, refresh_version, thd->status_var.opened_tables, refresh_version, cached_tables(),
cached_open_tables(),
(uptime ? (ulonglong2double(thd->query_id) / (double) uptime) : (uptime ? (ulonglong2double(thd->query_id) / (double) uptime) :
(double) 0)); (double) 0));
#ifdef SAFEMALLOC #ifdef SAFEMALLOC
...@@ -2040,7 +2023,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -2040,7 +2023,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
if (!thd->security_ctx->priv_user[0] && if (!thd->security_ctx->priv_user[0] &&
check_global_access(thd, PROCESS_ACL)) check_global_access(thd, PROCESS_ACL))
break; break;
general_log_print(thd, command, NullS); mysql_log.write(thd,command,NullS);
mysqld_list_processes(thd, mysqld_list_processes(thd,
thd->security_ctx->master_access & PROCESS_ACL ? thd->security_ctx->master_access & PROCESS_ACL ?
NullS : thd->security_ctx->priv_user, 0); NullS : thd->security_ctx->priv_user, 0);
...@@ -2077,7 +2060,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -2077,7 +2060,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
if (check_global_access(thd, SUPER_ACL)) if (check_global_access(thd, SUPER_ACL))
break; /* purecov: inspected */ break; /* purecov: inspected */
mysql_print_status(); mysql_print_status();
general_log_print(thd, command, NullS); mysql_log.write(thd,command,NullS);
send_eof(thd); send_eof(thd);
break; break;
case COM_SLEEP: case COM_SLEEP:
...@@ -2132,7 +2115,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -2132,7 +2115,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
void log_slow_statement(THD *thd) void log_slow_statement(THD *thd)
{ {
time_t start_of_query; time_t start_of_query;
DBUG_ENTER("log_slow_statement");
/* /*
The following should never be true with our current code base, The following should never be true with our current code base,
...@@ -2140,7 +2122,7 @@ void log_slow_statement(THD *thd) ...@@ -2140,7 +2122,7 @@ void log_slow_statement(THD *thd)
statement in a trigger or stored function statement in a trigger or stored function
*/ */
if (unlikely(thd->in_sub_stmt)) if (unlikely(thd->in_sub_stmt))
DBUG_VOID_RETURN; // Don't set time for sub stmt return; // Don't set time for sub stmt
start_of_query= thd->start_time; start_of_query= thd->start_time;
thd->end_time(); // Set start time thd->end_time(); // Set start time
...@@ -2160,10 +2142,9 @@ void log_slow_statement(THD *thd) ...@@ -2160,10 +2142,9 @@ void log_slow_statement(THD *thd)
(specialflag & SPECIAL_LOG_QUERIES_NOT_USING_INDEXES))) (specialflag & SPECIAL_LOG_QUERIES_NOT_USING_INDEXES)))
{ {
thd->status_var.long_query_count++; thd->status_var.long_query_count++;
slow_log_print(thd, thd->query, thd->query_length, start_of_query); mysql_slow_log.write(thd, thd->query, thd->query_length, start_of_query);
} }
} }
DBUG_VOID_RETURN;
} }
...@@ -2188,7 +2169,6 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident, ...@@ -2188,7 +2169,6 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident,
case SCH_TABLES: case SCH_TABLES:
case SCH_VIEWS: case SCH_VIEWS:
case SCH_TRIGGERS: case SCH_TRIGGERS:
case SCH_EVENTS:
#ifdef DONT_ALLOW_SHOW_COMMANDS #ifdef DONT_ALLOW_SHOW_COMMANDS
my_message(ER_NOT_ALLOWED_COMMAND, my_message(ER_NOT_ALLOWED_COMMAND,
ER(ER_NOT_ALLOWED_COMMAND), MYF(0)); /* purecov: inspected */ ER(ER_NOT_ALLOWED_COMMAND), MYF(0)); /* purecov: inspected */
...@@ -2263,7 +2243,6 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident, ...@@ -2263,7 +2243,6 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident,
case SCH_STATUS: case SCH_STATUS:
case SCH_PROCEDURES: case SCH_PROCEDURES:
case SCH_CHARSETS: case SCH_CHARSETS:
case SCH_ENGINES:
case SCH_COLLATIONS: case SCH_COLLATIONS:
case SCH_COLLATION_CHARACTER_SET_APPLICABILITY: case SCH_COLLATION_CHARACTER_SET_APPLICABILITY:
case SCH_USER_PRIVILEGES: case SCH_USER_PRIVILEGES:
...@@ -2376,9 +2355,6 @@ mysql_execute_command(THD *thd) ...@@ -2376,9 +2355,6 @@ mysql_execute_command(THD *thd)
/* Saved variable value */ /* Saved variable value */
DBUG_ENTER("mysql_execute_command"); DBUG_ENTER("mysql_execute_command");
thd->net.no_send_error= 0; thd->net.no_send_error= 0;
#ifdef WITH_PARTITION_STORAGE_ENGINE
thd->work_part_info= 0;
#endif
/* /*
In many cases first table of main SELECT_LEX have special meaning => In many cases first table of main SELECT_LEX have special meaning =>
...@@ -2468,9 +2444,6 @@ mysql_execute_command(THD *thd) ...@@ -2468,9 +2444,6 @@ mysql_execute_command(THD *thd)
statistic_increment(thd->status_var.com_stat[lex->sql_command], statistic_increment(thd->status_var.com_stat[lex->sql_command],
&LOCK_status); &LOCK_status);
if (lex->binlog_row_based_if_mixed)
thd->set_current_stmt_binlog_row_based_if_mixed();
switch (lex->sql_command) { switch (lex->sql_command) {
case SQLCOM_SELECT: case SQLCOM_SELECT:
{ {
...@@ -2486,15 +2459,11 @@ mysql_execute_command(THD *thd) ...@@ -2486,15 +2459,11 @@ mysql_execute_command(THD *thd)
if (all_tables) if (all_tables)
{ {
if (lex->orig_sql_command != SQLCOM_SHOW_STATUS_PROC && if (lex->orig_sql_command != SQLCOM_SHOW_STATUS_PROC &&
lex->orig_sql_command != SQLCOM_SHOW_STATUS_FUNC && lex->orig_sql_command != SQLCOM_SHOW_STATUS_FUNC)
lex->orig_sql_command != SQLCOM_SHOW_EVENTS)
res= check_table_access(thd, res= check_table_access(thd,
lex->exchange ? SELECT_ACL | FILE_ACL : lex->exchange ? SELECT_ACL | FILE_ACL :
SELECT_ACL, SELECT_ACL,
all_tables, 0); all_tables, 0);
else if (lex->orig_sql_command == SQLCOM_SHOW_EVENTS)
res= check_access(thd, EVENT_ACL, thd->lex->select_lex.db, 0, 0, 0,
is_schema_db(thd->lex->select_lex.db));
} }
else else
res= check_access(thd, res= check_access(thd,
...@@ -2739,20 +2708,29 @@ mysql_execute_command(THD *thd) ...@@ -2739,20 +2708,29 @@ mysql_execute_command(THD *thd)
res = load_master_data(thd); res = load_master_data(thd);
break; break;
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
case SQLCOM_SHOW_ENGINE_STATUS: #ifdef HAVE_NDBCLUSTER_DB
case SQLCOM_SHOW_NDBCLUSTER_STATUS:
{
res = ndbcluster_show_status(thd);
break;
}
#endif
#ifdef HAVE_INNOBASE_DB
case SQLCOM_SHOW_INNODB_STATUS:
{ {
if (check_global_access(thd, SUPER_ACL)) if (check_global_access(thd, SUPER_ACL))
goto error; goto error;
res = ha_show_status(thd, lex->create_info.db_type, HA_ENGINE_STATUS); res = innodb_show_status(thd);
break; break;
} }
case SQLCOM_SHOW_ENGINE_MUTEX: case SQLCOM_SHOW_MUTEX_STATUS:
{ {
if (check_global_access(thd, SUPER_ACL)) if (check_global_access(thd, SUPER_ACL))
goto error; goto error;
res = ha_show_status(thd, lex->create_info.db_type, HA_ENGINE_MUTEX); res = innodb_mutex_show_status(thd);
break; break;
} }
#endif
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
case SQLCOM_LOAD_MASTER_TABLE: case SQLCOM_LOAD_MASTER_TABLE:
{ {
...@@ -2919,20 +2897,11 @@ mysql_execute_command(THD *thd) ...@@ -2919,20 +2897,11 @@ mysql_execute_command(THD *thd)
else else
{ {
/* regular create */ /* regular create */
if (lex->like_name) if (lex->name)
res= mysql_create_like_table(thd, create_table, &lex->create_info, res= mysql_create_like_table(thd, create_table, &lex->create_info,
lex->like_name); (Table_ident *)lex->name);
else else
{ {
#ifdef WITH_PARTITION_STORAGE_ENGINE
partition_info *part_info= thd->lex->part_info;
if (part_info && !(part_info= thd->lex->part_info->get_clone()))
{
res= -1;
goto end_with_restore_list;
}
thd->work_part_info= part_info;
#endif
res= mysql_create_table(thd, create_table->db, res= mysql_create_table(thd, create_table->db,
create_table->table_name, &lex->create_info, create_table->table_name, &lex->create_info,
lex->create_list, lex->create_list,
...@@ -3010,11 +2979,6 @@ end_with_restore_list: ...@@ -3010,11 +2979,6 @@ end_with_restore_list:
#else #else
{ {
ulong priv=0; ulong priv=0;
ulong priv_needed= ALTER_ACL;
/* We also require DROP priv for ALTER TABLE ... DROP PARTITION */
if (lex->alter_info.flags & ALTER_DROP_PARTITION)
priv_needed|= DROP_ACL;
if (lex->name && (!lex->name[0] || strlen(lex->name) > NAME_LEN)) if (lex->name && (!lex->name[0] || strlen(lex->name) > NAME_LEN))
{ {
my_error(ER_WRONG_TABLE_NAME, MYF(0), lex->name); my_error(ER_WRONG_TABLE_NAME, MYF(0), lex->name);
...@@ -3039,7 +3003,7 @@ end_with_restore_list: ...@@ -3039,7 +3003,7 @@ end_with_restore_list:
else else
select_lex->db= first_table->db; select_lex->db= first_table->db;
} }
if (check_access(thd, priv_needed, first_table->db, if (check_access(thd, ALTER_ACL, first_table->db,
&first_table->grant.privilege, 0, 0, &first_table->grant.privilege, 0, 0,
test(first_table->schema_table)) || test(first_table->schema_table)) ||
check_access(thd,INSERT_ACL | CREATE_ACL,select_lex->db,&priv,0,0, check_access(thd,INSERT_ACL | CREATE_ACL,select_lex->db,&priv,0,0,
...@@ -3050,7 +3014,7 @@ end_with_restore_list: ...@@ -3050,7 +3014,7 @@ end_with_restore_list:
goto error; /* purecov: inspected */ goto error; /* purecov: inspected */
if (grant_option) if (grant_option)
{ {
if (check_grant(thd, priv_needed, all_tables, 0, UINT_MAX, 0)) if (check_grant(thd, ALTER_ACL, all_tables, 0, UINT_MAX, 0))
goto error; goto error;
if (lex->name && !test_all_bits(priv,INSERT_ACL | CREATE_ACL)) if (lex->name && !test_all_bits(priv,INSERT_ACL | CREATE_ACL))
{ // Rename of table { // Rename of table
...@@ -3115,7 +3079,7 @@ end_with_restore_list: ...@@ -3115,7 +3079,7 @@ end_with_restore_list:
} }
} }
query_cache_invalidate3(thd, first_table, 0); query_cache_invalidate3(thd, first_table, 0);
if (end_active_trans(thd) || mysql_rename_tables(thd, first_table, 0)) if (end_active_trans(thd) || mysql_rename_tables(thd, first_table))
goto error; goto error;
break; break;
} }
...@@ -3180,8 +3144,8 @@ end_with_restore_list: ...@@ -3180,8 +3144,8 @@ end_with_restore_list:
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); // No binlog error generated thd->clear_error(); // No binlog error generated
thd->binlog_query(THD::STMT_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, 0, FALSE); mysql_bin_log.write(&qinfo);
} }
} }
select_lex->table_list.first= (byte*) first_table; select_lex->table_list.first= (byte*) first_table;
...@@ -3214,8 +3178,8 @@ end_with_restore_list: ...@@ -3214,8 +3178,8 @@ end_with_restore_list:
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); // No binlog error generated thd->clear_error(); // No binlog error generated
thd->binlog_query(THD::STMT_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, 0, FALSE); mysql_bin_log.write(&qinfo);
} }
} }
select_lex->table_list.first= (byte*) first_table; select_lex->table_list.first= (byte*) first_table;
...@@ -3239,8 +3203,8 @@ end_with_restore_list: ...@@ -3239,8 +3203,8 @@ end_with_restore_list:
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); // No binlog error generated thd->clear_error(); // No binlog error generated
thd->binlog_query(THD::STMT_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, 0, FALSE); mysql_bin_log.write(&qinfo);
} }
} }
select_lex->table_list.first= (byte*) first_table; select_lex->table_list.first= (byte*) first_table;
...@@ -3528,16 +3492,13 @@ end_with_restore_list: ...@@ -3528,16 +3492,13 @@ end_with_restore_list:
case SQLCOM_SHOW_STORAGE_ENGINES: case SQLCOM_SHOW_STORAGE_ENGINES:
res= mysqld_show_storage_engines(thd); res= mysqld_show_storage_engines(thd);
break; break;
case SQLCOM_SHOW_AUTHORS:
res= mysqld_show_authors(thd);
break;
case SQLCOM_SHOW_PRIVILEGES: case SQLCOM_SHOW_PRIVILEGES:
res= mysqld_show_privileges(thd); res= mysqld_show_privileges(thd);
break; break;
case SQLCOM_SHOW_COLUMN_TYPES: case SQLCOM_SHOW_COLUMN_TYPES:
res= mysqld_show_column_types(thd); res= mysqld_show_column_types(thd);
break; break;
case SQLCOM_SHOW_ENGINE_LOGS: case SQLCOM_SHOW_LOGS:
#ifdef DONT_ALLOW_SHOW_COMMANDS #ifdef DONT_ALLOW_SHOW_COMMANDS
my_message(ER_NOT_ALLOWED_COMMAND, ER(ER_NOT_ALLOWED_COMMAND), my_message(ER_NOT_ALLOWED_COMMAND, ER(ER_NOT_ALLOWED_COMMAND),
MYF(0)); /* purecov: inspected */ MYF(0)); /* purecov: inspected */
...@@ -3546,7 +3507,7 @@ end_with_restore_list: ...@@ -3546,7 +3507,7 @@ end_with_restore_list:
{ {
if (grant_option && check_access(thd, FILE_ACL, any_db,0,0,0,0)) if (grant_option && check_access(thd, FILE_ACL, any_db,0,0,0,0))
goto error; goto error;
res= ha_show_status(thd, lex->create_info.db_type, HA_ENGINE_LOGS); res= mysqld_show_logs(thd);
break; break;
} }
#endif #endif
...@@ -3665,9 +3626,9 @@ end_with_restore_list: ...@@ -3665,9 +3626,9 @@ end_with_restore_list:
above was not called. So we have to check rules again here. above was not called. So we have to check rules again here.
*/ */
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
if (thd->slave_thread && if (thd->slave_thread &&
(!rpl_filter->db_ok(lex->name) || (!db_ok(lex->name, replicate_do_db, replicate_ignore_db) ||
!rpl_filter->db_ok_with_wild_table(lex->name))) !db_ok_with_wild_table(lex->name)))
{ {
my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0)); my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
break; break;
...@@ -3700,8 +3661,8 @@ end_with_restore_list: ...@@ -3700,8 +3661,8 @@ end_with_restore_list:
*/ */
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
if (thd->slave_thread && if (thd->slave_thread &&
(!rpl_filter->db_ok(lex->name) || (!db_ok(lex->name, replicate_do_db, replicate_ignore_db) ||
!rpl_filter->db_ok_with_wild_table(lex->name))) !db_ok_with_wild_table(lex->name)))
{ {
my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0)); my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
break; break;
...@@ -3718,48 +3679,6 @@ end_with_restore_list: ...@@ -3718,48 +3679,6 @@ end_with_restore_list:
res= mysql_rm_db(thd, lex->name, lex->drop_if_exists, 0); res= mysql_rm_db(thd, lex->name, lex->drop_if_exists, 0);
break; break;
} }
case SQLCOM_RENAME_DB:
{
LEX_STRING *olddb, *newdb;
List_iterator <LEX_STRING> db_list(lex->db_list);
olddb= db_list++;
newdb= db_list++;
if (end_active_trans(thd))
{
res= 1;
break;
}
#ifdef HAVE_REPLICATION
if (thd->slave_thread &&
(!rpl_filter->db_ok(olddb->str) ||
!rpl_filter->db_ok(newdb->str) ||
!rpl_filter->db_ok_with_wild_table(olddb->str) ||
!rpl_filter->db_ok_with_wild_table(newdb->str)))
{
res= 1;
my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
break;
}
#endif
if (check_access(thd,ALTER_ACL,olddb->str,0,1,0,is_schema_db(olddb->str)) ||
check_access(thd,DROP_ACL,olddb->str,0,1,0,is_schema_db(olddb->str)) ||
check_access(thd,CREATE_ACL,newdb->str,0,1,0,is_schema_db(newdb->str)))
{
res= 1;
break;
}
if (thd->locked_tables || thd->active_transaction())
{
res= 1;
my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
goto error;
}
res= mysql_rename_db(thd, olddb, newdb);
if (!res)
send_ok(thd);
break;
}
case SQLCOM_ALTER_DB: case SQLCOM_ALTER_DB:
{ {
char *db= lex->name ? lex->name : thd->db; char *db= lex->name ? lex->name : thd->db;
...@@ -3770,7 +3689,7 @@ end_with_restore_list: ...@@ -3770,7 +3689,7 @@ end_with_restore_list:
} }
if (!strip_sp(db) || check_db_name(db)) if (!strip_sp(db) || check_db_name(db))
{ {
my_error(ER_WRONG_DB_NAME, MYF(0), db); my_error(ER_WRONG_DB_NAME, MYF(0), lex->name);
break; break;
} }
/* /*
...@@ -3782,8 +3701,8 @@ end_with_restore_list: ...@@ -3782,8 +3701,8 @@ end_with_restore_list:
*/ */
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
if (thd->slave_thread && if (thd->slave_thread &&
(!rpl_filter->db_ok(db) || (!db_ok(db, replicate_do_db, replicate_ignore_db) ||
!rpl_filter->db_ok_with_wild_table(db))) !db_ok_with_wild_table(db)))
{ {
my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0)); my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
break; break;
...@@ -3807,81 +3726,9 @@ end_with_restore_list: ...@@ -3807,81 +3726,9 @@ end_with_restore_list:
my_error(ER_WRONG_DB_NAME, MYF(0), lex->name); my_error(ER_WRONG_DB_NAME, MYF(0), lex->name);
break; break;
} }
res=mysqld_show_create_db(thd,lex->name,&lex->create_info); if (check_access(thd,SELECT_ACL,lex->name,0,1,0,is_schema_db(lex->name)))
break;
}
case SQLCOM_CREATE_EVENT:
case SQLCOM_ALTER_EVENT:
case SQLCOM_DROP_EVENT:
{
uint rows_affected= 1;
DBUG_ASSERT(lex->et);
do {
if (! lex->et->dbname.str)
{
my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
res= true;
break;
}
if (check_access(thd, EVENT_ACL, lex->et->dbname.str, 0, 0, 0,
is_schema_db(lex->et->dbname.str)))
break;
if (end_active_trans(thd))
{
res= -1;
break;
}
switch (lex->sql_command) {
case SQLCOM_CREATE_EVENT:
res= evex_create_event(thd, lex->et, (uint) lex->create_info.options,
&rows_affected);
break;
case SQLCOM_ALTER_EVENT:
res= evex_update_event(thd, lex->et, lex->spname, &rows_affected);
break;
case SQLCOM_DROP_EVENT:
res= evex_drop_event(thd, lex->et, lex->drop_if_exists, &rows_affected);
default:;
}
DBUG_PRINT("info", ("CREATE/ALTER/DROP returned error code=%d af_rows=%d",
res, rows_affected));
if (!res)
send_ok(thd, rows_affected);
/* lex->unit.cleanup() is called outside, no need to call it here */
} while (0);
if (!thd->spcont)
{
lex->et->free_sphead_on_delete= true;
lex->et->free_sp();
lex->et->deinit_mutexes();
}
break;
}
case SQLCOM_SHOW_CREATE_EVENT:
{
DBUG_ASSERT(lex->spname);
DBUG_ASSERT(lex->et);
if (! lex->spname->m_db.str)
{
my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
res= true;
break;
}
if (check_access(thd, EVENT_ACL, lex->spname->m_db.str, 0, 0, 0,
is_schema_db(lex->spname->m_db.str)))
break; break;
res=mysqld_show_create_db(thd,lex->name,&lex->create_info);
if (lex->spname->m_name.length > NAME_LEN)
{
my_error(ER_TOO_LONG_IDENT, MYF(0), lex->spname->m_name.str);
goto error;
}
res= evex_show_create_event(thd, lex->spname, lex->et->definer);
break; break;
} }
case SQLCOM_CREATE_FUNCTION: // UDF function case SQLCOM_CREATE_FUNCTION: // UDF function
...@@ -3914,8 +3761,10 @@ end_with_restore_list: ...@@ -3914,8 +3761,10 @@ end_with_restore_list:
if (!(res= mysql_create_user(thd, lex->users_list))) if (!(res= mysql_create_user(thd, lex->users_list)))
{ {
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
thd->binlog_query(THD::MYSQL_QUERY_TYPE, {
thd->query, thd->query_length, FALSE, FALSE); Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
mysql_bin_log.write(&qinfo);
}
send_ok(thd); send_ok(thd);
} }
break; break;
...@@ -3931,8 +3780,8 @@ end_with_restore_list: ...@@ -3931,8 +3780,8 @@ end_with_restore_list:
{ {
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->binlog_query(THD::MYSQL_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, FALSE, FALSE); mysql_bin_log.write(&qinfo);
} }
send_ok(thd); send_ok(thd);
} }
...@@ -3949,8 +3798,8 @@ end_with_restore_list: ...@@ -3949,8 +3798,8 @@ end_with_restore_list:
{ {
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->binlog_query(THD::MYSQL_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, FALSE, FALSE); mysql_bin_log.write(&qinfo);
} }
send_ok(thd); send_ok(thd);
} }
...@@ -3965,8 +3814,8 @@ end_with_restore_list: ...@@ -3965,8 +3814,8 @@ end_with_restore_list:
{ {
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->binlog_query(THD::MYSQL_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, FALSE, FALSE); mysql_bin_log.write(&qinfo);
} }
send_ok(thd); send_ok(thd);
} }
...@@ -4045,8 +3894,8 @@ end_with_restore_list: ...@@ -4045,8 +3894,8 @@ end_with_restore_list:
if (!res && mysql_bin_log.is_open()) if (!res && mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
thd->binlog_query(THD::MYSQL_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, FALSE, FALSE); mysql_bin_log.write(&qinfo);
} }
} }
else else
...@@ -4065,8 +3914,8 @@ end_with_restore_list: ...@@ -4065,8 +3914,8 @@ end_with_restore_list:
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
thd->binlog_query(THD::MYSQL_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, FALSE, FALSE); mysql_bin_log.write(&qinfo);
} }
if (lex->sql_command == SQLCOM_GRANT) if (lex->sql_command == SQLCOM_GRANT)
{ {
...@@ -4105,8 +3954,8 @@ end_with_restore_list: ...@@ -4105,8 +3954,8 @@ end_with_restore_list:
{ {
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->binlog_query(THD::STMT_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, 0, FALSE); mysql_bin_log.write(&qinfo);
} }
} }
send_ok(thd); send_ok(thd);
...@@ -4446,12 +4295,12 @@ end_with_restore_list: ...@@ -4446,12 +4295,12 @@ end_with_restore_list:
db, name, db, name,
lex->sql_command == SQLCOM_CREATE_PROCEDURE, 1)) lex->sql_command == SQLCOM_CREATE_PROCEDURE, 1))
{ {
close_thread_tables(thd);
if (sp_grant_privileges(thd, db, name, if (sp_grant_privileges(thd, db, name,
lex->sql_command == SQLCOM_CREATE_PROCEDURE)) lex->sql_command == SQLCOM_CREATE_PROCEDURE))
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_PROC_AUTO_GRANT_FAIL, ER_PROC_AUTO_GRANT_FAIL,
ER(ER_PROC_AUTO_GRANT_FAIL)); ER(ER_PROC_AUTO_GRANT_FAIL));
close_thread_tables(thd);
} }
#endif #endif
send_ok(thd); send_ok(thd);
...@@ -4669,8 +4518,8 @@ end_with_restore_list: ...@@ -4669,8 +4518,8 @@ end_with_restore_list:
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
thd->binlog_query(THD::MYSQL_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, FALSE, FALSE); mysql_bin_log.write(&qinfo);
} }
send_ok(thd); send_ok(thd);
break; break;
...@@ -4754,8 +4603,8 @@ end_with_restore_list: ...@@ -4754,8 +4603,8 @@ end_with_restore_list:
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
thd->binlog_query(THD::MYSQL_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, FALSE, FALSE); mysql_bin_log.write(&qinfo);
} }
send_ok(thd); send_ok(thd);
break; break;
...@@ -4879,8 +4728,8 @@ end_with_restore_list: ...@@ -4879,8 +4728,8 @@ end_with_restore_list:
buff.append(STRING_WITH_LEN(" AS ")); buff.append(STRING_WITH_LEN(" AS "));
buff.append(first_table->source.str, first_table->source.length); buff.append(first_table->source.str, first_table->source.length);
thd->binlog_query(THD::STMT_QUERY_TYPE, Query_log_event qinfo(thd, buff.ptr(), buff.length(), 0, FALSE);
buff.ptr(), buff.length(), FALSE, FALSE); mysql_bin_log.write(&qinfo);
} }
break; break;
} }
...@@ -4893,8 +4742,8 @@ end_with_restore_list: ...@@ -4893,8 +4742,8 @@ end_with_restore_list:
mysql_bin_log.is_open()) mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
thd->binlog_query(THD::STMT_QUERY_TYPE, Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
thd->query, thd->query_length, FALSE, FALSE); mysql_bin_log.write(&qinfo);
} }
break; break;
} }
...@@ -5088,30 +4937,6 @@ end_with_restore_list: ...@@ -5088,30 +4937,6 @@ end_with_restore_list:
case SQLCOM_XA_RECOVER: case SQLCOM_XA_RECOVER:
res= mysql_xa_recover(thd); res= mysql_xa_recover(thd);
break; break;
case SQLCOM_ALTER_TABLESPACE:
if (check_access(thd, ALTER_ACL, thd->db, 0, 1, 0, thd->db ? is_schema_db(thd->db) : 0))
break;
if (!(res= mysql_alter_tablespace(thd, lex->alter_tablespace_info)))
send_ok(thd);
break;
case SQLCOM_INSTALL_PLUGIN:
if (! (res= mysql_install_plugin(thd, &thd->lex->comment,
&thd->lex->ident)))
send_ok(thd);
break;
case SQLCOM_UNINSTALL_PLUGIN:
if (! (res= mysql_uninstall_plugin(thd, &thd->lex->comment)))
send_ok(thd);
break;
case SQLCOM_BINLOG_BASE64_EVENT:
{
#ifndef EMBEDDED_LIBRARY
mysql_client_binlog_statement(thd);
#else /* EMBEDDED_LIBRARY */
my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "embedded");
#endif /* EMBEDDED_LIBRARY */
break;
}
default: default:
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
DBUG_ASSERT(0); /* Impossible */ DBUG_ASSERT(0); /* Impossible */
...@@ -5119,12 +4944,10 @@ end_with_restore_list: ...@@ -5119,12 +4944,10 @@ end_with_restore_list:
send_ok(thd); send_ok(thd);
break; break;
} }
end:
thd->proc_info="query end"; thd->proc_info="query end";
/* Two binlog-related cleanups: */
/* /*
Binlog-related cleanup:
Reset system variables temporarily modified by SET ONE SHOT. Reset system variables temporarily modified by SET ONE SHOT.
Exception: If this is a SET, do nothing. This is to allow Exception: If this is a SET, do nothing. This is to allow
...@@ -5135,7 +4958,6 @@ end: ...@@ -5135,7 +4958,6 @@ end:
*/ */
if (thd->one_shot_set && lex->sql_command != SQLCOM_SET_OPTION) if (thd->one_shot_set && lex->sql_command != SQLCOM_SET_OPTION)
reset_one_shot_variables(thd); reset_one_shot_variables(thd);
thd->reset_current_stmt_binlog_row_based();
/* /*
The return value for ROW_COUNT() is "implementation dependent" if the The return value for ROW_COUNT() is "implementation dependent" if the
...@@ -5151,8 +4973,7 @@ end: ...@@ -5151,8 +4973,7 @@ end:
DBUG_RETURN(res || thd->net.report_error); DBUG_RETURN(res || thd->net.report_error);
error: error:
res= 1; // would be better to set res=1 before "goto error" DBUG_RETURN(1);
goto end;
} }
...@@ -5828,6 +5649,7 @@ void mysql_init_multi_delete(LEX *lex) ...@@ -5828,6 +5649,7 @@ void mysql_init_multi_delete(LEX *lex)
lex->query_tables_last= &lex->query_tables; lex->query_tables_last= &lex->query_tables;
} }
/* /*
When you modify mysql_parse(), you may need to mofify When you modify mysql_parse(), you may need to mofify
mysql_test_parse_for_slave() in this same file. mysql_test_parse_for_slave() in this same file.
...@@ -5857,16 +5679,11 @@ void mysql_parse(THD *thd, char *inBuf, uint length) ...@@ -5857,16 +5679,11 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
{ {
if (thd->net.report_error) if (thd->net.report_error)
{ {
delete lex->sphead; if (thd->lex->sphead)
lex->sphead= NULL; {
if (lex->et) delete thd->lex->sphead;
{ thd->lex->sphead= NULL;
lex->et->free_sphead_on_delete= true; }
/* alloced on thd->mem_root so no real memory free but dtor call */
lex->et->free_sp();
lex->et->deinit_mutexes();
lex->et= NULL;
}
} }
else else
{ {
...@@ -5896,18 +5713,11 @@ void mysql_parse(THD *thd, char *inBuf, uint length) ...@@ -5896,18 +5713,11 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
thd->is_fatal_error)); thd->is_fatal_error));
query_cache_abort(&thd->net); query_cache_abort(&thd->net);
lex->unit.cleanup(); lex->unit.cleanup();
if (lex->sphead) if (thd->lex->sphead)
{ {
/* Clean up after failed stored procedure/function */ /* Clean up after failed stored procedure/function */
delete lex->sphead; delete thd->lex->sphead;
lex->sphead= NULL; thd->lex->sphead= NULL;
}
if (lex->et)
{
lex->et->free_sphead_on_delete= true;
lex->et->free_sp();
lex->et->deinit_mutexes();
lex->et= NULL;
} }
} }
thd->proc_info="freeing items"; thd->proc_info="freeing items";
...@@ -6032,7 +5842,10 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type, ...@@ -6032,7 +5842,10 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
*/ */
char buf[32]; char buf[32];
my_snprintf(buf, sizeof(buf), "TIMESTAMP(%s)", length); my_snprintf(buf, sizeof(buf), "TIMESTAMP(%s)", length);
WARN_DEPRECATED(thd, "5.2", buf, "'TIMESTAMP'"); push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
ER_WARN_DEPRECATED_SYNTAX,
ER(ER_WARN_DEPRECATED_SYNTAX),
buf, "TIMESTAMP");
} }
if (!(new_field= new create_field()) || if (!(new_field= new create_field()) ||
...@@ -6161,16 +5974,12 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ...@@ -6161,16 +5974,12 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
if (!table) if (!table)
DBUG_RETURN(0); // End of memory DBUG_RETURN(0); // End of memory
alias_str= alias ? alias->str : table->table.str; alias_str= alias ? alias->str : table->table.str;
if (check_table_name(table->table.str,table->table.length)) if (check_table_name(table->table.str,table->table.length) ||
table->db.str && check_db_name(table->db.str))
{ {
my_error(ER_WRONG_TABLE_NAME, MYF(0), table->table.str); my_error(ER_WRONG_TABLE_NAME, MYF(0), table->table.str);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
if (table->db.str && check_db_name(table->db.str))
{
my_error(ER_WRONG_DB_NAME, MYF(0), table->db.str);
DBUG_RETURN(0);
}
if (!alias) /* Alias is case sensitive */ if (!alias) /* Alias is case sensitive */
{ {
...@@ -6787,8 +6596,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, ...@@ -6787,8 +6596,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
{ {
/* /*
Flush the normal query log, the update log, the binary log, Flush the normal query log, the update log, the binary log,
the slow query log, the relay log (if it exists) and the log the slow query log, and the relay log (if it exists).
tables.
*/ */
/* /*
...@@ -6798,17 +6606,15 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, ...@@ -6798,17 +6606,15 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
than it would help them) than it would help them)
*/ */
tmp_write_to_binlog= 0; tmp_write_to_binlog= 0;
mysql_log.new_file(1);
mysql_slow_log.new_file(1);
mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE); mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
pthread_mutex_lock(&LOCK_active_mi); pthread_mutex_lock(&LOCK_active_mi);
rotate_relay_log(active_mi); rotate_relay_log(active_mi);
pthread_mutex_unlock(&LOCK_active_mi); pthread_mutex_unlock(&LOCK_active_mi);
#endif #endif
if (ha_flush_logs())
/* flush slow and general logs */
logger.flush_logs(thd);
if (ha_flush_logs(NULL))
result=1; result=1;
if (flush_error_log()) if (flush_error_log())
result=1; result=1;
...@@ -6932,8 +6738,6 @@ void kill_one_thread(THD *thd, ulong id, bool only_kill_query) ...@@ -6932,8 +6738,6 @@ void kill_one_thread(THD *thd, ulong id, bool only_kill_query)
I_List_iterator<THD> it(threads); I_List_iterator<THD> it(threads);
while ((tmp=it++)) while ((tmp=it++))
{ {
if (tmp->command == COM_DAEMON)
continue;
if (tmp->thread_id == id) if (tmp->thread_id == id)
{ {
pthread_mutex_lock(&tmp->LOCK_delete); // Lock from delete pthread_mutex_lock(&tmp->LOCK_delete); // Lock from delete
...@@ -6963,8 +6767,8 @@ void kill_one_thread(THD *thd, ulong id, bool only_kill_query) ...@@ -6963,8 +6767,8 @@ void kill_one_thread(THD *thd, ulong id, bool only_kill_query)
/* If pointer is not a null pointer, append filename to it */ /* If pointer is not a null pointer, append filename to it */
bool append_file_to_dir(THD *thd, const char **filename_ptr, static bool append_file_to_dir(THD *thd, const char **filename_ptr,
const char *table_name) const char *table_name)
{ {
char buff[FN_REFLEN],*ptr, *end; char buff[FN_REFLEN],*ptr, *end;
if (!*filename_ptr) if (!*filename_ptr)
...@@ -7104,7 +6908,7 @@ bool mysql_create_index(THD *thd, TABLE_LIST *table_list, List<Key> &keys) ...@@ -7104,7 +6908,7 @@ bool mysql_create_index(THD *thd, TABLE_LIST *table_list, List<Key> &keys)
HA_CREATE_INFO create_info; HA_CREATE_INFO create_info;
DBUG_ENTER("mysql_create_index"); DBUG_ENTER("mysql_create_index");
bzero((char*) &create_info,sizeof(create_info)); bzero((char*) &create_info,sizeof(create_info));
create_info.db_type= (handlerton*) &default_hton; create_info.db_type=DB_TYPE_DEFAULT;
create_info.default_table_charset= thd->variables.collation_database; create_info.default_table_charset= thd->variables.collation_database;
DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->table_name, DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->table_name,
&create_info, table_list, &create_info, table_list,
...@@ -7120,7 +6924,7 @@ bool mysql_drop_index(THD *thd, TABLE_LIST *table_list, ALTER_INFO *alter_info) ...@@ -7120,7 +6924,7 @@ bool mysql_drop_index(THD *thd, TABLE_LIST *table_list, ALTER_INFO *alter_info)
HA_CREATE_INFO create_info; HA_CREATE_INFO create_info;
DBUG_ENTER("mysql_drop_index"); DBUG_ENTER("mysql_drop_index");
bzero((char*) &create_info,sizeof(create_info)); bzero((char*) &create_info,sizeof(create_info));
create_info.db_type= (handlerton*) &default_hton; create_info.db_type=DB_TYPE_DEFAULT;
create_info.default_table_charset= thd->variables.collation_database; create_info.default_table_charset= thd->variables.collation_database;
alter_info->clear(); alter_info->clear();
alter_info->flags= ALTER_DROP_INDEX; alter_info->flags= ALTER_DROP_INDEX;
......
strings/my_vsnprintf.c
View file @ fa5feec0
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
%#[l]d %#[l]d
%#[l]u %#[l]u
%#[l]x %#[l]x
%#.#b Local format; note first # is ignored and second is REQUIRED
%#.#s Note first # is ignored %#.#s Note first # is ignored
RETURN RETURN
...@@ -40,7 +41,7 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) ...@@ -40,7 +41,7 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
for (; *fmt ; fmt++) for (; *fmt ; fmt++)
{ {
if (fmt[0] != '%') if (*fmt != '%')
{ {
if (to == end) /* End of buffer */ if (to == end) /* End of buffer */
break; break;
...@@ -95,6 +96,16 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) ...@@ -95,6 +96,16 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
to=strnmov(to,par,plen); to=strnmov(to,par,plen);
continue; continue;
} }
else if (*fmt == 'b') /* Buffer parameter */
{
char *par = va_arg(ap, char *);
DBUG_ASSERT(to <= end);
if (to + abs(width) + 1 > end)
width= end - to - 1; /* sign doesn't matter */
memmove(to, par, abs(width));
to+= width;
continue;
}
else if (*fmt == 'd' || *fmt == 'u'|| *fmt== 'x') /* Integer parameter */ else if (*fmt == 'd' || *fmt == 'u'|| *fmt== 'x') /* Integer parameter */
{ {
register long larg; register long larg;
......
tests/Makefile.am
View file @ fa5feec0
...@@ -43,7 +43,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ ...@@ -43,7 +43,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
LIBS = @CLIENT_LIBS@ LIBS = @CLIENT_LIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ \ LDADD = @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql/libmysqlclient.la $(top_builddir)/libmysql/libmysqlclient.la
mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -lmysys -L../mysys
mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)
insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix)
select_test_SOURCES= select_test.c $(yassl_dummy_link_fix) select_test_SOURCES= select_test.c $(yassl_dummy_link_fix)
......
tests/mysql_client_test.c
View file @ fa5feec0
...@@ -1213,7 +1213,7 @@ static void test_tran_bdb() ...@@ -1213,7 +1213,7 @@ static void test_tran_bdb()
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */ /* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
rc= mysql_query(mysql, "CREATE TABLE my_demo_transaction( " rc= mysql_query(mysql, "CREATE TABLE my_demo_transaction( "
"col1 int , col2 varchar(30)) ENGINE= BDB"); "col1 int , col2 varchar(30)) TYPE= BDB");
myquery(rc); myquery(rc);
/* insert a row and commit the transaction */ /* insert a row and commit the transaction */
...@@ -1286,7 +1286,7 @@ static void test_tran_innodb() ...@@ -1286,7 +1286,7 @@ static void test_tran_innodb()
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */ /* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
rc= mysql_query(mysql, "CREATE TABLE my_demo_transaction(col1 int, " rc= mysql_query(mysql, "CREATE TABLE my_demo_transaction(col1 int, "
"col2 varchar(30)) ENGINE= InnoDB"); "col2 varchar(30)) TYPE= InnoDB");
myquery(rc); myquery(rc);
/* insert a row and commit the transaction */ /* insert a row and commit the transaction */
...@@ -9810,7 +9810,7 @@ static void test_derived() ...@@ -9810,7 +9810,7 @@ static void test_derived()
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t1 (id int(8), primary key (id)) \ rc= mysql_query(mysql, "create table t1 (id int(8), primary key (id)) \
ENGINE=InnoDB DEFAULT CHARSET=utf8"); TYPE=InnoDB DEFAULT CHARSET=utf8");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "insert into t1 values (1)"); rc= mysql_query(mysql, "insert into t1 values (1)");
...@@ -9858,16 +9858,16 @@ static void test_xjoin() ...@@ -9858,16 +9858,16 @@ static void test_xjoin()
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1, t2, t3, t4"); rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1, t2, t3, t4");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t3 (id int(8), param1_id int(8), param2_id int(8)) ENGINE=InnoDB DEFAULT CHARSET=utf8"); rc= mysql_query(mysql, "create table t3 (id int(8), param1_id int(8), param2_id int(8)) TYPE=InnoDB DEFAULT CHARSET=utf8");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t1 ( id int(8), name_id int(8), value varchar(10)) ENGINE=InnoDB DEFAULT CHARSET=utf8"); rc= mysql_query(mysql, "create table t1 ( id int(8), name_id int(8), value varchar(10)) TYPE=InnoDB DEFAULT CHARSET=utf8");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t2 (id int(8), name_id int(8), value varchar(10)) ENGINE=InnoDB DEFAULT CHARSET=utf8;"); rc= mysql_query(mysql, "create table t2 (id int(8), name_id int(8), value varchar(10)) TYPE=InnoDB DEFAULT CHARSET=utf8;");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t4(id int(8), value varchar(10)) ENGINE=InnoDB DEFAULT CHARSET=utf8"); rc= mysql_query(mysql, "create table t4(id int(8), value varchar(10)) TYPE=InnoDB DEFAULT CHARSET=utf8");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "insert into t3 values (1, 1, 1), (2, 2, null)"); rc= mysql_query(mysql, "insert into t3 values (1, 1, 1), (2, 2, null)");
...@@ -14401,7 +14401,7 @@ static void test_bug14210() ...@@ -14401,7 +14401,7 @@ static void test_bug14210()
itself is not InnoDB related. In case the table is MyISAM this test itself is not InnoDB related. In case the table is MyISAM this test
is harmless. is harmless.
*/ */
mysql_query(mysql, "create table t1 (a varchar(255)) engine=InnoDB"); mysql_query(mysql, "create table t1 (a varchar(255)) type=InnoDB");
rc= mysql_query(mysql, "insert into t1 (a) values (repeat('a', 256))"); rc= mysql_query(mysql, "insert into t1 (a) values (repeat('a', 256))");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "set @@session.max_heap_table_size=16384"); rc= mysql_query(mysql, "set @@session.max_heap_table_size=16384");
...@@ -14758,24 +14758,6 @@ static void test_bug16143() ...@@ -14758,24 +14758,6 @@ static void test_bug16143()
} }
/* Bug #16144: mysql_stmt_attr_get type error */
static void test_bug16144()
{
const my_bool flag_orig= (my_bool) 0xde;
my_bool flag= flag_orig;
MYSQL_STMT *stmt;
myheader("test_bug16144");
/* Check that attr_get returns correct data on little and big endian CPUs */
stmt= mysql_stmt_init(mysql);
mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void*) &flag);
mysql_stmt_attr_get(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (void*) &flag);
DIE_UNLESS(flag == flag_orig);
mysql_stmt_close(stmt);
}
/* /*
Bug #15613: "libmysqlclient API function mysql_stmt_prepare returns wrong Bug #15613: "libmysqlclient API function mysql_stmt_prepare returns wrong
field length" field length"
...@@ -14839,6 +14821,72 @@ static void test_bug15613() ...@@ -14839,6 +14821,72 @@ static void test_bug15613()
myquery(rc); myquery(rc);
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
} }
/*
Bug#17667: An attacker has the opportunity to bypass query logging.
*/
static void test_bug17667()
{
int rc;
myheader("test_bug17667");
struct buffer_and_length {
const char *buffer;
const uint length;
} statements[]= {
{ "drop table if exists bug17667", 29 },
{ "create table bug17667 (c varchar(20))", 37 },
{ "insert into bug17667 (c) values ('regular') /* NUL=\0 with comment */", 68 },
{ "insert into bug17667 (c) values ('NUL=\0 in value')", 50 },
{ "insert into bug17667 (c) values ('5 NULs=\0\0\0\0\0')", 48 },
{ "/* NUL=\0 with comment */ insert into bug17667 (c) values ('encore')", 67 },
{ "drop table bug17667", 19 },
{ NULL, 0 } };
struct buffer_and_length *statement_cursor;
FILE *log_file;
for (statement_cursor= statements; statement_cursor->buffer != NULL;
statement_cursor++) {
rc= mysql_real_query(mysql, statement_cursor->buffer,
statement_cursor->length);
myquery(rc);
}
sleep(1); /* The server may need time to flush the data to the log. */
log_file= fopen("var/log/master.log", "r");
if (log_file != NULL) {
for (statement_cursor= statements; statement_cursor->buffer != NULL;
statement_cursor++) {
char line_buffer[MAX_TEST_QUERY_LENGTH*2];
/* more than enough room for the query and some marginalia. */
do {
memset(line_buffer, '/', MAX_TEST_QUERY_LENGTH*2);
DIE_UNLESS(fgets(line_buffer, MAX_TEST_QUERY_LENGTH*2, log_file) !=
NULL);
/* If we reach EOF before finishing the statement list, then we failed. */
} while (my_memmem(line_buffer, MAX_TEST_QUERY_LENGTH*2,
statement_cursor->buffer, statement_cursor->length) == NULL);
}
printf("success. All queries found intact in the log.\n");
} else {
fprintf(stderr, "Could not find the log file, var/log/master.log, so "
"test_bug17667 is \ninconclusive. Run test from the "
"mysql-test/mysql-test-run* program \nto set up the correct "
"environment for this test.\n\n");
}
if (log_file != NULL)
fclose(log_file);
}
/* /*
Bug#14169: type of group_concat() result changed to blob if tmp_table was used Bug#14169: type of group_concat() result changed to blob if tmp_table was used
*/ */
...@@ -15132,13 +15180,13 @@ static struct my_tests_st my_tests[]= { ...@@ -15132,13 +15180,13 @@ static struct my_tests_st my_tests[]= {
{ "test_bug13488", test_bug13488 }, { "test_bug13488", test_bug13488 },
{ "test_bug13524", test_bug13524 }, { "test_bug13524", test_bug13524 },
{ "test_bug14845", test_bug14845 }, { "test_bug14845", test_bug14845 },
{ "test_bug15510", test_bug15510 },
{ "test_opt_reconnect", test_opt_reconnect }, { "test_opt_reconnect", test_opt_reconnect },
{ "test_bug15510", test_bug15510},
{ "test_bug12744", test_bug12744 }, { "test_bug12744", test_bug12744 },
{ "test_bug16143", test_bug16143 }, { "test_bug16143", test_bug16143 },
{ "test_bug16144", test_bug16144 },
{ "test_bug15613", test_bug15613 }, { "test_bug15613", test_bug15613 },
{ "test_bug14169", test_bug14169 }, { "test_bug14169", test_bug14169 },
{ "test_bug17667", test_bug17667 },
{ 0, 0 } { 0, 0 }
}; };
...@@ -15252,6 +15300,7 @@ int main(int argc, char **argv) ...@@ -15252,6 +15300,7 @@ int main(int argc, char **argv)
{ {
struct my_tests_st *fptr; struct my_tests_st *fptr;
DEBUGGER_OFF;
MY_INIT(argv[0]); MY_INIT(argv[0]);
load_defaults("my", client_test_load_default_groups, &argc, &argv); load_defaults("my", client_test_load_default_groups, &argc, &argv);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7