Skip to content

Commit 0852cf5

Browse files
vuvovavuvova
committed
say MariaDB in InnoDB error messages, not MySQL
1 parent f7dcd8a commit 0852cf5

File tree

4 files changed

+39
-39
lines changed

4 files changed

+39
-39
lines changed

‎mysql-test/suite/innodb/r/innodb-corrupted-table.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in MySQL.*");
2-
call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB, which is different from the number of indexes .* defined in the MySQL.*");
1+
call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in MariaDB.*");
2+
call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB, which is different from the number of indexes .* defined in the MariaDB.*");
33
create table t1 (pk int, i int, key(i)) engine=InnoDB;
44
insert into t1 values (1,1),(2,2);
55
flush tables;
@@ -14,18 +14,18 @@ t1 CREATE TABLE `t1` (
1414
KEY `i` (`i`)
1515
) ENGINE=InnoDB DEFAULT CHARSET=latin1
1616
Warnings:
17-
Warning 1082 InnoDB: Table test/t1 has a primary key in InnoDB data dictionary, but not in MySQL!
18-
Warning 1082 InnoDB: Table test/t1 contains 2 indexes inside InnoDB, which is different from the number of indexes 1 defined in the MySQL
17+
Warning 1082 InnoDB: Table test/t1 has a primary key in InnoDB data dictionary, but not in MariaDB!
18+
Warning 1082 InnoDB: Table test/t1 contains 2 indexes inside InnoDB, which is different from the number of indexes 1 defined in the MariaDB
1919
select * from t1;
2020
pk i
2121
1 1
2222
2 2
2323
alter table t1 add j int;
2424
Warnings:
25-
Warning 1082 InnoDB: Table test/t1 contains 2 indexes inside InnoDB, which is different from the number of indexes 1 defined in the MySQL
25+
Warning 1082 InnoDB: Table test/t1 contains 2 indexes inside InnoDB, which is different from the number of indexes 1 defined in the MariaDB
2626
show warnings;
2727
Level Code Message
28-
Warning 1082 InnoDB: Table test/t1 contains 2 indexes inside InnoDB, which is different from the number of indexes 1 defined in the MySQL
28+
Warning 1082 InnoDB: Table test/t1 contains 2 indexes inside InnoDB, which is different from the number of indexes 1 defined in the MariaDB
2929
show create table t1;
3030
Table Create Table
3131
t1 CREATE TABLE `t1` (

‎mysql-test/suite/innodb/t/innodb-corrupted-table.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# MDEV-9918: [ERROR] mysqld got signal 11 during ALTER TABLE `name` COLUMN ADD
66
#
77

8-
call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in MySQL.*");
9-
call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB, which is different from the number of indexes .* defined in the MySQL.*");
8+
call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in MariaDB.*");
9+
call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB, which is different from the number of indexes .* defined in the MariaDB.*");
1010

1111
create table t1 (pk int, i int, key(i)) engine=InnoDB;
1212
insert into t1 values (1,1),(2,2);

‎mysql-test/suite/sys_vars/r/sysvars_innodb.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
488488
DEFAULT_VALUE crc32
489489
VARIABLE_SCOPE GLOBAL
490490
VARIABLE_TYPE ENUM
491-
VARIABLE_COMMENT The algorithm InnoDB uses for page checksumming. Possible values are CRC32 (hardware accelerated if the CPU supports it) write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Files updated when this option is set to crc32 or strict_crc32 will not be readable by MySQL versions older than 5.6.3
491+
VARIABLE_COMMENT The algorithm InnoDB uses for page checksumming. Possible values are CRC32 (hardware accelerated if the CPU supports it) write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Files updated when this option is set to crc32 or strict_crc32 will not be readable by InnoDB versions older than 5.6.3
492492
NUMERIC_MIN_VALUE NULL
493493
NUMERIC_MAX_VALUE NULL
494494
NUMERIC_BLOCK_SIZE NULL
@@ -1930,7 +1930,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
19301930
DEFAULT_VALUE OFF
19311931
VARIABLE_SCOPE GLOBAL
19321932
VARIABLE_TYPE BOOLEAN
1933-
VARIABLE_COMMENT Print all deadlocks to MySQL error log (off by default)
1933+
VARIABLE_COMMENT Print all deadlocks to MariaDB error log (off by default)
19341934
NUMERIC_MIN_VALUE NULL
19351935
NUMERIC_MAX_VALUE NULL
19361936
NUMERIC_BLOCK_SIZE NULL

‎storage/innobase/handler/ha_innodb.cc

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4976,7 +4976,7 @@ innobase_commit(
49764976

49774977
if (!trx_is_registered_for_2pc(trx) && trx_is_started(trx)) {
49784978

4979-
sql_print_error("Transaction not registered for MySQL 2PC,"
4979+
sql_print_error("Transaction not registered for MariaDB 2PC,"
49804980
" but transaction is active");
49814981
}
49824982

@@ -5490,7 +5490,7 @@ innobase_close_connection(
54905490

54915491
if (!trx_is_registered_for_2pc(trx) && trx_is_started(trx)) {
54925492

5493-
sql_print_error("Transaction not registered for MySQL 2PC, "
5493+
sql_print_error("Transaction not registered for MariaDB 2PC, "
54945494
"but transaction is active");
54955495
}
54965496

@@ -5511,7 +5511,7 @@ innobase_close_connection(
55115511
}
55125512
} else {
55135513
sql_print_warning(
5514-
"MySQL is closing a connection that has an active "
5514+
"MariaDB is closing a connection that has an active "
55155515
"InnoDB transaction. " TRX_ID_FMT " row modifications "
55165516
"will roll back.",
55175517
" row modifications will roll back.",
@@ -6485,7 +6485,7 @@ innobase_build_index_translation(
64856485
if (!innobase_match_index_columns(&table->key_info[count],
64866486
index_mapping[count])) {
64876487
sql_print_error("Found index %s whose column info"
6488-
" does not match that of MySQL.",
6488+
" does not match that of MariaDB.",
64896489
table->key_info[count].name);
64906490
ret = false;
64916491
goto func_exit;
@@ -6670,7 +6670,7 @@ ha_innobase::innobase_initialize_autoinc()
66706670
break;
66716671
}
66726672
case DB_RECORD_NOT_FOUND:
6673-
ib::error() << "MySQL and InnoDB data dictionaries are"
6673+
ib::error() << "MariaDB and InnoDB data dictionaries are"
66746674
" out of sync. Unable to find the AUTOINC"
66756675
" column " << col_name << " in the InnoDB"
66766676
" table " << index->table->name << ". We set"
@@ -6773,7 +6773,7 @@ ha_innobase::open(
67736773
ib::warn() << "Table " << norm_name << " contains "
67746774
<< dict_table_get_n_user_cols(ib_table) << " user"
67756775
" defined columns in InnoDB, but " << table->s->stored_fields
6776-
<< " columns in MySQL. Please check"
6776+
<< " columns in MariaDB. Please check"
67776777
" INFORMATION_SCHEMA.INNODB_SYS_COLUMNS and " REFMAN
67786778
"innodb-troubleshooting.html for how to resolve the"
67796779
" issue.";
@@ -7362,7 +7362,7 @@ wsrep_innobase_mysql_sort(
73627362

73637363
if (charset == NULL) {
73647364
sql_print_error("InnoDB needs charset %lu for doing "
7365-
"a comparison, but MySQL cannot "
7365+
"a comparison, but MariaDB cannot "
73667366
"find that charset.",
73677367
(ulong) charset_number);
73687368
ut_a(0);
@@ -11527,7 +11527,7 @@ ha_innobase::wsrep_append_keys(
1152711527
keyval1[0] = (char)i;
1152811528

1152911529
if (!tab) {
11530-
WSREP_WARN("MySQL-InnoDB key mismatch %s %s",
11530+
WSREP_WARN("MariaDB-InnoDB key mismatch %s %s",
1153111531
table->s->table_name.str,
1153211532
key_info->name);
1153311533
}
@@ -12403,7 +12403,7 @@ create_index(
1240312403
case DATA_DOUBLE:
1240412404
case DATA_DECIMAL:
1240512405
sql_print_error(
12406-
"MySQL is trying to create a column"
12406+
"MariaDB is trying to create a column"
1240712407
" prefix index field, on an"
1240812408
" inappropriate data type. Table"
1240912409
" name %s, column name %s.",
@@ -14602,9 +14602,9 @@ ha_innobase::delete_table(
1460214602
tbl_name.m_name = norm_name;
1460314603
ib::error() << "Table " << tbl_name <<
1460414604
" does not exist in the InnoDB"
14605-
" internal data dictionary though MySQL is"
14605+
" internal data dictionary though MariaDB is"
1460614606
" trying to drop it. Have you copied the .frm"
14607-
" file of the table to the MySQL database"
14607+
" file of the table to the MariaDB database"
1460814608
" directory from another database? "
1460914609
<< TROUBLESHOOTING_MSG;
1461014610
}
@@ -15204,9 +15204,9 @@ innobase_rename_table(
1520415204
if (error == DB_TABLE_NOT_FOUND) {
1520515205
ib::error() << "Table " << ut_get_name(trx, norm_from)
1520615206
<< " does not exist in the InnoDB internal"
15207-
" data dictionary though MySQL is trying to"
15207+
" data dictionary though MariaDB is trying to"
1520815208
" rename the table. Have you copied the .frm"
15209-
" file of the table to the MySQL database"
15209+
" file of the table to the MariaDB database"
1521015210
" directory from another database? "
1521115211
<< TROUBLESHOOTING_MSG;
1521215212
}
@@ -15832,7 +15832,7 @@ innobase_get_mysql_key_number_for_index(
1583215832
if (index->is_committed()) {
1583315833
sql_print_warning(
1583415834
"Found index %s in InnoDB index list"
15835-
" but not its MySQL index number."
15835+
" but not its MariaDB index number."
1583615836
" It could be an InnoDB internal"
1583715837
" index.",
1583815838
index->name());
@@ -15954,7 +15954,7 @@ ha_innobase::info_low(
1595415954
/* In case MySQL calls this in the middle of a SELECT query, release
1595515955
possible adaptive hash latch to avoid deadlocks of threads */
1595615956

15957-
m_prebuilt->trx->op_info = (char*)"returning various info to MySQL";
15957+
m_prebuilt->trx->op_info = (char*)"returning various info to MariaDB";
1595815958

1595915959
trx_search_latch_release_if_reserved(m_prebuilt->trx);
1596015960

@@ -15991,7 +15991,7 @@ ha_innobase::info_low(
1599115991
}
1599215992

1599315993
m_prebuilt->trx->op_info =
15994-
"returning various info to MySQL";
15994+
"returning various info to MariaDB";
1599515995
}
1599615996

1599715997

@@ -16211,7 +16211,7 @@ ha_innobase::info_low(
1621116211
sql_print_error(
1621216212
"Index %s of %s has %lu columns"
1621316213
" unique inside InnoDB, but"
16214-
" MySQL is asking statistics for"
16214+
" MariaDB is asking statistics for"
1621516215
" %lu columns. Have you mixed"
1621616216
" up .frm files from different"
1621716217
" installations? %s",
@@ -19194,7 +19194,7 @@ innobase_xa_prepare(
1919419194

1919519195
if (!trx_is_registered_for_2pc(trx) && trx_is_started(trx)) {
1919619196

19197-
sql_print_error("Transaction not registered for MySQL 2PC,"
19197+
sql_print_error("Transaction not registered for MariaDB 2PC,"
1919819198
" but transaction is active");
1919919199
}
1920019200

@@ -21878,7 +21878,7 @@ static MYSQL_SYSVAR_ENUM(checksum_algorithm, srv_checksum_algorithm,
2187821878
" write a constant magic number, do not allow values other than that"
2187921879
" magic number when reading;"
2188021880
" Files updated when this option is set to crc32 or strict_crc32 will"
21881-
" not be readable by MySQL versions older than 5.6.3",
21881+
" not be readable by InnoDB versions older than 5.6.3",
2188221882
NULL, NULL, SRV_CHECKSUM_ALGORITHM_CRC32,
2188321883
&innodb_checksum_algorithm_typelib);
2188421884

@@ -22850,7 +22850,7 @@ static MYSQL_SYSVAR_BOOL(status_output_locks, srv_print_innodb_lock_monitor,
2285022850

2285122851
static MYSQL_SYSVAR_BOOL(print_all_deadlocks, srv_print_all_deadlocks,
2285222852
PLUGIN_VAR_OPCMDARG,
22853-
"Print all deadlocks to MySQL error log (off by default)",
22853+
"Print all deadlocks to MariaDB error log (off by default)",
2285422854
NULL, NULL, FALSE);
2285522855

2285622856
static MYSQL_SYSVAR_ULONG(compression_failure_threshold_pct,
@@ -24389,7 +24389,7 @@ ib_push_frm_error(
2438924389
case DICT_FRM_NO_PK:
2439024390
sql_print_error("Table %s has a primary key in "
2439124391
"InnoDB data dictionary, but not "
24392-
"in MySQL!"
24392+
"in MariaDB!"
2439324393
" Have you mixed up "
2439424394
".frm files from different "
2439524395
"installations? See "
@@ -24403,17 +24403,17 @@ ib_push_frm_error(
2440324403
"InnoDB: Table %s has a "
2440424404
"primary key in InnoDB data "
2440524405
"dictionary, but not in "
24406-
"MySQL!", ib_table->name);
24406+
"MariaDB!", ib_table->name);
2440724407
}
2440824408
break;
2440924409
case DICT_NO_PK_FRM_HAS:
2441024410
sql_print_error(
2441124411
"Table %s has no primary key in InnoDB data "
24412-
"dictionary, but has one in MySQL! If you "
24413-
"created the table with a MySQL version < "
24412+
"dictionary, but has one in MariaDB! If you "
24413+
"created the table with a MariaDB version < "
2441424414
"3.23.54 and did not define a primary key, "
2441524415
"but defined a unique key with all non-NULL "
24416-
"columns, then MySQL internally treats that "
24416+
"columns, then MariaDB internally treats that "
2441724417
"key as the primary key. You can fix this "
2441824418
"error by dump + DROP + CREATE + reimport "
2441924419
"of the table.", ib_table->name);
@@ -24424,7 +24424,7 @@ ib_push_frm_error(
2442424424
"InnoDB: Table %s has no "
2442524425
"primary key in InnoDB data "
2442624426
"dictionary, but has one in "
24427-
"MySQL!",
24427+
"MariaDB!",
2442824428
ib_table->name);
2442924429
}
2443024430
break;
@@ -24433,7 +24433,7 @@ ib_push_frm_error(
2443324433
sql_print_error("InnoDB: Table %s contains %lu "
2443424434
"indexes inside InnoDB, which "
2443524435
"is different from the number of "
24436-
"indexes %u defined in the MySQL "
24436+
"indexes %u defined in the MariaDB "
2443724437
" Have you mixed up "
2443824438
".frm files from different "
2443924439
"installations? See "
@@ -24448,7 +24448,7 @@ ib_push_frm_error(
2444824448
"InnoDB: Table %s contains %lu "
2444924449
"indexes inside InnoDB, which "
2445024450
"is different from the number of "
24451-
"indexes %u defined in the MySQL ",
24451+
"indexes %u defined in the MariaDB ",
2445224452
ib_table->name, n_keys,
2445324453
table->s->keys);
2445424454
}
@@ -24457,7 +24457,7 @@ ib_push_frm_error(
2445724457
case DICT_FRM_CONSISTENT:
2445824458
default:
2445924459
sql_print_error("InnoDB: Table %s is consistent "
24460-
"on InnoDB data dictionary and MySQL "
24460+
"on InnoDB data dictionary and MariaDB "
2446124461
" FRM file.",
2446224462
ib_table->name);
2446324463
ut_error;

0 commit comments

Comments
 (0)