diff options
| author | unknown <svoj@april.(none)> | 2006-10-06 11:09:58 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-10-06 11:09:58 +0500 |
| commit | 44dd7f6d0eb2f80c658812a7a75b29f427274b48 (patch) | |
| tree | abe92d6e07073bbc277bf17e9bdb725c46d91aac /sql/share | |
| parent | 45c91e43e5f1c5ac007c1d7c320fc2b009ca7550 (diff) | |
| parent | 15d2a32c0f43ea73a683eda384da52373fe8c2e8 (diff) | |
| download | mariadb-git-44dd7f6d0eb2f80c658812a7a75b29f427274b48.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.1-engines
mysql-test/r/merge.result:
Manual merge.
sql/share/errmsg.txt:
Manual merge.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 8a2826efdcd..bdace31a66a 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -3791,7 +3791,7 @@ ER_WRONG_MRG_TABLE cze "V-B¹echny tabulky v MERGE tabulce nejsou definovány stejnì" dan "Tabellerne i MERGE er ikke defineret ens" nla "Niet alle tabellen in de MERGE tabel hebben identieke gedefinities" - eng "Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists" + eng "Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist" est "Kõik tabelid MERGE tabeli määratluses ei ole identsed" fre "Toutes les tables de la table de type MERGE n'ont pas la même définition" ger "Nicht alle Tabellen in der MERGE-Tabelle sind gleich definiert" |