1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-5735 Selecting from SEQUENCE table with negative number hangs server

Browse Source
This commit is contained in:
Sergei Golubchik 2014-03-01 13:27:04 +01:00
parent 04de6ccc31
commit 1b608b0b9c
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/sequence/mysql-test/sequence/simple.result
View File

@ -40,6 +40,10 @@ show create table se;
ERROR 42S02: Table 'test.se' doesn't exist ERROR 42S02: Table 'test.se' doesn't exist
show create table seq_1_to_15_step_0; show create table seq_1_to_15_step_0;
ERROR HY000: Got error 140 "Wrong create options" from storage engine SEQUENCE ERROR HY000: Got error 140 "Wrong create options" from storage engine SEQUENCE
show create table `seq_-1_to_15`;
ERROR 42S02: Table 'test.seq_-1_to_15' doesn't exist
show create table `seq_1_to_+2`;
ERROR 42S02: Table 'test.seq_1_to_+2' doesn't exist
select * from seq_1_to_15_step_2; select * from seq_1_to_15_step_2;
seq seq
1 1

8
storage/sequence/mysql-test/sequence/simple.test
View File

@ -26,6 +26,14 @@ show create table se;
--error ER_GET_ERRNO --error ER_GET_ERRNO
show create table seq_1_to_15_step_0; show create table seq_1_to_15_step_0;
#
# MDEV-5735 Selecting from SEQUENCE table with negative number hangs server
#
--error ER_NO_SUCH_TABLE
show create table `seq_-1_to_15`;
--error ER_NO_SUCH_TABLE
show create table `seq_1_to_+2`;
# simple select # simple select
select * from seq_1_to_15_step_2; select * from seq_1_to_15_step_2;
select * from seq_1_to_15; select * from seq_1_to_15;

14
storage/sequence/sequence.cc
View File

@ -20,6 +20,7 @@
a engine that auto-creates tables with rows filled with sequential values a engine that auto-creates tables with rows filled with sequential values
*/ */
#include <ctype.h>
#include <mysql_version.h> #include <mysql_version.h>
#include <handler.h> #include <handler.h>
#include <table.h> #include <table.h>
@ -265,14 +266,19 @@ static handler *create_handler(handlerton *hton, TABLE_SHARE *table,
static bool parse_table_name(const char *name, size_t name_length, static bool parse_table_name(const char *name, size_t name_length,
ulonglong *from, ulonglong *to, ulonglong *step) ulonglong *from, ulonglong *to, ulonglong *step)
{ {
uint n1= 0, n2= 0; uint n0=0, n1= 0, n2= 0;
*step= 1; *step= 1;
// the table is discovered if its name matches the pattern of seq_1_to_10 or // the table is discovered if its name matches the pattern of seq_1_to_10 or
// seq_1_to_10_step_3 // seq_1_to_10_step_3
sscanf(name, "seq_%llu_to_%llu%n_step_%llu%n", sscanf(name, "seq_%llu_to_%n%llu%n_step_%llu%n",
from, to, &n1, step, &n2); from, &n0, to, &n1, step, &n2);
return n1 != name_length && n2 != name_length; // I consider this a bug in sscanf() - when an unsigned number
// is requested, -5 should *not* be accepted. But is is :(
// hence the additional check below:
return
n0 == 0 || !isdigit(name[4]) || !isdigit(name[n0]) || // reject negative numbers
(n1 != name_length && n2 != name_length);
} }