mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merge with 4.0.18
Build-tools/Bootstrap: Auto merged client/mysql.cc: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/t/auto_increment.test: Auto merged mysql-test/t/type_decimal.test: Auto merged sql/opt_range.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/slave.cc: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged
This commit is contained in:
@ -1090,7 +1090,6 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part,
|
||||
all rows between 'X' and 'X ...'
|
||||
*/
|
||||
uint length= uint2korr(str+maybe_null);
|
||||
char *end;
|
||||
str2= str+ key_part->part_length + maybe_null;
|
||||
/* remove end space */
|
||||
while (length > 0 && str[length+HA_KEY_BLOB_LENGTH+maybe_null-1] == ' ')
|
||||
|
Reference in New Issue
Block a user