diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:13:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:13:46 +0200 |
| commit | 1933cf98e842f97e11f69afc631638618ec16068 (patch) | |
| tree | 446b8ff1ac09234b99d71ff06b75961c43247083 /sql | |
| parent | 137812c88a418479c7d637f4075712d9f6c6c82f (diff) | |
| parent | e8907112790475772b3e5135b58ef95b3fd8ea68 (diff) | |
| download | mariadb-git-bb-10.0-merge.tar.gz | |
Merge 5.5 into 10.0bb-10.0-merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 3 | ||||
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 21bfc3cead2..491eb3dbda6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8479,7 +8479,8 @@ mysqld_get_one_option(int optid, 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; diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 19611758ee0..0de075938d0 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6980,7 +6980,7 @@ ER_KEY_BASED_ON_GENERATED_VIRTUAL_COLUMN ER_WRONG_FK_OPTION_FOR_VIRTUAL_COLUMN eng "Cannot define foreign key with %s clause on a computed column" ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN - eng "The value specified for computed column '%s' in table '%s' ignored" + eng "The value specified for computed column '%s' in table '%s' has been ignored" ER_UNSUPPORTED_ACTION_ON_VIRTUAL_COLUMN eng "This is not yet supported for computed columns" ER_CONST_EXPR_IN_VCOL |