diff options
| author | paul@teton.kitebird.com <> | 2003-07-14 12:16:23 -0500 |
|---|---|---|
| committer | paul@teton.kitebird.com <> | 2003-07-14 12:16:23 -0500 |
| commit | a3d6a8aee43bf299ba8c13f4b0cb0a72b688fa57 (patch) | |
| tree | f51661419972617761f951a103e31c1b9b005bbb /sql/share/japanese | |
| parent | 74ef77fd4bd287517476922cbbec6aecdcf877c8 (diff) | |
| parent | 5846349c1e0efd7937fdcca49aabc98cf7240656 (diff) | |
| download | mariadb-git-a3d6a8aee43bf299ba8c13f4b0cb0a72b688fa57.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
Diffstat (limited to 'sql/share/japanese')
| -rw-r--r-- | sql/share/japanese/errmsg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index b8bc6e1d761..fedf0fd8e9c 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -215,7 +215,7 @@ "CREATE DATABASE not allowed while thread is holding global read lock", "Wrong arguments to %s", "%-.32s@%-.64s is not allowed to create new users", -"Incorrect table definition; All MERGE tables must be in the same database", +"Incorrect table definition; all MERGE tables must be in the same database", "Deadlock found when trying to get lock; Try restarting transaction", "The used table type doesn't support FULLTEXT indexes", "Cannot add foreign key constraint", |