database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-13712 Spelling errors in the error message

Browse Source
This commit is contained in:
Sergei Golubchik
2017-09-15 15:05:39 +02:00
parent 203e2176fe
commit 6670b4e58c
8 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/my_handler_errors.h
View File

@ -24,11 +24,11 @@
static const char *handler_error_messages[]= static const char *handler_error_messages[]=
{ {
/* 120 */ /* 120 */
"Didn't find key on read or update", "Didn't find the key on read or update",
"Duplicate key on write or update", "Duplicate key on write or update",
"Internal (unspecified) error in handler", "Internal (unspecified) error in handler",
"Someone has changed the row since it was read (while the table was locked to prevent it)", "Someone has changed the row since it was read (even though the table was locked to prevent it)",
"Wrong index given to function", "Wrong index given to a function",
"Undefined handler error 125", "Undefined handler error 125",
"Index is corrupted", "Index is corrupted",
"Table file is corrupted", "Table file is corrupted",
@ -36,7 +36,7 @@ static const char *handler_error_messages[]=
"Undefined handler error 129", "Undefined handler error 129",
/* 130 */ /* 130 */
"Incorrect file format", "Incorrect file format",
"Command not supported by database", "Command not supported by the engine",
"Old database file", "Old database file",
"No record read before update", "No record read before update",
"Record was already deleted (or record file crashed)", "Record was already deleted (or record file crashed)",
@ -47,7 +47,7 @@ static const char *handler_error_messages[]=
"Too big row", "Too big row",
/* 140 */ /* 140 */
"Wrong create options", "Wrong create options",
"Duplicate unique key or constraint on write or update", "Duplicate unique key on write or update",
"Unknown character set used in table", "Unknown character set used in table",
"Conflicting table definitions in sub-tables of MERGE table", "Conflicting table definitions in sub-tables of MERGE table",
"Table is crashed and last repair failed", "Table is crashed and last repair failed",
@ -62,13 +62,13 @@ static const char *handler_error_messages[]=
"Cannot delete a parent row", "Cannot delete a parent row",
"No savepoint with that name", "No savepoint with that name",
"Non unique key block size", "Non unique key block size",
"The table does not exist in engine", "The table does not exist in the storage engine",
"The table already existed in storage engine", "The table already existed in the storage engine",
"Could not connect to storage engine", "Could not connect to the storage engine",
"Unexpected null pointer found when using spatial index", "Unexpected null pointer found when using spatial index",
"The table changed in storage engine", "The table changed in the storage engine",
/* 160 */ /* 160 */
"There's no partition in table for the given value", "There's no partition in the table for the given value",
"Row-based binary logging of row failed", "Row-based binary logging of row failed",
"Index needed in foreign key constraint", "Index needed in foreign key constraint",
"Upholding foreign key constraints would lead to a duplicate key error in some other table", "Upholding foreign key constraints would lead to a duplicate key error in some other table",
@ -77,13 +77,13 @@ static const char *handler_error_messages[]=
"Failed to get next auto increment value", "Failed to get next auto increment value",
"Failed to set row auto increment value", "Failed to set row auto increment value",
"Unknown (generic) error from engine", "Unknown (generic) error from engine",
"Record was not update. Original values was same as new values", "Record was not updated. New values were the same as original values",
/* 170 */ /* 170 */
"It is not possible to log this statement", "It is not possible to log this statement",
"The event was corrupt, leading to illegal data being read", "The event was corrupt, leading to illegal data being read",
"The table is of a new format not supported by this version", "The table is of a new format not supported by this version",
"The event could not be processed. No other handler error happened", "The event could not be processed. No other handler error happened",
"Got a fatal error during initialization of handler", "Fatal error during initialization of handler",
"File too short; Expected more data in file", "File too short; Expected more data in file",
"Read page with wrong checksum", "Read page with wrong checksum",
"Too many active concurrent transactions", "Too many active concurrent transactions",
@ -105,7 +105,7 @@ static const char *handler_error_messages[]=
"Too many words in a FTS phrase or proximity search", "Too many words in a FTS phrase or proximity search",
"Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.", "Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.",
"Foreign key cascade delete/update exceeds max depth", "Foreign key cascade delete/update exceeds max depth",
"Tablespace is missing for table" "Tablespace is missing for a table"
}; };
#endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */ #endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */

2
mysql-test/suite/innodb/r/innodb_bug46000.result
View File

@ -6,7 +6,7 @@ show warnings;
Level Code Message Level Code Message
Warning 1280 Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index. Warning 1280 Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index.
Error 1280 Incorrect index name 'GEN_CLUST_INDEX' Error 1280 Incorrect index name 'GEN_CLUST_INDEX'
Warning 1030 Got error 124 "Wrong index given to function" from storage engine InnoDB Warning 1030 Got error 124 "Wrong index given to a function" from storage engine InnoDB
create table bug46000(id int) engine=innodb; create table bug46000(id int) engine=innodb;
create index GEN_CLUST_INDEX on bug46000(id); create index GEN_CLUST_INDEX on bug46000(id);
ERROR 42000: Incorrect index name 'GEN_CLUST_INDEX' ERROR 42000: Incorrect index name 'GEN_CLUST_INDEX'

2
mysql-test/suite/innodb/r/row_format_redundant.result
View File

@ -67,7 +67,7 @@ SELECT COUNT(*) FROM t3;
COUNT(*) COUNT(*)
0 0
RENAME TABLE t1 TO tee_one; RENAME TABLE t1 TO tee_one;
ERROR HY000: Error on rename of './test/t1' to './test/tee_one' (errno: 155 "The table does not exist in engine") ERROR HY000: Error on rename of './test/t1' to './test/tee_one' (errno: 155 "The table does not exist in the storage engine")
DROP TABLE t1; DROP TABLE t1;
Warnings: Warnings:
Warning 1932 Table 'test.t1' doesn't exist in engine Warning 1932 Table 'test.t1' doesn't exist in engine

4
mysql-test/suite/perfschema/r/misc.result
View File

@ -42,12 +42,12 @@ AND EVENT_NAME IN
WHERE NAME LIKE "wait/synch/%") WHERE NAME LIKE "wait/synch/%")
LIMIT 1; LIMIT 1;
create table test.t1(a int) engine=performance_schema; create table test.t1(a int) engine=performance_schema;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type
WHERE object_schema='test'; WHERE object_schema='test';
object_schema object_name object_schema object_name
create table test.t1 like performance_schema.events_waits_current; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type
WHERE object_schema='test'; WHERE object_schema='test';
object_schema object_name object_schema object_name

32
mysql-test/suite/perfschema/r/privilege.result
View File

@ -155,13 +155,13 @@ before insert on performance_schema.file_instances
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA; create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.setup_instruments; create table test.t1 like performance_schema.setup_instruments;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.events_waits_current; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.file_instances; create table test.t1 like performance_schema.file_instances;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
insert into performance_schema.setup_instruments insert into performance_schema.setup_instruments
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
@ -254,13 +254,13 @@ before insert on performance_schema.file_instances
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA; create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.setup_instruments; create table test.t1 like performance_schema.setup_instruments;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.events_waits_current; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.file_instances; create table test.t1 like performance_schema.file_instances;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
insert into performance_schema.setup_instruments insert into performance_schema.setup_instruments
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments' ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
@ -354,13 +354,13 @@ before insert on performance_schema.file_instances
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA; create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.setup_instruments; create table test.t1 like performance_schema.setup_instruments;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.events_waits_current; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.file_instances; create table test.t1 like performance_schema.file_instances;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
insert into performance_schema.setup_instruments insert into performance_schema.setup_instruments
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments' ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
@ -454,13 +454,13 @@ before insert on performance_schema.file_instances
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA; create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.setup_instruments; create table test.t1 like performance_schema.setup_instruments;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.events_waits_current; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
create table test.t1 like performance_schema.file_instances; create table test.t1 like performance_schema.file_instances;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
insert into performance_schema.setup_instruments insert into performance_schema.setup_instruments
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments' ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'

2
mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result
View File

@ -113,7 +113,7 @@ SET @old_dbug= @@GLOBAL.debug_dbug;
SET GLOBAL debug_dbug="+d,dummy_disable_default_dbug_output"; SET GLOBAL debug_dbug="+d,dummy_disable_default_dbug_output";
SET GLOBAL debug_dbug="+d,gtid_fail_after_record_gtid"; SET GLOBAL debug_dbug="+d,gtid_fail_after_record_gtid";
SET sql_log_bin=0; SET sql_log_bin=0;
CALL mtr.add_suppression('Got error 131 "Command not supported by database" during COMMIT'); CALL mtr.add_suppression('Got error 131 "Command not supported by the engine" during COMMIT');
SET sql_log_bin=1; SET sql_log_bin=1;
START SLAVE; START SLAVE;
include/wait_for_slave_sql_error.inc [errno=1180] include/wait_for_slave_sql_error.inc [errno=1180]

2
mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test
View File

@ -132,7 +132,7 @@ SET @old_dbug= @@GLOBAL.debug_dbug;
SET GLOBAL debug_dbug="+d,dummy_disable_default_dbug_output"; SET GLOBAL debug_dbug="+d,dummy_disable_default_dbug_output";
SET GLOBAL debug_dbug="+d,gtid_fail_after_record_gtid"; SET GLOBAL debug_dbug="+d,gtid_fail_after_record_gtid";
SET sql_log_bin=0; SET sql_log_bin=0;
CALL mtr.add_suppression('Got error 131 "Command not supported by database" during COMMIT'); CALL mtr.add_suppression('Got error 131 "Command not supported by the engine" during COMMIT');
SET sql_log_bin=1; SET sql_log_bin=1;
START SLAVE; START SLAVE;
--let $slave_sql_errno= 1180 --let $slave_sql_errno= 1180

2
storage/test_sql_discovery/mysql-test/sql_discovery/simple.result
View File

@ -4,7 +4,7 @@ test_sql_discovery_statement
test_sql_discovery_write_frm ON test_sql_discovery_write_frm ON
set sql_quote_show_create=0; set sql_quote_show_create=0;
create table t1 (a int) engine=test_sql_discovery; create table t1 (a int) engine=test_sql_discovery;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database") ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
select * from t1; select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist ERROR 42S02: Table 'test.t1' doesn't exist
set @@test_sql_discovery_statement='t1:foobar bwa-ha-ha'; set @@test_sql_discovery_statement='t1:foobar bwa-ha-ha';