diff options
| author | unknown <svoj@april.(none)> | 2006-09-27 18:58:23 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-09-27 18:58:23 +0500 |
| commit | d119810cca8bdddc9ed7bef17c2742f6bf512f23 (patch) | |
| tree | e80bfc86692affe997adce61f718b7b13026f001 /sql/share | |
| parent | ffa4a1e05ae6ecb2951bfdd117bf6df404834f7c (diff) | |
| parent | d6d1176eed9f249107410bc981f931dac81757ca (diff) | |
| download | mariadb-git-d119810cca8bdddc9ed7bef17c2742f6bf512f23.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/repair.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/table.cc:
Auto merged
storage/myisammrg/myrg_open.c:
Auto merged
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 ccbdd3586a2..ff6b8818460 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 "All tables in the MERGE table are not identically defined" + eng "Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists" 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" |