mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge
mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysys/default.c: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged storage/heap/hp_hash.c: Auto merged storage/ndb/include/util/Parser.hpp: Auto merged storage/ndb/src/common/portlib/NdbThread.c: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/test/include/NDBT_Test.hpp: Auto merged storage/ndb/test/ndbapi/Makefile.am: Auto merged storage/ndb/test/ndbapi/bank/Bank.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.hpp: Auto merged storage/ndb/test/src/NDBT_Test.cpp: Auto merged storage/ndb/test/src/UtilTransactions.cpp: Auto merged mysql-test/mysql-test-run.pl: SCCS merged
This commit is contained in:
@ -3455,7 +3455,7 @@ test_if_string_in_list(const char *find, List<String> *str_list)
|
||||
{
|
||||
if (find_length != curr_str->length())
|
||||
continue;
|
||||
if (!strncmp(find, curr_str->ptr(), find_length))
|
||||
if (!my_strcasecmp(system_charset_info, find, curr_str->ptr()))
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
|
Reference in New Issue
Block a user