File tree Expand file tree Collapse file tree 6 files changed +261
-423
lines changed Expand file tree Collapse file tree 6 files changed +261
-423
lines changed Original file line number Diff line number Diff line change 1
- call mtr.add_suppression("Can't open and lock privilege tables: Table 'host ' was not locked with LOCK TABLES");
1
+ call mtr.add_suppression("Can't open and lock privilege tables: Table 'user ' was not locked with LOCK TABLES");
2
2
SHOW VARIABLES like 'slave_skip_errors';
3
3
Variable_name Value
4
4
slave_skip_errors OFF
@@ -16,7 +16,7 @@ DROP TABLE IF EXISTS t1;
16
16
CREATE TABLE t1 (c1 INT);
17
17
LOCK TABLES t1 READ;
18
18
FLUSH PRIVILEGES;
19
- ERROR HY000: Table 'host ' was not locked with LOCK TABLES
19
+ ERROR HY000: Table 'user ' was not locked with LOCK TABLES
20
20
UNLOCK TABLES;
21
21
DROP TABLE t1;
22
22
#
Original file line number Diff line number Diff line change @@ -128,11 +128,8 @@ CREATE FUNCTION f1() RETURNS INT RETURN 1;
128
128
RENAME TABLE mysql.procs_priv TO procs_priv_backup;
129
129
FLUSH TABLE mysql.procs_priv;
130
130
DROP FUNCTION f1;
131
- ERROR 42S02: Table 'mysql.procs_priv' doesn't exist
132
131
SHOW WARNINGS;
133
132
Level Code Message
134
- Error 1146 Table 'mysql.procs_priv' doesn't exist
135
- Warning 1405 Failed to revoke all privileges to dropped routine
136
133
# Restore the procs_priv table
137
134
RENAME TABLE procs_priv_backup TO mysql.procs_priv;
138
135
FLUSH TABLE mysql.procs_priv;
Original file line number Diff line number Diff line change 6
6
7
7
# End of 4.1 tests
8
8
9
- call mtr.add_suppression("Can't open and lock privilege tables: Table 'host ' was not locked with LOCK TABLES");
9
+ call mtr.add_suppression("Can't open and lock privilege tables: Table 'user ' was not locked with LOCK TABLES");
10
10
11
11
#
12
12
# Bug#43835: SHOW VARIABLES does not include 0 for slave_skip_errors
Original file line number Diff line number Diff line change @@ -214,7 +214,6 @@ RENAME TABLE mysql.procs_priv TO procs_priv_backup;
214
214
FLUSH TABLE mysql.procs_priv;
215
215
216
216
# DROP FUNCTION used to cause an assert.
217
- --error ER_NO_SUCH_TABLE
218
217
DROP FUNCTION f1;
219
218
SHOW WARNINGS;
220
219
You can’t perform that action at this time.
0 commit comments