database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Correct handling of parameter variables with NULL values in PREPARE queries

Browse Source
This commit is contained in:
sergefp@mysql.com
2004-04-07 12:58:28 +04:00
parent 1f8505d66f
commit ca75b62d5a
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/ps.result
View File

@ -66,6 +66,7 @@ NULL
NULL
NULL
NULL
set @nullvar=1;
set @nullvar=NULL;
execute stmt5 using @nullvar;
? + a
@ -74,4 +75,12 @@ NULL
NULL
NULL
NULL
set @nullvar2=NULL;
execute stmt5 using @nullvar2;
? + a
NULL
NULL
NULL
NULL
NULL
drop table t1;

4
mysql-test/t/ps.test
View File

@ -68,8 +68,12 @@ execute stmt5 using @a;
execute stmt5 using @no_such_var;
set @nullvar=1;
set @nullvar=NULL;
execute stmt5 using @nullvar;
set @nullvar2=NULL;
execute stmt5 using @nullvar2;
drop table t1;

6
sql/sql_prepare.cc
View File

@ -661,7 +661,8 @@ static bool insert_params_from_vars(Prepared_statement *stmt,
varname= var_it++;
if ((entry= (user_var_entry*)hash_search(&stmt->thd->user_vars,
(byte*) varname->str,
varname->length)))
varname->length))
&& entry->value)
{
param->item_result_type= entry->type;
switch (entry->type)
@ -710,7 +711,8 @@ static bool insert_params_from_vars_with_log(Prepared_statement *stmt,
varname= var_it++;
if ((entry= (user_var_entry*)hash_search(&stmt->thd->user_vars,
(byte*) varname->str,
varname->length)))
varname->length))
&& entry->value)
{
param->item_result_type= entry->type;
switch (entry->type)