diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-16 17:22:33 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-16 17:22:33 +0400 |
| commit | 146b0e14753c3e19451b04065b6d0f29d5a9a069 (patch) | |
| tree | 2871e2ea453c7f2ac10d1123bf0bf7bc9ab5663c /sql/share | |
| parent | 67e3dbc3d84a2b9b5258a8c4ff1710bccfaa10e5 (diff) | |
| parent | 02a832df2e9743fbe132fe84f906761fc00c1279 (diff) | |
| download | mariadb-git-146b0e14753c3e19451b04065b6d0f29d5a9a069.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
client/mysqldump.c:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/events_bugs.result:
Manual merge.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index c899d7424e2..682eee06e02 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6062,9 +6062,9 @@ ER_BINLOG_PURGE_EMFILE eng "Too many files opened, please execute the command again" ger "Zu viele offene Dateien, bitte führen Sie den Befehl noch einmal aus" ER_EVENT_CANNOT_CREATE_IN_THE_PAST - eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. Event has not been created" + eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation." ER_EVENT_CANNOT_ALTER_IN_THE_PAST - eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. Event has not been altered" + eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation." ER_SLAVE_INCIDENT eng "The incident %s occured on the master. Message: %-.64s" ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT |