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

Bug#13519724 63793: CRASH IN DTCOLLATION::SET(DTCOLLATION &SET)

Browse Source 
Backport of fix for:
Bug#53236 Segfault in DTCollation::set(DTCollation&)
This commit is contained in:
Tor Didriksen
2012-02-22 11:17:50 +01:00
parent ad35745d88
commit 067f83e642
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,4 +468,13 @@ NULL
Warnings: Warnings:
Warning 1301 Result of cast_as_char() was larger than max_allowed_packet (2048) - truncated Warning 1301 Result of cast_as_char() was larger than max_allowed_packet (2048) - truncated
SET @@GLOBAL.max_allowed_packet=default; SET @@GLOBAL.max_allowed_packet=default;
#
# Bug#13519724 63793: CRASH IN DTCOLLATION::SET(DTCOLLATION &SET)
#
CREATE TABLE t1 (a VARCHAR(50));
SELECT a FROM t1
WHERE CAST(a as BINARY)=x'62736D697468'
AND CAST(a AS BINARY)=x'65736D697468';
a
DROP TABLE t1;
End of 5.1 tests End of 5.1 tests

12
mysql-test/t/cast.test
View File

@ -297,4 +297,16 @@ connection default;
disconnect newconn; disconnect newconn;
SET @@GLOBAL.max_allowed_packet=default; SET @@GLOBAL.max_allowed_packet=default;
--echo #
--echo # Bug#13519724 63793: CRASH IN DTCOLLATION::SET(DTCOLLATION &SET)
--echo #
CREATE TABLE t1 (a VARCHAR(50));
SELECT a FROM t1
WHERE CAST(a as BINARY)=x'62736D697468'
AND CAST(a AS BINARY)=x'65736D697468';
DROP TABLE t1;
--echo End of 5.1 tests --echo End of 5.1 tests

4
sql/sql_select.cc
View File

@ -8546,10 +8546,10 @@ change_cond_ref_to_const(THD *thd, I_List<COND_CMP> *save_list,
left_item->collation.collation == value->collation.collation)) left_item->collation.collation == value->collation.collation))
{ {
Item *tmp=value->clone_item(); Item *tmp=value->clone_item();
tmp->collation.set(right_item->collation);
if (tmp) if (tmp)
{ {
tmp->collation.set(right_item->collation);
thd->change_item_tree(args + 1, tmp); thd->change_item_tree(args + 1, tmp);
func->update_used_tables(); func->update_used_tables();
if ((functype == Item_func::EQ_FUNC || functype == Item_func::EQUAL_FUNC) if ((functype == Item_func::EQ_FUNC || functype == Item_func::EQUAL_FUNC)
@ -8570,10 +8570,10 @@ change_cond_ref_to_const(THD *thd, I_List<COND_CMP> *save_list,
right_item->collation.collation == value->collation.collation)) right_item->collation.collation == value->collation.collation))
{ {
Item *tmp= value->clone_item(); Item *tmp= value->clone_item();
tmp->collation.set(left_item->collation);
if (tmp) if (tmp)
{ {
tmp->collation.set(left_item->collation);
thd->change_item_tree(args, tmp); thd->change_item_tree(args, tmp);
value= tmp; value= tmp;
func->update_used_tables(); func->update_used_tables();