database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

auto-merge

Browse Source
This commit is contained in:
Tatiana A. Nurnberg
2009-01-09 22:26:51 +01:00
parent 7e0ec5c44a e22027ae9e
commit 2291857809
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqltest.c
View File

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

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

@@ -186,6 +186,8 @@ delimiter
2 2
2 2
2 2
@z:='1' @z=database()
1 NULL
End of 5.0 tests End of 5.0 tests
WARNING: --server-arg option not supported in this configuration. WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent' Warning (Code 1286): Unknown table engine 'nonexistent'

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

@@ -310,6 +310,11 @@ EOF
--exec $MYSQL -c < $MYSQLTEST_VARDIR/tmp/bug38158.sql 2>&1 --exec $MYSQL -c < $MYSQLTEST_VARDIR/tmp/bug38158.sql 2>&1
remove_file $MYSQLTEST_VARDIR/tmp/bug38158.sql; 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 --echo End of 5.0 tests
# #

6
sql/item_strfunc.cc
View File

@@ -1782,6 +1782,12 @@ Item *Item_func_sysconst::safe_charset_converter(CHARSET_INFO *tocs)
Item_string *conv; Item_string *conv;
uint conv_errors; uint conv_errors;
String tmp, cstr, *ostr= val_str(&tmp); 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); cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);
if (conv_errors || if (conv_errors ||
!(conv= new Item_static_string_func(fully_qualified_func_name(), !(conv= new Item_static_string_func(fully_qualified_func_name(),

2
sql/sql_partition.cc
View File

@@ -6678,6 +6678,7 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
uint32 max_endpoint_val; uint32 max_endpoint_val;
get_endpoint_func get_endpoint; get_endpoint_func get_endpoint;
uint field_len= field->pack_length_in_rec(); uint field_len= field->pack_length_in_rec();
part_iter->ret_null_part= part_iter->ret_null_part_orig= FALSE;
if (part_info->part_type == RANGE_PARTITION) if (part_info->part_type == RANGE_PARTITION)
{ {
@@ -6698,7 +6699,6 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
max_endpoint_val= part_info->no_list_values; max_endpoint_val= part_info->no_list_values;
part_iter->get_next= get_next_partition_id_list; part_iter->get_next= get_next_partition_id_list;
part_iter->part_info= part_info; part_iter->part_info= part_info;
part_iter->ret_null_part= part_iter->ret_null_part_orig= FALSE;
if (max_endpoint_val == 0) if (max_endpoint_val == 0)
{ {
/* /*