mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Added text for errno in error messages by:
- Adding %M my_sprintf() modifier that prints error number - system-error-text - Modified mysys, mysql_client and SQL error messages to use %M instead of %d - Added my_strerror() Updated handler errors to 5.6 error numbers Updated text for a few error messages (to match 5.6) Increased length of command name in error output extra/comp_err.c: Added support for %M include/my_base.h: Updated handler errors to 5.6 error numbers include/my_sys.h: Added my_strerror() libmysql/errmsg.c: Updated error messages to use %M mysql-test/r/errors.result: Updated result as error message have changed mysql-test/r/innodb_mysql_sync.result: Updated result with text for errno mysql-test/r/myisam-system.result: Updated result with text for errno mysql-test/r/myisam.result: Updated result as error message have changed mysql-test/r/myisampack.result: Updated result with text for errno mysql-test/r/mysql.result: Updated result with text for errno mysql-test/r/mysql_upgrade.result: Updated result with text for errno mysql-test/r/partition_datatype.result: Updated result as error message have changed mysql-test/r/partition_innodb_plugin.result: Updated result with text for errno mysql-test/r/ps_1general.result: Updated result with text for errno mysql-test/r/trigger.result: Updated result with text for errno mysql-test/r/type_bit.result: Updated result as error message have changed mysql-test/r/type_bit_innodb.result: Updated result as error message have changed mysql-test/r/type_blob.result: Updated result as error message have changed mysql-test/suite/archive/archive.result: Updated result with text for errno mysql-test/suite/binlog/r/binlog_index.result: Updated result with text for errno mysql-test/suite/binlog/r/binlog_ioerr.result: Updated result with text for errno mysql-test/suite/csv/csv.result: Updated result with text for errno mysql-test/suite/federated/federated_bug_35333.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb-create-options.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb-index.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb-zip.result: Updated result as error message have changed mysql-test/suite/innodb/r/innodb.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb_bug21704.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb_bug46000.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb_bug53591.result: Updated result as error message have changed mysql-test/suite/innodb/r/innodb_corrupt_bit.result: New error numbers mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result: Updated result as error message have changed mysql-test/suite/innodb/t/innodb-create-options.test: Added regexp to avoid system error text mysql-test/suite/innodb/t/innodb-zip.test: Added regexp to avoid system error text mysql-test/suite/maria/maria-recovery2.result: Updated supression rule mysql-test/suite/maria/maria-recovery2.test: Updated supression rule mysql-test/suite/maria/maria.result: Updated result as error message have changed mysql-test/suite/parts/r/partition_bit_innodb.result: Updated result as error message have changed mysql-test/suite/parts/r/partition_bit_myisam.result: Updated result as error message have changed mysql-test/suite/percona/percona_innodb_fake_changes.result: Updated result with text for errno mysql-test/suite/perfschema/r/dml_cond_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_events_waits_current.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_events_waits_history.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_events_waits_history_long.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_ews_by_instance.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_file_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_mutex_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_performance_timers.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_rwlock_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_threads.result: Updated result as error message have changed mysql-test/suite/perfschema/r/misc.result: Updated result with text for errno mysql-test/suite/perfschema/r/privilege.result: Updated result with text for errno mysql-test/suite/rpl/r/rpl_EE_err.result: Updated result with text for errno mysql-test/suite/rpl/r/rpl_binlog_errors.result: Updated result with text for errno mysql-test/suite/rpl/r/rpl_drop_db.result: Updated result with text for errno mysys/errors.c: Updated error messages to use %M Changed all errors to use Errcode: consistenly mysys/my_handler_errors.h: Updated handler errors to 5.6 error numbers sql/share/errmsg-utf8.txt: Updated error messages to use %M sql/sys_vars.cc: Added error number to ER_EVENT_SET_VAR_ERROR strings/my_vsnprintf.c: Added %M my_sprintf() modifier that prints error number - system-error-text Simplify code Movied common code to function Removed some casts that was not necessary when reading integer/unsigned int stored in longlong Added my_strerror() unittest/mysys/my_vsnprintf-t.c: Added testing of %M
This commit is contained in:
Michael Widenius
@ -152,13 +152,13 @@ before insert on performance_schema.file_instances
|
||||
for each row begin end;
|
||||
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
|
||||
create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.setup_instruments;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.events_waits_current;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.file_instances;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
insert into performance_schema.setup_instruments
|
||||
set name="foo";
|
||||
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
|
||||
@ -179,16 +179,16 @@ unlock tables;
|
||||
lock table performance_schema.setup_instruments write;
|
||||
unlock tables;
|
||||
lock table performance_schema.events_waits_current read;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
|
||||
unlock tables;
|
||||
lock table performance_schema.events_waits_current write;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
|
||||
unlock tables;
|
||||
lock table performance_schema.file_instances read;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
|
||||
unlock tables;
|
||||
lock table performance_schema.file_instances write;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
|
||||
unlock tables;
|
||||
#
|
||||
# WL#4818, NFS2: Can use grants to give normal user access
|
||||
@ -250,13 +250,13 @@ before insert on performance_schema.file_instances
|
||||
for each row begin end;
|
||||
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
|
||||
create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.setup_instruments;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.events_waits_current;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.file_instances;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
insert into performance_schema.setup_instruments
|
||||
set name="foo";
|
||||
ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
|
||||
@ -277,16 +277,16 @@ unlock tables;
|
||||
lock table performance_schema.setup_instruments write;
|
||||
unlock tables;
|
||||
lock table performance_schema.events_waits_current read;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
|
||||
unlock tables;
|
||||
lock table performance_schema.events_waits_current write;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
|
||||
unlock tables;
|
||||
lock table performance_schema.file_instances read;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
|
||||
unlock tables;
|
||||
lock table performance_schema.file_instances write;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
|
||||
unlock tables;
|
||||
#
|
||||
# WL#4818, NFS2: Can use grants to give normal user access
|
||||
@ -348,13 +348,13 @@ before insert on performance_schema.file_instances
|
||||
for each row begin end;
|
||||
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
|
||||
create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.setup_instruments;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.events_waits_current;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.file_instances;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
insert into performance_schema.setup_instruments
|
||||
set name="foo";
|
||||
ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
|
||||
@ -375,16 +375,16 @@ unlock tables;
|
||||
lock table performance_schema.setup_instruments write;
|
||||
unlock tables;
|
||||
lock table performance_schema.events_waits_current read;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
|
||||
unlock tables;
|
||||
lock table performance_schema.events_waits_current write;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
|
||||
unlock tables;
|
||||
lock table performance_schema.file_instances read;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
|
||||
unlock tables;
|
||||
lock table performance_schema.file_instances write;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
|
||||
unlock tables;
|
||||
#
|
||||
# WL#4818, NFS2: Can use grants to give normal user access
|
||||
@ -446,13 +446,13 @@ before insert on performance_schema.file_instances
|
||||
for each row begin end;
|
||||
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
|
||||
create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.setup_instruments;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.events_waits_current;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
create table test.t1 like performance_schema.file_instances;
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131)
|
||||
ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
|
||||
insert into performance_schema.setup_instruments
|
||||
set name="foo";
|
||||
ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'
|
||||
@ -473,16 +473,16 @@ unlock tables;
|
||||
lock table performance_schema.setup_instruments write;
|
||||
unlock tables;
|
||||
lock table performance_schema.events_waits_current read;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
|
||||
unlock tables;
|
||||
lock table performance_schema.events_waits_current write;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
|
||||
unlock tables;
|
||||
lock table performance_schema.file_instances read;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
|
||||
unlock tables;
|
||||
lock table performance_schema.file_instances write;
|
||||
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
|
||||
ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
|
||||
unlock tables;
|
||||
#
|
||||
# WL#4818, NFS2: Can use grants to give normal user access
|
||||
|
||||
Reference in New Issue
Block a user