mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
e1b773cb53
After dropping and recreating the database specified along with --one-database option at command line, mysql client keeps filtering the statements even after the execution of a 'USE' command on the same database. --one-database option enables the filtering of statements when the current database is not the one specified at the command line. However, when the same database is dropped and recreated the variable (current_db) that holds the inital database name gets altered. This bug exploits the fact that current_db initially gets set to null value (0) when a 'use db_name' follows the recreation of same database db_name (speficied at the command line) and hence skip_updates gets set to 1, which inturn triggers the further filtering of statements. Fixed by making get_current_db() a no-op function when one_database is set, and hence, under that condition current_db will not get altered. Note, however the value of current_db can change when we execute 'connect' command with a differnet database to reconnect to the server, in which case, the behavior of --one-database will be formulated using this new database. client/mysql.cc: Bug #54899 : --one-database option cannot handle DROP/CREATE DATABASE commands Added an if statement at the beginnning of get_current_db() , which makes it a no-op function if one-database option is specified, and hence current_db remains unchanged. Changed the help message for one-database option to a more appropriate message as specified in mysql documentation. mysql-test/r/mysql.result: Added a test case for bug#54899 and some more test cases to check other one-database option related behaviors. mysql-test/t/mysql.test: Added a test case for bug#54899 and some more test cases to check other one-database option related behaviors.
309 lines
7.3 KiB
Text
309 lines
7.3 KiB
Text
drop table if exists t1;
|
|
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 MySQL server version for the right syntax to use near '' at line 1
|
|
ERROR at line 1: USE must be followed by a database name
|
|
\
|
|
\\
|
|
';
|
|
';
|
|
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 MySQL 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' (errno)
|
|
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
|
|
The commands reported in the bug report
|
|
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
|
|
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' (errno)
|
|
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' (errno)
|
|
End of 5.0 tests
|
|
WARNING: --server-arg option not supported in this configuration.
|
|
Warning (Code 1286): Unknown table engine 'nonexistent'
|
|
Warning (Code 1266): Using storage engine MyISAM for table 't2'
|
|
Warning (Code 1286): Unknown table engine 'nonexistent2'
|
|
Warning (Code 1266): Using storage engine MyISAM for table 't2'
|
|
Error (Code 1050): Table 't2' already exists
|
|
drop tables t1, t2;
|
|
<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
|
|
#
|
|
SHOW TABLES IN test;
|
|
Tables_in_test
|
|
table_in_test
|
|
DROP DATABASE test;
|
|
|
|
CREATE DATABASE test;
|
|
SHOW TABLES IN test;
|
|
Tables_in_test
|
|
table_in_test
|
|
DROP DATABASE test;
|
|
CREATE DATABASE test;
|
|
|
|
End of tests
|