diff options
author | unknown <hf@deer.mysql.r18.ru> | 2003-04-08 19:43:24 +0500 |
---|---|---|
committer | unknown <hf@deer.mysql.r18.ru> | 2003-04-08 19:43:24 +0500 |
commit | bbcf5390d6f2126bd4d13717cabb47d2a07c5cb9 (patch) | |
tree | 01d8c458001514d5c89684a3b748ad31483c8557 /sql/share/korean | |
parent | cfd69393e4195e55412778a9d60c7eb99c87de4c (diff) | |
parent | 131d90001f2eca14d3497207b57fcd484c3f8927 (diff) | |
download | mariadb-git-bbcf5390d6f2126bd4d13717cabb47d2a07c5cb9.tar.gz |
Merging
myisam/mi_check.c:
Auto merged
myisam/sort.c:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
include/mysqld_error.h:
error messages trimmed
sql/share/czech/errmsg.txt:
error messages trimmed
sql/share/danish/errmsg.txt:
error messages trimmed
sql/share/dutch/errmsg.txt:
error messages trimmed
sql/share/english/errmsg.txt:
error messages trimmed
sql/share/estonian/errmsg.txt:
error messages trimmed
sql/share/french/errmsg.txt:
error messages trimmed
sql/share/german/errmsg.txt:
error messages trimmed
sql/share/greek/errmsg.txt:
error messages trimmed
sql/share/hungarian/errmsg.txt:
error messages trimmed
sql/share/italian/errmsg.txt:
error messages trimmed
sql/share/japanese/errmsg.txt:
error messages trimmed
sql/share/korean/errmsg.txt:
error messages trimmed
sql/share/norwegian-ny/errmsg.txt:
error messages trimmed
sql/share/norwegian/errmsg.txt:
error messages trimmed
sql/share/polish/errmsg.txt:
error messages trimmed
sql/share/portuguese/errmsg.txt:
error messages trimmed
sql/share/romanian/errmsg.txt:
error messages trimmed
sql/share/russian/errmsg.txt:
error messages trimmed
sql/share/serbian/errmsg.txt:
error messages trimmed
sql/share/slovak/errmsg.txt:
error messages trimmed
sql/share/spanish/errmsg.txt:
error messages trimmed
sql/share/swedish/errmsg.txt:
error messages trimmed
sql/share/ukrainian/errmsg.txt:
error messages trimmed
Diffstat (limited to 'sql/share/korean')
-rw-r--r-- | sql/share/korean/errmsg.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index 71c8b621bc6..7ff6897a466 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -270,3 +270,4 @@ "Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION" "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored." "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN." +"Query execution was interrupted" |