Commit 7b58fd5e authored by Sergei Golubchik's avatar Sergei Golubchik

tests -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci

This fixes:
MDEV-7693 MariaDB - mysql-test - SUITE:funcs_1 - funcs_1.is_tables_mysql is failing on TABLE_COLLATION /DATABASE_COLLATION
MDEV-8487 mysql-test - main.information_schema 'xtradb' fails
MDEV-8486 mysql-test - main.bootstrap fails
parent 0ee919b8
...@@ -3638,7 +3638,7 @@ sub mysql_install_db { ...@@ -3638,7 +3638,7 @@ sub mysql_install_db {
# Create mtr database # Create mtr database
mtr_tofile($bootstrap_sql_file, mtr_tofile($bootstrap_sql_file,
"CREATE DATABASE mtr;\n"); "CREATE DATABASE mtr CHARSET=latin1;\n");
# Add help tables and data for warning detection and supression # Add help tables and data for warning detection and supression
mtr_tofile($bootstrap_sql_file, mtr_tofile($bootstrap_sql_file,
......
...@@ -1079,10 +1079,8 @@ binlog-stmt-cache-size 32768 ...@@ -1079,10 +1079,8 @@ binlog-stmt-cache-size 32768
bulk-insert-buffer-size 8388608 bulk-insert-buffer-size 8388608
character-set-client-handshake TRUE character-set-client-handshake TRUE
character-set-filesystem binary character-set-filesystem binary
character-set-server latin1
character-sets-dir MYSQL_CHARSETSDIR/ character-sets-dir MYSQL_CHARSETSDIR/
chroot (No default value) chroot (No default value)
collation-server latin1_swedish_ci
completion-type NO_CHAIN completion-type NO_CHAIN
concurrent-insert AUTO concurrent-insert AUTO
console FALSE console FALSE
......
...@@ -79,7 +79,7 @@ EOF ...@@ -79,7 +79,7 @@ EOF
# #
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql --write_file $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql
use test; use test;
create table t1(a int) engine=example; create table t1(a int) engine=example charset=latin1;
EOF EOF
--exec $MYSQLD_BOOTSTRAP_CMD --plugin-dir=$PLUGIN_DIR < $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1 --exec $MYSQLD_BOOTSTRAP_CMD --plugin-dir=$PLUGIN_DIR < $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
--remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql --remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql
......
...@@ -22,6 +22,7 @@ perl; ...@@ -22,6 +22,7 @@ perl;
log-slow-queries pid-file slow-query-log-file log-basename log-slow-queries pid-file slow-query-log-file log-basename
datadir slave-load-tmpdir tmpdir socket thread-pool-size datadir slave-load-tmpdir tmpdir socket thread-pool-size
large-files-support lower-case-file-system system-time-zone large-files-support lower-case-file-system system-time-zone
collation-server character-set-server
version.*/; version.*/;
# Plugins which may or may not be there: # Plugins which may or may not be there:
......
...@@ -229,7 +229,7 @@ SET @cmd= "CREATE TABLE IF NOT EXISTS gtid_slave_pos ( ...@@ -229,7 +229,7 @@ SET @cmd= "CREATE TABLE IF NOT EXISTS gtid_slave_pos (
sub_id BIGINT UNSIGNED NOT NULL, sub_id BIGINT UNSIGNED NOT NULL,
server_id INT UNSIGNED NOT NULL, server_id INT UNSIGNED NOT NULL,
seq_no BIGINT UNSIGNED NOT NULL, seq_no BIGINT UNSIGNED NOT NULL,
PRIMARY KEY (domain_id, sub_id)) PRIMARY KEY (domain_id, sub_id)) CHARSET=latin1
COMMENT='Replication slave GTID position'"; COMMENT='Replication slave GTID position'";
SET @str=CONCAT(@cmd, ' ENGINE=', @innodb_or_myisam); SET @str=CONCAT(@cmd, ' ENGINE=', @innodb_or_myisam);
PREPARE stmt FROM @str; PREPARE stmt FROM @str;
......
...@@ -2261,7 +2261,7 @@ static void test_ps_query_cache() ...@@ -2261,7 +2261,7 @@ static void test_ps_query_cache()
return; return;
} }
rc= mysql_query(mysql, "SET SQL_MODE=''"); rc= mysql_set_character_set(mysql, "utf8");
myquery(rc); myquery(rc);
/* prepare the table */ /* prepare the table */
...@@ -2306,7 +2306,7 @@ static void test_ps_query_cache() ...@@ -2306,7 +2306,7 @@ static void test_ps_query_cache()
mysql_close(lmysql); mysql_close(lmysql);
DIE_UNLESS(0); DIE_UNLESS(0);
} }
rc= mysql_query(lmysql, "SET SQL_MODE=''"); rc= mysql_set_character_set(lmysql, "utf8");
myquery(rc); myquery(rc);
if (!opt_silent) if (!opt_silent)
...@@ -16647,7 +16647,7 @@ static void test_bug30472() ...@@ -16647,7 +16647,7 @@ static void test_bug30472()
/* Switch client character set. */ /* Switch client character set. */
DIE_IF(mysql_set_character_set(&con, "utf8")); DIE_IF(mysql_set_character_set(&con, "latin2"));
/* Retrieve character set information. */ /* Retrieve character set information. */
...@@ -16663,10 +16663,10 @@ static void test_bug30472() ...@@ -16663,10 +16663,10 @@ static void test_bug30472()
2) new character set is different from the original one. 2) new character set is different from the original one.
*/ */
DIE_UNLESS(strcmp(character_set_name_2, "utf8") == 0); DIE_UNLESS(strcmp(character_set_name_2, "latin2") == 0);
DIE_UNLESS(strcmp(character_set_client_2, "utf8") == 0); DIE_UNLESS(strcmp(character_set_client_2, "latin2") == 0);
DIE_UNLESS(strcmp(character_set_results_2, "utf8") == 0); DIE_UNLESS(strcmp(character_set_results_2, "latin2") == 0);
DIE_UNLESS(strcmp(collation_connnection_2, "utf8_general_ci") == 0); DIE_UNLESS(strcmp(collation_connnection_2, "latin2_general_ci") == 0);
DIE_UNLESS(strcmp(character_set_name_1, character_set_name_2) != 0); DIE_UNLESS(strcmp(character_set_name_1, character_set_name_2) != 0);
DIE_UNLESS(strcmp(character_set_client_1, character_set_client_2) != 0); DIE_UNLESS(strcmp(character_set_client_1, character_set_client_2) != 0);
......
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