diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-10-02 14:52:09 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-10-02 14:52:09 +0500 |
| commit | ef5fe1f2b77be77b9e869922e026cd4f24d72ab7 (patch) | |
| tree | fc0a5e0080e0fb1ed6b5863ef65c61cf7dbe0098 /sql/share | |
| parent | dc9669ca04cd7598918a68f96efe69acefdf4dcf (diff) | |
| parent | 04bf9cc7c6f17d9c6ab14a7521c1ab1708f50993 (diff) | |
| download | mariadb-git-ef5fe1f2b77be77b9e869922e026cd4f24d72ab7.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index a097b438fe0..5ed7466b0df 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5631,3 +5631,6 @@ ER_HOSTNAME eng "host name" ER_WRONG_STRING_LENGTH eng "String '%-.70s' is too long for %s (should be no longer than %d)" +ER_NON_INSERTABLE_TABLE + eng "The target table %-.100s of the %s is not insertable-into" + |