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

Manual merge.

Browse Source
This commit is contained in:
Davi Arnaut
2009-08-10 15:46:20 -03:00
parent 48e0a640f9 69fbbdc19d
commit eb94a70784
4 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_lex.cc
View File

@ -1105,9 +1105,12 @@ int MYSQLlex(void *arg, void *yythd)
}
}
#ifdef USE_MB
else if (var_length < 1)
break; // Error
lip->skip_binary(var_length-1);
else if (use_mb(cs))
{
if ((var_length= my_ismbchar(cs, lip->get_ptr() - 1,
lip->get_end_of_query())))
lip->skip_binary(var_length-1);
}
#endif
}
if (double_quotes)