diff options
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_mysql_upgrade.test | 5 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/character_sets_dir_basic.result | 10 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/t/character_sets_dir_basic.test | 19 |
3 files changed, 12 insertions, 22 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test index ec40d23f9eb..c315c6a32c8 100644 --- a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test +++ b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test @@ -24,8 +24,7 @@ connection master; let $before_position= query_get_value(SHOW MASTER STATUS, Position, 1); #With '--force' option, mysql_upgrade always executes all sql statements for upgrading. -#--skip-write-binlog option disables binlog. ---exec $MYSQL_UPGRADE --skip-write-binlog --skip-verbose --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1 +--exec $MYSQL_UPGRADE --skip-verbose --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1 sync_slave_with_master; connection master; @@ -43,7 +42,7 @@ source include/wait_for_slave_sql_to_stop.inc; connection master; #With '--force' option, mysql_upgrade always executes all sql statements for upgrading. ---exec $MYSQL_UPGRADE --skip-verbose --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1 +--exec $MYSQL_UPGRADE --skip-verbose --write-binlog --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1 connection master; let $after_file= query_get_value(SHOW MASTER STATUS, File, 1); diff --git a/mysql-test/suite/sys_vars/r/character_sets_dir_basic.result b/mysql-test/suite/sys_vars/r/character_sets_dir_basic.result index ef8ec0cd9b8..c04e5dac199 100644 --- a/mysql-test/suite/sys_vars/r/character_sets_dir_basic.result +++ b/mysql-test/suite/sys_vars/r/character_sets_dir_basic.result @@ -1,20 +1,20 @@ select @@global.character_sets_dir; @@global.character_sets_dir -MYSQL_CHARSETSDIR +MYSQL_CHARSETSDIR/ select @@session.character_sets_dir; ERROR HY000: Variable 'character_sets_dir' is a GLOBAL variable show global variables like 'character_sets_dir'; Variable_name Value -character_sets_dir MYSQL_CHARSETSDIR +character_sets_dir MYSQL_CHARSETSDIR/ show session variables like 'character_sets_dir'; Variable_name Value -character_sets_dir MYSQL_CHARSETSDIR +character_sets_dir MYSQL_CHARSETSDIR/ select * from information_schema.global_variables where variable_name='character_sets_dir'; VARIABLE_NAME VARIABLE_VALUE -CHARACTER_SETS_DIR MYSQL_CHARSETSDIR +CHARACTER_SETS_DIR MYSQL_CHARSETSDIR/ select * from information_schema.session_variables where variable_name='character_sets_dir'; VARIABLE_NAME VARIABLE_VALUE -CHARACTER_SETS_DIR MYSQL_CHARSETSDIR +CHARACTER_SETS_DIR MYSQL_CHARSETSDIR/ set global character_sets_dir="foo"; ERROR HY000: Variable 'character_sets_dir' is a read only variable set session character_sets_dir="foo"; diff --git a/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test b/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test index 5baff405d28..0bbfd04133d 100644 --- a/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test +++ b/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test @@ -2,26 +2,17 @@ # # show the global and session values; # - -# workaround to adjust for the directory separators being different in -# different OSes : slash on unixes and backslash or slash on windows. -# TODO: fix with a proper comparison in mysqltest -let $rcd= `SELECT REPLACE('$MYSQL_CHARSETSDIR', '\\\\\', '.')`; -let $rcd= `SELECT REPLACE('$rcd', '/', '.')`; -let $regex_charsetdir= `SELECT '/$rcd[[:punct:]]/MYSQL_CHARSETSDIR/'`; - ---replace_regex $regex_charsetdir +--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR select @@global.character_sets_dir; - --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.character_sets_dir; ---replace_regex $regex_charsetdir +--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR show global variables like 'character_sets_dir'; ---replace_regex $regex_charsetdir +--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR show session variables like 'character_sets_dir'; ---replace_regex $regex_charsetdir +--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR select * from information_schema.global_variables where variable_name='character_sets_dir'; ---replace_regex $regex_charsetdir +--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR select * from information_schema.session_variables where variable_name='character_sets_dir'; # |