mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 15:15:34 +02:00
Merge mysql.com:/usr/home/bar/mysql-4.1.b12351
into mysql.com:/usr/home/bar/mysql-5.0 client/mysqlcheck.c: Auto merged mysql-test/r/func_system.result: Auto merged sql/item_strfunc.cc: Auto merged
This commit is contained in:
commit
8685497a3f
4 changed files with 36 additions and 3 deletions
|
|
@ -1570,6 +1570,7 @@ Item *Item_func_sysconst::safe_charset_converter(CHARSET_INFO *tocs)
|
|||
return NULL;
|
||||
}
|
||||
conv->str_value.copy();
|
||||
conv->str_value.shrink_to_length();
|
||||
return conv;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue