diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-30 23:56:18 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-30 23:56:18 -0400 |
commit | 76f492e26d8d45c678c570be2cf4ca5d238edceb (patch) | |
tree | 248a432c18775614a2e6f171f807be34c0b59975 | |
parent | 932646b1ff6a8f5815a961340a9e1ee4702f5b44 (diff) | |
download | mariadb-git-76f492e26d8d45c678c570be2cf4ca5d238edceb.tar.gz |
Post-merge: Update test results
-rw-r--r-- | mysql-test/r/grant5.result | 2 | ||||
-rw-r--r-- | mysql-test/r/ssl_timeout-9836.result | 2 | ||||
-rw-r--r-- | mysql-test/r/wait_timeout_not_windows.result | 2 | ||||
-rw-r--r-- | mysql-test/suite/binlog/r/binlog_mdev717.result | 8 | ||||
-rw-r--r-- | mysql-test/suite/funcs_1/r/processlist_priv_ps.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/innodb/r/defrag_mdl-9155.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.result | 13 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-simple.result | 2 | ||||
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL_innodb.result | 5 |
9 files changed, 26 insertions, 15 deletions
diff --git a/mysql-test/r/grant5.result b/mysql-test/r/grant5.result index d7f3b6812bb..24abc61a348 100644 --- a/mysql-test/r/grant5.result +++ b/mysql-test/r/grant5.result @@ -4,6 +4,7 @@ create user test; create user foo; create role foo; grant foo to test; +connect conn_1, localhost, test,,; set role foo; show grants for test; Grants for test@% @@ -14,5 +15,6 @@ Grants for foo GRANT USAGE ON *.* TO 'foo' show grants for foo@'%'; ERROR 42000: Access denied for user 'test'@'%' to database 'mysql' +connection default; drop user test, foo; drop role foo; diff --git a/mysql-test/r/ssl_timeout-9836.result b/mysql-test/r/ssl_timeout-9836.result index bc2e19e1475..7e21a8a435b 100644 --- a/mysql-test/r/ssl_timeout-9836.result +++ b/mysql-test/r/ssl_timeout-9836.result @@ -1,3 +1,4 @@ +connect con1,localhost,root,,,,,SSL; SET @@net_read_timeout=1; SELECT 1; 1 @@ -5,3 +6,4 @@ SELECT 1; SELECT 1; 1 1 +disconnect con1; diff --git a/mysql-test/r/wait_timeout_not_windows.result b/mysql-test/r/wait_timeout_not_windows.result index 867787a8ed3..7b129ce5f12 100644 --- a/mysql-test/r/wait_timeout_not_windows.result +++ b/mysql-test/r/wait_timeout_not_windows.result @@ -1,4 +1,6 @@ set global log_warnings=2; +connect foo,localhost,root; set @@wait_timeout=1; +connection default; FOUND /Aborted.*Got timeout reading communication packets/ in mysqld.1.err set global log_warnings=@@log_warnings; diff --git a/mysql-test/suite/binlog/r/binlog_mdev717.result b/mysql-test/suite/binlog/r/binlog_mdev717.result index 82f8e5a6e3f..5fe80be651a 100644 --- a/mysql-test/suite/binlog/r/binlog_mdev717.result +++ b/mysql-test/suite/binlog/r/binlog_mdev717.result @@ -1,26 +1,34 @@ RESET MASTER; +connect con1,localhost,root; +connection default; CREATE DATABASE mysqltest; SET DEBUG_SYNC= "after_wait_locked_schema_name SIGNAL locked WAIT_FOR release"; DROP DATABASE mysqltest;; +connection con1; SET DEBUG_SYNC= "now WAIT_FOR locked"; SET DEBUG_SYNC= "before_wait_locked_pname SIGNAL release"; CREATE FUNCTION mysqltest.f1() RETURNS INT RETURN 1; ERROR 42000: Unknown database 'mysqltest' +connection default; CREATE DATABASE mysqltest; SET DEBUG_SYNC= "after_wait_locked_schema_name SIGNAL locked WAIT_FOR release"; DROP DATABASE mysqltest;; +connection con1; SET DEBUG_SYNC= "now WAIT_FOR locked"; SET DEBUG_SYNC= "before_wait_locked_pname SIGNAL release"; CREATE EVENT mysqltest.e1 ON SCHEDULE EVERY 15 MINUTE DO BEGIN END; ERROR 42000: Unknown database 'mysqltest' +connection default; CREATE DATABASE mysqltest; CREATE EVENT mysqltest.e1 ON SCHEDULE EVERY 15 MINUTE DO BEGIN END; SET DEBUG_SYNC= "after_wait_locked_schema_name SIGNAL locked WAIT_FOR release"; DROP DATABASE mysqltest;; +connection con1; SET DEBUG_SYNC= "now WAIT_FOR locked"; SET DEBUG_SYNC= "before_wait_locked_pname SIGNAL release"; ALTER EVENT mysqltest.e1 ON SCHEDULE EVERY 20 MINUTE DO BEGIN END; ERROR 42000: Unknown database 'mysqltest' +connection default; SET DEBUG_SYNC= "RESET"; include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result index 1886e0a1e1c..69fa605f2bb 100644 --- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result +++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result @@ -60,7 +60,7 @@ INSERT INTO processlist SELECT * FROM test.t_processlist; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' DROP TABLE test.t_processlist; CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY) AS SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist WITH CHECK OPTION; -ERROR HY000: CHECK OPTION on non-updatable view 'test.v_processlist' +ERROR HY000: CHECK OPTION on non-updatable view `test`.`v_processlist` CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY) AS SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist; DROP VIEW test.v_processlist; UPDATE processlist SET user='any_user' WHERE id=1 ; @@ -136,7 +136,7 @@ INSERT INTO processlist SELECT * FROM test.t_processlist; ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema' DROP TABLE test.t_processlist; CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY) AS SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist WITH CHECK OPTION; -ERROR HY000: CHECK OPTION on non-updatable view 'test.v_processlist' +ERROR HY000: CHECK OPTION on non-updatable view `test`.`v_processlist` CREATE VIEW test.v_processlist (ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY) AS SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist; DROP VIEW test.v_processlist; UPDATE processlist SET user='any_user' WHERE id=1 ; diff --git a/mysql-test/suite/innodb/r/defrag_mdl-9155.result b/mysql-test/suite/innodb/r/defrag_mdl-9155.result index 36cafd305ba..18b71f42381 100644 --- a/mysql-test/suite/innodb/r/defrag_mdl-9155.result +++ b/mysql-test/suite/innodb/r/defrag_mdl-9155.result @@ -4,12 +4,15 @@ insert t1 select null, repeat('a', 256) from seq_1_to_100; select count(*) from t1; count(*) 100 +connect con1,localhost,root; start transaction; select count(*) from t1; count(*) 100 +connection default; optimize table t1; Table Op Msg_type Msg_text test.t1 optimize status OK +connection con1; drop table t1; set global innodb_defragment=default; diff --git a/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.result b/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.result index 67af4a068d6..ef2b9648778 100644 --- a/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.result +++ b/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.result @@ -6,16 +6,3 @@ grant select on db.* to current_role; revoke all privileges, grant option from current_role; drop role r1; include/rpl_end.inc -connection server_2; -connection server_2; -connection server_2; -connection server_2; -connection server_1; -connection server_1; -connection server_1; -connection server_2; -connection server_1; -connection server_2; -connection server_2; -connection server_1; -connection server_1; diff --git a/mysql-test/suite/roles/set_role-simple.result b/mysql-test/suite/roles/set_role-simple.result index 4fb705368b7..29b176776e7 100644 --- a/mysql-test/suite/roles/set_role-simple.result +++ b/mysql-test/suite/roles/set_role-simple.result @@ -46,6 +46,7 @@ delete from mysql.roles_mapping where Role='test_role1'; flush privileges; drop user 'test_user'@'localhost'; create user user1; +connect con1,localhost,user1,,; select current_user; current_user user1@% @@ -53,4 +54,5 @@ show grants; Grants for user1@% GRANT USAGE ON *.* TO 'user1'@'%' set role none; +connection default; drop user user1; diff --git a/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL_innodb.result b/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL_innodb.result index 4a5bc3b76e5..1a728a9932c 100644 --- a/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL_innodb.result @@ -1,13 +1,18 @@ include/master-slave.inc [connection master] +connection master; CREATE TEMPORARY TABLE temp_t1 (c1 INT) ENGINE=InnoDB; CREATE TEMPORARY TABLE temp_t2 (c1 INT) ENGINE=MyISAM; CREATE TABLE t1 LIKE temp_t1; CREATE TABLE t2 LIKE temp_t2; +connection slave; +connection master; include/assert.inc ["t1 on master and temp_t1 have the same storage engine"] include/assert.inc ["t2 on master and temp_t2 have the same storage engine"] +connection slave; include/assert.inc ["t1 on slave and temp_t1 have the same storage engine"] include/assert.inc ["t2 on slave and temp_t2 have the same storage engine"] +connection master; DROP TEMPORARY TABLE temp_t1, temp_t2; DROP TABLE t1, t2; include/rpl_end.inc |