mirror of
https://github.com/MariaDB/server.git
synced 2025-08-09 22:24:09 +03:00
73a7d99331
~40Mb after mysqldump/import
When the input string exceeds the maximum allowed size for the
internal buffer, batch_readline() returns a truncated string.
Since there was no way for a caller to determine whether the
string was truncated or not, the command line client assumed
batch_readline() to always return the whole input string and
appended a newline character. This resulted in garbled data
when importing dumps containing strings longer than the
maximum input buffer size.
Fixed by adding a flag to the batch_readline() interface to
signal a truncated string to the caller.
Other minor problems fixed during patch implementation:
- The maximum allowed buffer size for batch_readline() was set
up depending on the client's max_allowed_packet value. It does
not actully make any sense, as those variables are not
related. The input buffer size limit is now always set to 1
MB.
- fill_buffer() did not always set the EOF flag.
- The input buffer could actually grow twice as the specified
limit due to insufficient checks in intern_read_line().
client/my_readline.h:
Changed the interface of batch_readline().
client/mysql.cc:
Honor the truncated flag returned by batch_readline() and do
not append the newline character if it was set. Since we can't
change the interfaces for readline()/fgets() used in the
interactive mode, always assume the returned string was not
truncated. In addition, always set the batch_readline()
internal buffer to 1 MB, independently from the client's
max_allowed_packet.
client/readline.cc:
Added the 'truncated' argument do batch_readline() to signal
truncated string to a caller.
Fixed fill_buffer() to set the EOF flag correctly.
Fixed checks in intern_read_line() to not allow the internal
buffer grow past the specified limit.
mysql-test/r/mysql.result:
Added a test case for bug #41486.
mysql-test/t/mysql.test:
Added a test case for bug #41486.
207 lines
5.3 KiB
Plaintext
207 lines
5.3 KiB
Plaintext
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 1049 (42000) at line 1: Unknown database 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
|
|
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
|
|
set @old_max_allowed_packet = @@global.max_allowed_packet;
|
|
set @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024;
|
|
set @@max_allowed_packet = @@global.max_allowed_packet;
|
|
CREATE TABLE t1(data LONGBLOB);
|
|
INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
|
|
SELECT LENGTH(data) FROM t1;
|
|
LENGTH(data)
|
|
2097152
|
|
DROP TABLE t1;
|
|
set @@global.max_allowed_packet = @old_max_allowed_packet;
|
|
set @@max_allowed_packet = @@global.max_allowed_packet;
|
|
End of 5.0 tests
|