diff options
| author | unknown <pem@mysql.com> | 2003-12-16 16:12:28 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-16 16:12:28 +0100 |
| commit | b8fa1718502174c9d4599fd02c9ca0ffa74db1ef (patch) | |
| tree | 6c17d3cffec1fb7d5a50cf0dd8236f04c18f0291 /sql/share/german/errmsg.txt | |
| parent | 241bb226993b5ea11e73903858b5ba0fdc6e6647 (diff) | |
| parent | 24794dbc6d5d0a1481b413c43e72c9bb731794c7 (diff) | |
| download | mariadb-git-b8fa1718502174c9d4599fd02c9ca0ffa74db1ef.tar.gz | |
Merge 4.1 to 5.0.
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/null.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/status.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/distinct.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/null.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/share/german/errmsg.txt')
| -rw-r--r-- | sql/share/german/errmsg.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index 66a22c8bb05..36b8d4b98d6 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -301,6 +301,7 @@ character-set=latin1 "Unknown key cache '%-.100s'", "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work", "Unknown table engine '%s'", +"'%s' is deprecated. Use '%s' instead.", "Can't create a %s from within another stored routine" "%s %s already exists" "%s %s does not exist" |