Merge 10.1 into 10.2

This commit is contained in:
Marko Mäkelä 2019-03-27 12:26:11 +02:00
commit 1e9c2b2305
39 changed files with 478 additions and 422 deletions

View file

@ -9142,7 +9142,8 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
val= p--;
while (my_isspace(mysqld_charset, *p) && p > argument)
*p-- = 0;
if (p == argument)
/* Db name can be one char also */
if (p == argument && my_isspace(mysqld_charset, *p))
{
sql_print_error("Bad syntax in replicate-rewrite-db - empty FROM db!\n");
return 1;