diff options
| author | unknown <andrey@lmy004.> | 2006-02-24 12:03:32 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-02-24 12:03:32 +0100 |
| commit | d7d068ea22fe7570f8ec99e325b6a5b3a9d603ff (patch) | |
| tree | f6fa7223129ff08941ce75ffa5c226b7ec86a9e6 /sql/share | |
| parent | 4bef6225852ea9e47eedab4f61ccefeed1e74196 (diff) | |
| parent | 17fb7f96a2617e3fb9743cc2d038862702bf9235 (diff) | |
| download | mariadb-git-d7d068ea22fe7570f8ec99e325b6a5b3a9d603ff.tar.gz | |
merge
mysql-test/r/events.result:
Auto merged
sql/event.cc:
Auto merged
sql/event.h:
Auto merged
sql/event_executor.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/event_timed.cc:
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 49cfe4c4878..74e2a8418dd 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5781,7 +5781,7 @@ ER_EVENT_NEITHER_M_EXPR_NOR_M_AT eng "No datetime expression provided" ER_COL_COUNT_DOESNT_MATCH_CORRUPTED eng "Column count of mysql.%s is wrong. Expected %d, found %d. Table probably corrupted" -ER_EVENT_CANNOT_LOAD_FROM_TABLE +ER_CANNOT_LOAD_FROM_TABLE eng "Cannot load from mysql.%s. Table probably corrupted. See error log." ER_EVENT_CANNOT_DELETE eng "Failed to delete the event from mysql.event" |