Skip to content

Commit c517f0e

Browse files
committed
fix incorrect merge 15700f5 (part 3) galera.mariadb_tzinfo_to_sql
In 805e7ca the errors codes for "The variable '@@alter_algorithm' is ignored" was changed to 4201 when it should have stayed as 4200. Correct like main.mysql_tzinfo_to_sql_symlink in to the 4200 code like it was when they where added in 2464ee7.
1 parent 63cbca3 commit c517f0e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

mysql-test/suite/galera/r/mariadb_tzinfo_to_sql.result

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ SET @save_wsrep_mode=@@WSREP_MODE;
2121
# Apply on node_1
2222

2323
Warnings:
24-
Warning 4201 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
24+
Warning 4200 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
2525
Warnings:
26-
Warning 4201 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
26+
Warning 4200 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
2727
'binlog stationary as expected'
2828
SELECT @wsrep_is_on, @wsrep_cannot_replicate_tz, @save_wsrep_on, @save_sql_log_bin, @@WSREP_ON, @@SQL_LOG_BIN;
2929
@wsrep_is_on @wsrep_cannot_replicate_tz @save_wsrep_on @save_sql_log_bin @@WSREP_ON @@SQL_LOG_BIN
@@ -78,9 +78,9 @@ COUNT(*)
7878
connection node_1;
7979
SET GLOBAL WSREP_MODE='REPLICATE_ARIA,REPLICATE_MYISAM';
8080
Warnings:
81-
Warning 4201 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
81+
Warning 4200 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
8282
Warnings:
83-
Warning 4201 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
83+
Warning 4200 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
8484
'binlog stationary as expected'
8585
SELECT @wsrep_is_on, @wsrep_cannot_replicate_tz, @save_wsrep_on, @save_sql_log_bin, @@WSREP_ON, @@SQL_LOG_BIN;
8686
@wsrep_is_on @wsrep_cannot_replicate_tz @save_wsrep_on @save_sql_log_bin @@WSREP_ON @@SQL_LOG_BIN
@@ -137,9 +137,9 @@ COUNT(*)
137137

138138
connection node_1;
139139
Warnings:
140-
Warning 4201 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
140+
Warning 4200 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
141141
Warnings:
142-
Warning 4201 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
142+
Warning 4200 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
143143
'binlog advanced as expected'
144144
SELECT @wsrep_is_on, @wsrep_cannot_replicate_tz, @save_wsrep_on, @save_sql_log_bin, @@WSREP_ON, @@SQL_LOG_BIN;
145145
@wsrep_is_on @wsrep_cannot_replicate_tz @save_wsrep_on @save_sql_log_bin @@WSREP_ON @@SQL_LOG_BIN
@@ -199,9 +199,9 @@ TRUNCATE TABLE time_zone_leap_second;
199199
connection node_1;
200200
SET GLOBAL WSREP_MODE='';
201201
Warnings:
202-
Warning 4201 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
202+
Warning 4200 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
203203
Warnings:
204-
Warning 4201 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
204+
Warning 4200 The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
205205
'binlog advanced as expected'
206206
SELECT @wsrep_is_on, @wsrep_cannot_replicate_tz, @save_wsrep_on, @save_sql_log_bin, @@WSREP_ON, @@SQL_LOG_BIN;
207207
@wsrep_is_on @wsrep_cannot_replicate_tz @save_wsrep_on @save_sql_log_bin @@WSREP_ON @@SQL_LOG_BIN

0 commit comments

Comments
 (0)