mirror of
https://github.com/MariaDB/server.git
synced 2025-05-28 13:01:41 +03:00
aa81e025a8
- 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
514 lines
8.4 KiB
Plaintext
514 lines
8.4 KiB
Plaintext
drop table if exists t1,t2,t3;
|
|
create table t1(a int);
|
|
insert into t1 values(1);
|
|
ERROR at line 9: DELIMITER must be followed by a 'delimiter' character or string
|
|
|
|
Test default delimiter ;
|
|
a
|
|
1
|
|
|
|
Test delimiter without arg
|
|
|
|
Test delimiter :
|
|
a
|
|
1
|
|
|
|
Test delimiter :
|
|
a
|
|
1
|
|
|
|
Test delimiter :;
|
|
a
|
|
1
|
|
|
|
Test delimiter //
|
|
a
|
|
1
|
|
|
|
Test delimiter MySQL
|
|
a
|
|
1
|
|
|
|
Test delimiter delimiter
|
|
a
|
|
1
|
|
Tables_in_test
|
|
t1
|
|
t2
|
|
t3
|
|
Tables_in_test
|
|
t1
|
|
_
|
|
Test delimiter : from command line
|
|
a
|
|
1
|
|
_
|
|
Test delimiter :; from command line
|
|
a
|
|
1
|
|
_
|
|
Test 'go' command(vertical output) G
|
|
*************************** 1. row ***************************
|
|
a: 1
|
|
_
|
|
Test 'go' command g
|
|
a
|
|
1
|
|
drop table t1;
|
|
create table t1(a int);
|
|
lock tables t1 write;
|
|
database()
|
|
test
|
|
unlock tables;
|
|
drop table t1;
|
|
+----------------------+------------+--------+
|
|
| concat('>',col1,'<') | col2 | col3 |
|
|
+----------------------+------------+--------+
|
|
| >a < | b | 123421 |
|
|
| >a < | 0123456789 | 4 |
|
|
| >abcd< | | 4 |
|
|
+----------------------+------------+--------+
|
|
+-------------------+
|
|
| __tañgè Ñãmé |
|
|
+-------------------+
|
|
| John Doe |
|
|
+-------------------+
|
|
+-------------------+
|
|
| John Doe |
|
|
+-------------------+
|
|
| __tañgè Ñãmé |
|
|
+-------------------+
|
|
+------+------+---------------------------+
|
|
| i | j | k |
|
|
+------+------+---------------------------+
|
|
| 1 | NULL | NULL |
|
|
| NULL | NULL | <-----------------------> |
|
|
| NULL | NULL | <----- |
|
|
| NULL | NULL | Τη γλώσσα |
|
|
| NULL | NULL | ᛖᚴ ᚷᛖᛏ |
|
|
+------+------+---------------------------+
|
|
i j k
|
|
NULL 1 NULL
|
|
Field Type Null Key Default Extra
|
|
i int(11) YES NULL
|
|
j int(11) NO NULL
|
|
k int(11) YES NULL
|
|
+------+---+------+
|
|
| i | j | k |
|
|
+------+---+------+
|
|
| NULL | 1 | NULL |
|
|
+------+---+------+
|
|
+-------+---------+------+-----+---------+-------+
|
|
| Field | Type | Null | Key | Default | Extra |
|
|
+-------+---------+------+-----+---------+-------+
|
|
| i | int(11) | YES | | NULL | |
|
|
| j | int(11) | NO | | NULL | |
|
|
| k | int(11) | YES | | NULL | |
|
|
+-------+---------+------+-----+---------+-------+
|
|
i s1
|
|
1 x
|
|
2 NULL
|
|
3
|
|
+------+------+
|
|
| i | s1 |
|
|
+------+------+
|
|
| 1 | x |
|
|
| 2 | NULL |
|
|
| 3 | |
|
|
+------+------+
|
|
unhex('zz')
|
|
NULL
|
|
+-------------+
|
|
| unhex('zz') |
|
|
+-------------+
|
|
| NULL |
|
|
+-------------+
|
|
create table t1(a int, b varchar(255), c int);
|
|
Field Type Null Key Default Extra
|
|
a int(11) YES NULL
|
|
b varchar(255) YES NULL
|
|
c int(11) YES NULL
|
|
Field Type Null Key Default Extra
|
|
a int(11) YES NULL
|
|
b varchar(255) YES NULL
|
|
c int(11) YES NULL
|
|
drop table t1;
|
|
1
|
|
1
|
|
ERROR 1064 (42000) at line 3: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
|
|
ERROR at line 1: USE must be followed by a database name
|
|
1 +1
|
|
2
|
|
1 +1
|
|
2
|
|
1 +1
|
|
2
|
|
1 +1
|
|
2
|
|
\
|
|
\\
|
|
';
|
|
';
|
|
create table t17583 (a int);
|
|
insert into t17583 (a) values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
|
insert into t17583 select a from t17583;
|
|
insert into t17583 select a from t17583;
|
|
insert into t17583 select a from t17583;
|
|
insert into t17583 select a from t17583;
|
|
insert into t17583 select a from t17583;
|
|
insert into t17583 select a from t17583;
|
|
insert into t17583 select a from t17583;
|
|
select count(*) from t17583;
|
|
count(*)
|
|
1280
|
|
drop table t17583;
|
|
Test connect without db- or host-name => reconnect
|
|
Test connect with dbname only => new dbname, old hostname
|
|
ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'connecttest' at line 1
|
|
Test connect with _invalid_ dbname only => new invalid dbname, old hostname
|
|
ERROR 1049 (42000) at line 1: Unknown database 'invalid'
|
|
ERROR 1049 (42000) at line 1: Unknown database 'invalid'
|
|
Test connect with dbname + hostname
|
|
Test connect with dbname + _invalid_ hostname
|
|
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (-2)
|
|
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (-2)
|
|
The commands reported in the bug report
|
|
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (-2)
|
|
Too long dbname
|
|
ERROR 1102 (42000) at line 1: Incorrect database name 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
|
|
Too long hostname
|
|
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (-2)
|
|
1
|
|
1
|
|
ERROR at line 1: DELIMITER cannot contain a backslash character
|
|
ERROR at line 1: DELIMITER cannot contain a backslash character
|
|
1
|
|
1
|
|
1
|
|
1
|
|
This is a file starting with UTF8 BOM 0xEFBBBF
|
|
This is a file starting with UTF8 BOM 0xEFBBBF
|
|
delimiter
|
|
1
|
|
2
|
|
2
|
|
2
|
|
2
|
|
@z:='1' @z=database()
|
|
1 NULL
|
|
1
|
|
1
|
|
1
|
|
1
|
|
COUNT (*)
|
|
1
|
|
COUNT (*)
|
|
1
|
|
COUNT (*)
|
|
1
|
|
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (-2)
|
|
End of 5.0 tests
|
|
WARNING: --server-arg option not supported in this configuration.
|
|
*************************** 1. row ***************************
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
1: 1
|
|
2: 2
|
|
3: 3
|
|
4: 4
|
|
5: 5
|
|
6: 6
|
|
7: 7
|
|
8: 8
|
|
9: 9
|
|
0: 0
|
|
+---+
|
|
| 1 |
|
|
+---+
|
|
| 1 |
|
|
+---+
|
|
Warning (Code 1286): Unknown storage engine 'nonexistent'
|
|
Warning (Code 1266): Using storage engine MyISAM for table 't2'
|
|
Warning (Code 1286): Unknown storage engine 'nonexistent2'
|
|
Warning (Code 1266): Using storage engine MyISAM for table 't2'
|
|
Error (Code 1050): Table 't2' already exists
|
|
drop tables t1, t2;
|
|
Variable_name Value
|
|
lc_messages ru_RU
|
|
<TABLE BORDER=1><TR><TH><</TH></TR><TR><TD>< & ></TD></TR></TABLE>create table t1 (a char(5));
|
|
insert into t1 values ('\0b\0');
|
|
a
|
|
\0b\0
|
|
a
|
|
\0b\0
|
|
+------+
|
|
| a |
|
|
+------+
|
|
| b |
|
|
+------+
|
|
*************************** 1. row ***************************
|
|
a: b
|
|
<TABLE BORDER=1><TR><TH>a</TH></TR><TR><TD> b </TD></TR></TABLE><?xml version="1.0"?>
|
|
|
|
<resultset statement="select a from t1
|
|
" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
<row>
|
|
<field name="a"> b </field>
|
|
</row>
|
|
</resultset>
|
|
drop table t1;
|
|
|
|
Bug #47147: mysql client option --skip-column-names does not apply to vertical output
|
|
|
|
*************************** 1. row ***************************
|
|
1
|
|
|
|
#
|
|
# Bug #54899: --one-database option cannot handle DROP/CREATE DATABASE
|
|
# commands.
|
|
#
|
|
CREATE DATABASE connected_db;
|
|
USE connected_db;
|
|
SHOW TABLES;
|
|
Tables_in_connected_db
|
|
table_in_connected_db
|
|
DROP DATABASE connected_db;
|
|
|
|
#
|
|
# Testing --one-database option
|
|
#
|
|
CREATE DATABASE connected_db;
|
|
SHOW TABLES IN connected_db;
|
|
Tables_in_connected_db
|
|
t1
|
|
SHOW TABLES IN test;
|
|
Tables_in_test
|
|
t1
|
|
USE test;
|
|
DROP TABLE t1;
|
|
DROP DATABASE connected_db;
|
|
|
|
SHOW TABLES IN test;
|
|
Tables_in_test
|
|
SHOW TABLES IN test1;
|
|
Tables_in_test1
|
|
DROP DATABASE test1;
|
|
|
|
#
|
|
# Checking --one-database option followed by the execution of
|
|
# connect command.
|
|
#
|
|
CREATE DATABASE connected_db;
|
|
SHOW TABLES IN connected_db;
|
|
Tables_in_connected_db
|
|
t1
|
|
t2
|
|
SHOW TABLES IN test;
|
|
Tables_in_test
|
|
t1
|
|
t2
|
|
DROP TABLE test.t1;
|
|
DROP TABLE test.t2;
|
|
DROP DATABASE connected_db;
|
|
|
|
#
|
|
# Checking --one-database option with no database specified
|
|
# at command-line.
|
|
#
|
|
SHOW TABLES IN test;
|
|
Tables_in_test
|
|
|
|
#
|
|
# Checking --one-database option with non_existent_db
|
|
# specified with USE command
|
|
#
|
|
CREATE DATABASE connected_db;
|
|
SHOW TABLES IN connected_db;
|
|
Tables_in_connected_db
|
|
table_in_connected_db
|
|
|
|
SHOW TABLES IN connected_db;
|
|
Tables_in_connected_db
|
|
table_in_connected_db
|
|
DROP DATABASE connected_db;
|
|
|
|
End of tests
|