mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge with 4.0
BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da: Auto merged BitKeeper/deleted/.del-convert.cc~437689acaffb7446: Auto merged BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796: Auto merged BitKeeper/deleted/.del-message.mc: Delete: VC++Files/sql/message.mc BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92: Auto merged BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6: Auto merged Build-tools/Bootstrap: Auto merged client/mysql.cc: Auto merged client/mysqladmin.c: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlmanager-pwgen.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged extra/resolveip.c: Auto merged include/m_string.h: Auto merged include/my_getopt.h: Auto merged isam/isamchk.c: Auto merged isam/pack_isam.c: Auto merged myisam/mi_test1.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged sql/field.cc: Auto merged sql/gen_lex_hash.cc: Auto merged strings/strto.c: Auto merged strings/strtol.c: Auto merged strings/strtoll.c: Auto merged strings/strtoull.c: Auto merged support-files/Makefile.am: Auto merged tools/mysqlmanager.c: Auto merged
This commit is contained in:
@ -2450,13 +2450,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 */
|
||||
/*
|
||||
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);
|
||||
my_casedn_str(system_charset_info,name_buff);
|
||||
db_name = name_buff;
|
||||
my_casedn_str(name_buff);
|
||||
db_name= name_buff;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user