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

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik 2016-07-12 22:20:46 +02:00
commit c6fdb92ca8
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmysqld/lib_sql.cc
View File

@ -341,6 +341,12 @@ static int emb_stmt_execute(MYSQL_STMT *stmt)
THD *thd; THD *thd;
my_bool res; my_bool res;
if (stmt->param_count && !stmt->bind_param_done)
{
set_stmt_error(stmt, CR_PARAMS_NOT_BOUND, unknown_sqlstate, NULL);
DBUG_RETURN(1);
}
int4store(header, stmt->stmt_id); int4store(header, stmt->stmt_id);
header[4]= (uchar) stmt->flags; header[4]= (uchar) stmt->flags;
thd= (THD*)stmt->mysql->thd; thd= (THD*)stmt->mysql->thd;

2
mysql-test/r/ps_1general.result
View File

@ -788,3 +788,5 @@ execute stmt1;
1 1
drop prepare stmt1; drop prepare stmt1;
drop table t1; drop table t1;
select ?+1;
Got one of the listed errors

2
mysql-test/suite/funcs_1/datadict/processlist_priv.inc
View File

@ -153,7 +153,7 @@ connection default;
let $wait_timeout= 10; let $wait_timeout= 10;
let $wait_condition= let $wait_condition=
SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE DB = 'information_schema' AND COMMAND = 'Sleep' AND USER = 'ddicttestuser1'; WHERE DB = 'information_schema' AND COMMAND = 'Sleep' AND USER = 'ddicttestuser1' AND state='';
--source include/wait_condition.inc --source include/wait_condition.inc
--replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" "" --replace_result ENGINE=MyISAM "" ENGINE=Aria "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
eval SHOW CREATE TABLE $table; eval SHOW CREATE TABLE $table;

7
mysql-test/t/ps_1general.test
View File

@ -933,3 +933,10 @@ drop table t1;
# Matthias # Matthias
# End of 4.1 tests # End of 4.1 tests
#
# MDEV-10318 unset params in --ps --embedded
#
--error ER_PARSE_ERROR,2031
select ?+1;