diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 12:26:11 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 12:26:11 +0200 |
commit | 1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8 (patch) | |
tree | c40b137e083a5adccc139a844c0f8d085283fc32 /sql/mysqld.cc | |
parent | c676f58c270d75b6c1889b24b9833afc65b0d98b (diff) | |
parent | a6585d5ce99c2efdd75884b989250e2de8203cca (diff) | |
download | mariadb-git-1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b985607eeb1..2d872afaeb8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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; |