diff options
| author | unknown <acurtis/antony@ltamd64.xiphis.org> | 2006-09-18 12:16:03 -0700 |
|---|---|---|
| committer | unknown <acurtis/antony@ltamd64.xiphis.org> | 2006-09-18 12:16:03 -0700 |
| commit | 5d249a711c92f807d85f2ae4b9ffae0695bdb53e (patch) | |
| tree | 0cac934fd5a72ae1d051e1e833ca55c983275115 /sql/share | |
| parent | bf225def2f8ad21b07a5b0b507264a06606f073c (diff) | |
| parent | 74c828247974bb7736310e8764fe678e2cb9cd01 (diff) | |
| download | mariadb-git-5d249a711c92f807d85f2ae4b9ffae0695bdb53e.tar.gz | |
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into xiphis.org:/home/antony/work2/engines-merge
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/opt_range.cc:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
include/my_base.h:
manual merge
sql/ha_ndbcluster.cc:
manual merge
sql/handler.cc:
manual merge
sql/handler.h:
manual merge
sql/share/errmsg.txt:
manual merge
storage/innobase/handler/ha_innodb.cc:
manual merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 37f54899615..ccbdd3586a2 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5984,6 +5984,8 @@ ER_EVENTS_DB_ERROR eng "Cannot proceed because the tables used by events were found damaged at server start" ER_ONLY_INTEGERS_ALLOWED eng "Only normal integers allowed as number here" +ER_AUTOINC_READ_FAILED + eng "Failed to read auto-increment value from storage engine" ER_USERNAME eng "user name" ER_HOSTNAME |