mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

auto-merge

Browse source
This commit is contained in:
Tatiana A. Nurnberg 2009-01-09 23:06:07 +01:00
commit 386ec13b59
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/mysqltest.c
View file

@ -1344,7 +1344,7 @@ int diff_check()
{
char buf[512]= {0};
FILE *res_file;
char *cmd = "diff -v";
const char *cmd = "diff -v";
int have_diff = 0;
if (!(res_file= popen(cmd, "r")))

2
mysql-test/r/mysql.result
View file

@ -186,4 +186,6 @@ delimiter
2
2
2
@z:='1' @z=database()
1 NULL
End of 5.0 tests

5
mysql-test/t/mysql.test
View file

@ -309,4 +309,9 @@ EOF
--exec $MYSQL -c < $MYSQLTEST_VARDIR/tmp/bug38158.sql 2>&1
remove_file $MYSQLTEST_VARDIR/tmp/bug38158.sql;
#
# Bug #41437: Value stored in 'case' lacks charset, causees segfault
#
--exec $MYSQL -e "select @z:='1',@z=database()"
--echo End of 5.0 tests

6
sql/item_strfunc.cc
View file

@ -1696,6 +1696,12 @@ Item *Item_func_sysconst::safe_charset_converter(CHARSET_INFO *tocs)
Item_string *conv;
uint conv_errors;
String tmp, cstr, *ostr= val_str(&tmp);
if (null_value)
{
Item *null_item= new Item_null((char *) fully_qualified_func_name());
null_item->collation.set (tocs);
return null_item;
}
cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);
if (conv_errors ||
!(conv= new Item_static_string_func(fully_qualified_func_name(),