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

A fix and test case for bug#5688 "Upgraded 4.1.5 Server seg faults"

Browse Source 
mysql-test/r/ps.result:
  Test results fixed: the test case for bug#5688 "Upgraded 4.1.5 Server 
  seg faults"
mysql-test/t/ps.test:
  Test case for bug#5688 "Upgraded 4.1.5 Server seg faults"
sql/item_cmpfunc.cc:
  A fix for bug#5688 "Upgraded 4.1.5 Server seg faults":
  fix just another place where we use wrong memory root for an Item
  in statement prepare.
  In addition, make the check for charsets in Item_bool_func2
  more generic (fixes the test case when we use LIKE to compare BLOBs
  with TEXT data).
This commit is contained in:
unknown
2004-09-23 18:01:55 +04:00
parent 3f76fd69a4
commit edcccfbc4b
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,3 +289,11 @@ execute stmt using @var;
select * from t1; select * from t1;
deallocate prepare stmt; deallocate prepare stmt;
drop table t1; drop table t1;
prepare stmt from "select 'abc' like convert('abc' using utf8)";
execute stmt;
'abc' like convert('abc' using utf8)
1
execute stmt;
'abc' like convert('abc' using utf8)
1
deallocate prepare stmt;

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

@ -304,3 +304,13 @@ select * from t1;
deallocate prepare stmt; deallocate prepare stmt;
drop table t1; drop table t1;
#
# BUG#5688 "Upgraded 4.1.5 Server seg faults" # (prepared statements)
# The test case speaks for itself.
# Just another place where we used wrong memory root for Items created
# during statement prepare.
#
prepare stmt from "select 'abc' like convert('abc' using utf8)";
execute stmt;
execute stmt;
deallocate prepare stmt;

26
sql/item_cmpfunc.cc
View File

@ -188,17 +188,27 @@ void Item_bool_func2::fix_length_and_dec()
{ {
uint strong= 0; uint strong= 0;
uint weak= 0; uint weak= 0;
uint32 dummy_offset;
DTCollation coll; DTCollation coll;
if (args[0]->result_type() == STRING_RESULT && if (args[0]->result_type() == STRING_RESULT &&
args[1]->result_type() == STRING_RESULT && args[1]->result_type() == STRING_RESULT &&
!my_charset_same(args[0]->collation.collation, String::needs_conversion(0, args[0]->collation.collation,
args[1]->collation.collation) && args[1]->collation.collation,
&dummy_offset) &&
!coll.set(args[0]->collation, args[1]->collation, TRUE)) !coll.set(args[0]->collation, args[1]->collation, TRUE))
{ {
Item* conv= 0; Item* conv= 0;
THD *thd= current_thd;
Item_arena *arena= thd->current_arena, backup;
strong= coll.strong; strong= coll.strong;
weak= strong ? 0 : 1; weak= strong ? 0 : 1;
/*
In case we're in statement prepare, create conversion item
in its memory: it will be reused on each execute.
*/
if (arena->is_stmt_prepare())
thd->set_n_backup_item_arena(arena, &backup);
if (args[weak]->type() == STRING_ITEM) if (args[weak]->type() == STRING_ITEM)
{ {
String tmp, cstr; String tmp, cstr;
@ -211,21 +221,13 @@ void Item_bool_func2::fix_length_and_dec()
} }
else else
{ {
THD *thd= current_thd;
/*
In case we're in statement prepare, create conversion item
in its memory: it will be reused on each execute.
*/
Item_arena *arena= thd->current_arena, backup;
if (arena->is_stmt_prepare())
thd->set_n_backup_item_arena(arena, &backup);
conv= new Item_func_conv_charset(args[weak], conv= new Item_func_conv_charset(args[weak],
args[strong]->collation.collation); args[strong]->collation.collation);
if (arena->is_stmt_prepare())
thd->restore_backup_item_arena(arena, &backup);
conv->collation.set(args[weak]->collation.derivation); conv->collation.set(args[weak]->collation.derivation);
conv->fix_fields(thd, 0, &conv); conv->fix_fields(thd, 0, &conv);
} }
if (arena->is_stmt_prepare())
thd->restore_backup_item_arena(arena, &backup);
args[weak]= conv ? conv : args[weak]; args[weak]= conv ? conv : args[weak];
} }
} }