summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/lowercase_table.result21
-rw-r--r--mysql-test/t/lowercase_table.test17
-rw-r--r--mysys/my_getopt.c87
-rw-r--r--sql/log.cc171
-rw-r--r--sql/mysqld.cc20
-rw-r--r--sql/sql_base.cc13
-rw-r--r--sql/table.cc5
7 files changed, 187 insertions, 147 deletions
diff --git a/mysql-test/r/lowercase_table.result b/mysql-test/r/lowercase_table.result
index 5acab254511..43d24b1ab17 100644
--- a/mysql-test/r/lowercase_table.result
+++ b/mysql-test/r/lowercase_table.result
@@ -1,4 +1,5 @@
drop table if exists t1,t2,t3,t4,T1;
+drop database if exists mysqltest;
create table T1 (id int primary key, Word varchar(40) not null, Index(Word));
create table t4 (id int primary key, Word varchar(40) not null);
INSERT INTO T1 VALUES (1, 'a'), (2, 'b'), (3, 'c');
@@ -39,12 +40,22 @@ Unknown table 'T1' in field list
select count(bags.a) from t1 as Bags;
Unknown table 'bags' in field list
drop table t1;
-create database foo;
-use foo;
+create database mysqltest;
+use MYSQLTEST;
create table t1 (a int);
-select FOO.t1.* from FOO.t1;
+select T1.a from MYSQLTEST.T1;
+a
+select t1.a from MYSQLTEST.T1;
+Unknown table 't1' in field list
+select mysqltest.t1.* from MYSQLTEST.t1;
+a
+select MYSQLTEST.t1.* from MYSQLTEST.t1;
+a
+select MYSQLTEST.T1.* from MYSQLTEST.T1;
+a
+select MYSQLTEST.T1.* from T1;
a
alter table t1 rename to T1;
-select FOO.t1.* from FOO.t1;
+select MYSQLTEST.t1.* from MYSQLTEST.t1;
a
-drop database FOO;
+drop database mysqltest;
diff --git a/mysql-test/t/lowercase_table.test b/mysql-test/t/lowercase_table.test
index d52c60baea7..1b431a9d920 100644
--- a/mysql-test/t/lowercase_table.test
+++ b/mysql-test/t/lowercase_table.test
@@ -3,6 +3,7 @@
#
drop table if exists t1,t2,t3,t4,T1;
+drop database if exists mysqltest;
create table T1 (id int primary key, Word varchar(40) not null, Index(Word));
create table t4 (id int primary key, Word varchar(40) not null);
INSERT INTO T1 VALUES (1, 'a'), (2, 'b'), (3, 'c');
@@ -34,10 +35,16 @@ drop table t1;
#
# Test all caps database name
#
-create database foo;
-use foo;
+create database mysqltest;
+use MYSQLTEST;
create table t1 (a int);
-select FOO.t1.* from FOO.t1;
+select T1.a from MYSQLTEST.T1;
+--error 1109
+select t1.a from MYSQLTEST.T1;
+select mysqltest.t1.* from MYSQLTEST.t1;
+select MYSQLTEST.t1.* from MYSQLTEST.t1;
+select MYSQLTEST.T1.* from MYSQLTEST.T1;
+select MYSQLTEST.T1.* from T1;
alter table t1 rename to T1;
-select FOO.t1.* from FOO.t1;
-drop database FOO;
+select MYSQLTEST.t1.* from MYSQLTEST.t1;
+drop database mysqltest;
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index c471a30eb35..f9df4afb55d 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -56,12 +56,12 @@ char *disabled_my_option= (char*) "0";
my_bool my_getopt_print_errors= 1;
-void default_reporter( enum loglevel level, const char *format, ... )
+void default_reporter(enum loglevel level, const char *format, ...)
{
va_list args;
- va_start( args, format );
- vfprintf( stderr, format, args );
- va_end( args );
+ va_start(args, format);
+ vfprintf(stderr, format, args);
+ va_end(args);
}
/*
@@ -75,8 +75,9 @@ void default_reporter( enum loglevel level, const char *format, ... )
*/
int handle_options(int *argc, char ***argv,
- const struct my_option *longopts, my_get_one_option get_one_option,
- my_error_reporter reporter )
+ const struct my_option *longopts,
+ my_get_one_option get_one_option,
+ my_error_reporter reporter)
{
uint opt_found, argvpos= 0, length, i;
my_bool end_of_options= 0, must_be_var, set_maximum_value, special_used,
@@ -90,7 +91,8 @@ int handle_options(int *argc, char ***argv,
(*argv)++; /* --- || ---- */
init_variables(longopts);
- if (! reporter) reporter = &default_reporter;
+ if (! reporter)
+ reporter= &default_reporter;
for (pos= *argv, pos_end=pos+ *argc; pos != pos_end ; pos++)
{
@@ -116,7 +118,8 @@ int handle_options(int *argc, char ***argv,
if (!*++pos)
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL, "%s: Option '-O' requires an argument\n", progname );
+ reporter(ERROR_LEVEL,
+ "%s: Option '-O' requires an argument\n", progname);
return EXIT_ARGUMENT_REQUIRED;
}
cur_arg= *pos;
@@ -132,7 +135,9 @@ int handle_options(int *argc, char ***argv,
if (!*cur_arg)
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL, "%s: Option '--set-variable' requires an argument\n", progname );
+ reporter(ERROR_LEVEL,
+ "%s: Option '--set-variable' requires an argument\n",
+ progname);
return EXIT_ARGUMENT_REQUIRED;
}
}
@@ -144,7 +149,9 @@ int handle_options(int *argc, char ***argv,
if (!*++pos)
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL, "%s: Option '--set-variable' requires an argument\n", progname );
+ reporter(ERROR_LEVEL,
+ "%s: Option '--set-variable' requires an argument\n",
+ progname);
return EXIT_ARGUMENT_REQUIRED;
}
cur_arg= *pos;
@@ -203,10 +210,10 @@ int handle_options(int *argc, char ***argv,
if (opt_found > 1)
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL,
- "%s: ambiguous option '--%s-%s' (--%s-%s)\n",
- progname, special_opt_prefix[i], cur_arg,
- special_opt_prefix[i], prev_found);
+ reporter(ERROR_LEVEL,
+ "%s: ambiguous option '--%s-%s' (--%s-%s)\n",
+ progname, special_opt_prefix[i], cur_arg,
+ special_opt_prefix[i], prev_found);
return EXIT_AMBIGUOUS_OPTION;
}
switch (i) {
@@ -238,16 +245,16 @@ int handle_options(int *argc, char ***argv,
if (must_be_var)
{
if (my_getopt_print_errors)
- reporter( option_is_loose ? WARNING_LEVEL : ERROR_LEVEL,
- "%s: unknown variable '%s'\n", progname, cur_arg );
+ reporter(option_is_loose ? WARNING_LEVEL : ERROR_LEVEL,
+ "%s: unknown variable '%s'\n", progname, cur_arg);
if (!option_is_loose)
return EXIT_UNKNOWN_VARIABLE;
}
else
{
if (my_getopt_print_errors)
- reporter( option_is_loose ? WARNING_LEVEL : ERROR_LEVEL,
- "%s: unknown option '--%s'\n", progname, cur_arg );
+ reporter(option_is_loose ? WARNING_LEVEL : ERROR_LEVEL,
+ "%s: unknown option '--%s'\n", progname, cur_arg);
if (!option_is_loose)
return EXIT_UNKNOWN_OPTION;
}
@@ -263,23 +270,23 @@ int handle_options(int *argc, char ***argv,
if (must_be_var)
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL, "%s: variable prefix '%s' is not unique\n",
- progname, cur_arg);
+ reporter(ERROR_LEVEL, "%s: variable prefix '%s' is not unique\n",
+ progname, cur_arg);
return EXIT_VAR_PREFIX_NOT_UNIQUE;
}
else
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL, "%s: ambiguous option '--%s' (%s, %s)\n",
- progname, cur_arg, prev_found, optp->name);
+ reporter(ERROR_LEVEL, "%s: ambiguous option '--%s' (%s, %s)\n",
+ progname, cur_arg, prev_found, optp->name);
return EXIT_AMBIGUOUS_OPTION;
}
}
if (must_be_var && optp->var_type == GET_NO_ARG)
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL, "%s: option '%s' cannot take an argument\n",
- progname, optp->name);
+ reporter(ERROR_LEVEL, "%s: option '%s' cannot take an argument\n",
+ progname, optp->name);
return EXIT_NO_ARGUMENT_ALLOWED;
}
if (optp->arg_type == NO_ARG)
@@ -287,8 +294,9 @@ int handle_options(int *argc, char ***argv,
if (optend && optp->var_type != GET_BOOL)
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL, "%s: option '--%s' cannot take an argument\n",
- progname, optp->name);
+ reporter(ERROR_LEVEL,
+ "%s: option '--%s' cannot take an argument\n",
+ progname, optp->name);
return EXIT_NO_ARGUMENT_ALLOWED;
}
if (optp->var_type == GET_BOOL)
@@ -325,8 +333,9 @@ int handle_options(int *argc, char ***argv,
if (!*++pos)
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL, "%s: option '--%s' requires an argument\n",
- progname, optp->name);
+ reporter(ERROR_LEVEL,
+ "%s: option '--%s' requires an argument\n",
+ progname, optp->name);
return EXIT_ARGUMENT_REQUIRED;
}
argument= *pos;
@@ -375,9 +384,9 @@ int handle_options(int *argc, char ***argv,
if (!pos[1])
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL,
- "%s: option '-%c' requires an argument\n",
- progname, optp->id);
+ reporter(ERROR_LEVEL,
+ "%s: option '-%c' requires an argument\n",
+ progname, optp->id);
return EXIT_ARGUMENT_REQUIRED;
}
argument= *++pos;
@@ -387,9 +396,9 @@ int handle_options(int *argc, char ***argv,
}
if ((error= setval(optp, argument, set_maximum_value)))
{
- reporter( ERROR_LEVEL,
- "%s: Error while setting value '%s' to '%s'\n",
- progname, argument, optp->name);
+ reporter(ERROR_LEVEL,
+ "%s: Error while setting value '%s' to '%s'\n",
+ progname, argument, optp->name);
return error;
}
get_one_option(optp->id, optp, argument);
@@ -399,8 +408,8 @@ int handle_options(int *argc, char ***argv,
if (!opt_found)
{
if (my_getopt_print_errors)
- reporter( ERROR_LEVEL,
- "%s: unknown option '-%c'\n", progname, *optend);
+ reporter(ERROR_LEVEL,
+ "%s: unknown option '-%c'\n", progname, *optend);
return EXIT_UNKNOWN_OPTION;
}
}
@@ -409,9 +418,9 @@ int handle_options(int *argc, char ***argv,
}
if ((error= setval(optp, argument, set_maximum_value)))
{
- reporter( ERROR_LEVEL,
- "%s: Error while setting value '%s' to '%s'\n",
- progname, argument, optp->name);
+ reporter(ERROR_LEVEL,
+ "%s: Error while setting value '%s' to '%s'\n",
+ progname, argument, optp->name);
return error;
}
get_one_option(optp->id, optp, argument);
diff --git a/sql/log.cc b/sql/log.cc
index db7b80eb4f7..e9dd2e4a69b 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -43,37 +43,41 @@ static bool test_if_number(const char *str,
#ifdef __NT__
static int eventSource = 0;
-void setupWindowsEventSource()
-{
- if (eventSource) return;
- eventSource = 1;
- HKEY hRegKey = NULL;
- DWORD dwError = 0;
- TCHAR szPath[ MAX_PATH ];
+void setup_windows_event_source()
+{
+ HKEY hRegKey= NULL;
+ DWORD dwError= 0;
+ TCHAR szPath[MAX_PATH];
+ DWORD dwTypes;
- // Create the event source registry key
- dwError = RegCreateKey( HKEY_LOCAL_MACHINE,
- "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\MySQL",
- &hRegKey );
+ if (eventSource) // Ensure that we are only called once
+ return;
+ eventSource= 1;
- // Name of the PE module that contains the message resource
- GetModuleFileName( NULL, szPath, MAX_PATH );
+ // Create the event source registry key
+ dwError= RegCreateKey(HKEY_LOCAL_MACHINE,
+ "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\MySQL",
+ &hRegKey);
- // Register EventMessageFile
- dwError = RegSetValueEx( hRegKey, "EventMessageFile", 0, REG_EXPAND_SZ,
- (PBYTE) szPath, strlen(szPath)+1 );
+ /* Name of the PE module that contains the message resource */
+ GetModuleFileName(NULL, szPath, MAX_PATH);
+
+ / Register EventMessageFile */
+ dwError = RegSetValueEx(hRegKey, "EventMessageFile", 0, REG_EXPAND_SZ,
+ (PBYTE) szPath, strlen(szPath)+1);
- // Register supported event types
- DWORD dwTypes = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
- dwError = RegSetValueEx( hRegKey, "TypesSupported", 0, REG_DWORD,
- (LPBYTE) &dwTypes, sizeof dwTypes );
+ /* Register supported event types */
+ dwTypes= (EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE |
+ EVENTLOG_INFORMATION_TYPE);
+ dwError= RegSetValueEx(hRegKey, "TypesSupported", 0, REG_DWORD,
+ (LPBYTE) &dwTypes, sizeof dwTypes);
- RegCloseKey( hRegKey );
+ RegCloseKey(hRegKey);
}
-#endif
+#endif /* __NT__ */
/****************************************************************************
@@ -1732,33 +1736,33 @@ static bool test_if_number(register const char *str,
} /* test_if_number */
-void print_buffer_to_file( enum loglevel level, const char *buffer )
+void print_buffer_to_file(enum loglevel level, const char *buffer)
{
time_t skr;
struct tm tm_tmp;
struct tm *start;
-
- DBUG_ENTER("print_buffer_to_log");
+ DBUG_ENTER("print_buffer_to_file");
+ DBUG_PRINT("enter",("buffer: %s", buffer));
VOID(pthread_mutex_lock(&LOCK_error_log));
skr=time(NULL);
localtime_r(&skr, &tm_tmp);
start=&tm_tmp;
- fprintf( stderr, "%02d%02d%02d %2d:%02d:%02d [%s] %s\n",
+ fprintf(stderr, "%02d%02d%02d %2d:%02d:%02d [%s] %s\n",
start->tm_year % 100,
start->tm_mon+1,
start->tm_mday,
start->tm_hour,
start->tm_min,
start->tm_sec,
- level == ERROR_LEVEL ? "ERROR" : level == WARNING_LEVEL ? "WARNING" : "INFORMATION",
- buffer );
+ (level == ERROR_LEVEL ? "ERROR" : level == WARNING_LEVEL ?
+ "WARNING" : "INFORMATION"),
+ buffer);
fflush(stderr);
VOID(pthread_mutex_unlock(&LOCK_error_log));
-
DBUG_VOID_RETURN;
}
@@ -1772,6 +1776,7 @@ void sql_perror(const char *message)
#endif
}
+
bool flush_error_log()
{
bool result=0;
@@ -1820,122 +1825,124 @@ bool flush_error_log()
#ifdef __NT__
-void print_buffer_to_nt_eventlog( enum loglevel level, char *buff, int buffLen )
+void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
+ uint length, int buffLen)
{
HANDLE event;
char *buffptr;
LPCSTR *buffmsgptr;
+ DBUG_ENTER("print_buffer_to_nt_eventlog");
- DBUG_ENTER( "print_buffer_to_nt_eventlog" );
-
- buffptr = buff;
- if (strlen(buff) > (uint)(buffLen-4))
+ buffptr= buff;
+ if (length > (uint)(buffLen-4))
{
- char *newBuff = new char[ strlen(buff) + 4 ];
- strcpy( newBuff, buff );
- buffptr = newBuff;
+ char *newBuff= new char[length + 4];
+ strcpy(newBuff, buff);
+ buffptr= newBuff;
}
- strcat( buffptr, "\r\n\r\n" );
- buffmsgptr = (LPCSTR*)&buffptr;
+ strmov(buffptr+length, "\r\n\r\n");
+ buffmsgptr= (LPCSTR*) &buffptr; // Keep windows happy
- setupWindowsEventSource();
- if (event = RegisterEventSource(NULL,"MySQL"))
+ setup_windows_event_source();
+ if ((event= RegisterEventSource(NULL,"MySQL")))
{
- switch (level){
+ switch (level) {
case ERROR_LEVEL:
- ReportEvent(event, EVENTLOG_ERROR_TYPE, 0, MSG_DEFAULT, NULL, 1, 0, buffmsgptr, NULL);
+ ReportEvent(event, EVENTLOG_ERROR_TYPE, 0, MSG_DEFAULT, NULL, 1, 0,
+ buffmsgptr, NULL);
break;
case WARNING_LEVEL:
- ReportEvent(event, EVENTLOG_WARNING_TYPE, 0, MSG_DEFAULT, NULL, 1, 0, buffmsgptr, NULL);
+ ReportEvent(event, EVENTLOG_WARNING_TYPE, 0, MSG_DEFAULT, NULL, 1, 0,
+ buffmsgptr, NULL);
break;
case INFORMATION_LEVEL:
- ReportEvent(event, EVENTLOG_INFORMATION_TYPE, 0, MSG_DEFAULT, NULL, 1, 0, buffmsgptr, NULL);
+ ReportEvent(event, EVENTLOG_INFORMATION_TYPE, 0, MSG_DEFAULT, NULL, 1,
+ 0, buffmsgptr, NULL);
break;
}
DeregisterEventSource(event);
}
- // if we created a string buffer, then delete it
- if ( buffptr != buff )
+ /* if we created a string buffer, then delete it */
+ if (buffptr != buff)
delete[] buffptr;
-
DBUG_VOID_RETURN;
}
-#endif
+#endif /* __NT__ */
+
/*
- Prints a printf style message to the error log and, under NT, to the Windows event log.
+ Prints a printf style message to the error log and, under NT, to the
+ Windows event log.
SYNOPSIS
vprint_msg_to_log()
- event_type Type of event to write (Error, Warning, or Info)
- format Printf style format of message
- args va_list list of arguments for the message
+ event_type Type of event to write (Error, Warning, or Info)
+ format Printf style format of message
+ args va_list list of arguments for the message
NOTE
IMPLEMENTATION
- This function prints the message into a buffer and then sends that buffer to other
- functions to write that message to other logging sources.
+ This function prints the message into a buffer and then sends that buffer
+ to other functions to write that message to other logging sources.
RETURN VALUES
void
*/
+
void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
{
char buff[1024];
-
+ uint length;
DBUG_ENTER("vprint_msg_to_log");
- my_vsnprintf( buff, sizeof(buff)-5, format, args );
-
- print_buffer_to_file( level, buff );
-
-#ifndef DBUG_OFF
- DBUG_PRINT("error",("%s",buff));
-#endif
+ length= my_vsnprintf(buff, sizeof(buff)-5, format, args);
+ print_buffer_to_file(level, buff);
#ifdef __NT__
- print_buffer_to_nt_eventlog( level, buff, sizeof(buff) );
+ print_buffer_to_nt_eventlog(level, buff, length, sizeof(buff));
#endif
DBUG_VOID_RETURN;
}
-void sql_print_error( const char *format, ... )
+void sql_print_error(const char *format, ...)
{
- DBUG_ENTER( "sql_print_error" );
-
va_list args;
- va_start( args, format );
- vprint_msg_to_log( ERROR_LEVEL, format, args );
- va_end( args );
+ DBUG_ENTER("sql_print_error");
+
+ va_start(args, format);
+ vprint_msg_to_log(ERROR_LEVEL, format, args);
+ va_end(args);
DBUG_VOID_RETURN;
}
-void sql_print_warning( const char *format, ... )
-{
- DBUG_ENTER( "sql_print_warning" );
+void sql_print_warning(const char *format, ...)
+{
va_list args;
- va_start( args, format );
- vprint_msg_to_log( WARNING_LEVEL, format, args );
- va_end( args );
+ DBUG_ENTER("sql_print_warning");
+
+ va_start(args, format);
+ vprint_msg_to_log(WARNING_LEVEL, format, args);
+ va_end(args);
DBUG_VOID_RETURN;
}
-void sql_print_information( const char *format, ... )
-{
- DBUG_ENTER( "sql_print_information" );
+void sql_print_information(const char *format, ...)
+{
va_list args;
- va_start( args, format );
- vprint_msg_to_log( INFORMATION_LEVEL, format, args );
- va_end( args );
+ DBUG_ENTER("sql_print_information");
+
+ va_start(args, format);
+ vprint_msg_to_log(INFORMATION_LEVEL, format, args);
+ va_end(args);
DBUG_VOID_RETURN;
}
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 8b10627b323..1068c5ec9a1 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2247,6 +2247,10 @@ int main(int argc, char **argv)
if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
opt_mysql_tmpdir=(char*) P_tmpdir; /* purecov: inspected */
+ /* needed by get_options */
+
+ (void) pthread_mutex_init(&LOCK_error_log,MY_MUTEX_INIT_FAST);
+
set_options();
get_options(argc,argv);
set_server_version();
@@ -2263,7 +2267,6 @@ int main(int argc, char **argv)
(void) pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST);
(void) pthread_mutex_init(&LOCK_mapped_file,MY_MUTEX_INIT_SLOW);
(void) pthread_mutex_init(&LOCK_status,MY_MUTEX_INIT_FAST);
- (void) pthread_mutex_init(&LOCK_error_log,MY_MUTEX_INIT_FAST);
(void) pthread_mutex_init(&LOCK_delayed_insert,MY_MUTEX_INIT_FAST);
(void) pthread_mutex_init(&LOCK_delayed_status,MY_MUTEX_INIT_FAST);
(void) pthread_mutex_init(&LOCK_delayed_create,MY_MUTEX_INIT_SLOW);
@@ -5100,21 +5103,24 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
}
return 0;
}
- /* Initiates DEBUG - but no debugging here ! */
-void option_error_reporter( enum loglevel level, const char *format, ... )
+
+void option_error_reporter(enum loglevel level, const char *format, ...)
{
va_list args;
- va_start( args, format );
- vprint_msg_to_log( level, format, args );
- va_end( args );
+ va_start(args, format);
+ vprint_msg_to_log(level, format, args);
+ va_end(args);
}
+ /* Initiates DEBUG - but no debugging here ! */
+
static void get_options(int argc,char **argv)
{
int ho_error;
- if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, option_error_reporter )))
+ if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option,
+ option_error_reporter)))
exit(ho_error);
#if defined(HAVE_BROKEN_REALPATH)
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 26ce394ec37..8fd7273fd78 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2066,13 +2066,16 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
uint found;
DBUG_ENTER("insert_fields");
-
if (db_name && lower_case_table_names)
{
- /* convert database to lower case for comparison */
- strmake( name_buff, db_name, sizeof(name_buff)-1 );
- casedn_str( name_buff );
- db_name = name_buff;
+ /*
+ convert database to lower case for comparison
+ We can't do this in Item_field as this would change the
+ 'name' of the item which may be used in the select list
+ */
+ strmake(name_buff, db_name, sizeof(name_buff)-1);
+ casedn_str(name_buff);
+ db_name= name_buff;
}
diff --git a/sql/table.cc b/sql/table.cc
index 898ed4bca3d..573fa11a4c4 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -999,10 +999,7 @@ void append_unescaped(String *res,const char *pos)
for (; *pos ; )
{
-#ifdef USE_MB
- /*
- Note, there is no needs to propagate this code into 4.1.
- */
+#if defined(USE_MB) && MYSQL_VERSION_ID < 40100
uint mblen;
if (use_mb(default_charset_info) &&
(mblen= my_ismbchar(default_charset_info, pos, end)))