diff options
author | unknown <dlenev@mysql.com> | 2003-09-14 01:57:09 +0400 |
---|---|---|
committer | unknown <dlenev@mysql.com> | 2003-09-14 01:57:09 +0400 |
commit | 1f82a0de6c841fc2b58cd45caf3ebeafce47d861 (patch) | |
tree | 9b95250006febf53e90b41329026267482bcd75e /sql/share | |
parent | df8b036d029a049ba40ba404142bbee3fd8cf13d (diff) | |
parent | 2f8f0a7e4d4d86489fc208dba00f37c74e1a0293 (diff) | |
download | mariadb-git-1f82a0de6c841fc2b58cd45caf3ebeafce47d861.tar.gz |
Manual merge after commiting START SLAVE UNTIL
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
include/mysqld_error.h:
Manual merge
mysql-test/r/rpl000015.result:
Manual merge
mysql-test/r/rpl_empty_master_crash.result:
Manual merge
mysql-test/r/rpl_flush_log_loop.result:
Manual merge
mysql-test/r/rpl_log.result:
Manual merge
mysql-test/r/rpl_log_pos.result:
Manual merge
mysql-test/r/rpl_redirect.result:
Manual merge
mysql-test/r/rpl_replicate_do.result:
Manual merge
mysql-test/r/rpl_rotate_logs.result:
Manual merge
sql/share/czech/errmsg.txt:
Manual merge
sql/share/danish/errmsg.txt:
Manual merge
sql/share/dutch/errmsg.txt:
Manual merge
sql/share/english/errmsg.txt:
Manual merge
sql/share/estonian/errmsg.txt:
Manual merge
sql/share/french/errmsg.txt:
Manual merge
sql/share/german/errmsg.txt:
Manual merge
sql/share/greek/errmsg.txt:
Manual merge
sql/share/hungarian/errmsg.txt:
Manual merge
sql/share/italian/errmsg.txt:
Manual merge
sql/share/japanese/errmsg.txt:
Manual merge
sql/share/korean/errmsg.txt:
Manual merge
sql/share/norwegian-ny/errmsg.txt:
Manual merge
sql/share/norwegian/errmsg.txt:
Manual merge
sql/share/polish/errmsg.txt:
Manual merge
sql/share/portuguese/errmsg.txt:
Manual merge
sql/share/romanian/errmsg.txt:
Manual merge
sql/share/russian/errmsg.txt:
Manual merge
sql/share/serbian/errmsg.txt:
Manual merge
sql/share/slovak/errmsg.txt:
Manual merge
sql/share/spanish/errmsg.txt:
Manual merge
sql/share/swedish/errmsg.txt:
Manual merge
sql/share/ukrainian/errmsg.txt:
Manual merge
sql/slave.cc:
Manual merge
sql/slave.h:
Manual merge
sql/sql_repl.cc:
Manual merge
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/czech/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/danish/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/dutch/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/english/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/estonian/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/french/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/german/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/greek/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/hungarian/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/italian/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/japanese/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/korean/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/norwegian-ny/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/norwegian/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/polish/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/portuguese/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/romanian/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/russian/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/serbian/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/slovak/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/spanish/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/swedish/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/ukrainian/errmsg.txt | 3 |
23 files changed, 69 insertions, 0 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index 31b52d71531..e920a2139db 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -286,3 +286,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index c0b2eb84a39..beea26d5f51 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -280,3 +280,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index 9c04e097a06..6eca86deba2 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -288,3 +288,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index a803f6673f4..8b9ed103cbb 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -277,3 +277,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format", "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 024c3038719..b4c17303ef0 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -282,3 +282,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 74b07e983a1..9f321a908b6 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -277,3 +277,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index 724d37bd2da..b5b47091035 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -286,3 +286,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index 968867f80ed..cf6f45eea84 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -277,3 +277,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index 9a547e09a91..43dcfcd16d3 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -279,3 +279,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index 869ebfb7e5d..125dca5310e 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -277,3 +277,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 77036d2d46b..1b73380df1c 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -279,3 +279,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index 7f2fb47c8fb..a32a8f1033e 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -277,3 +277,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index 45a07600df6..83da00a5955 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -279,3 +279,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index 953f628fd62..81cfad7e494 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -279,3 +279,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index 97ec0745c37..69b9c898ae7 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -281,3 +281,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index 5ed3c198402..2862e8036dc 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -277,3 +277,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index b0056ba5b7a..0591a082490 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -281,3 +281,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index 4d328f2babe..fe276396d92 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -279,3 +279,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "óÅÒ×ÅÒ ÚÁÐÕÝÅÎ × ÒÅÖÉÍÅ --secure-auth (ÂÅÚÏÐÁÓÎÏÊ Á×ÔÏÒÉÚÁÃÉÉ), ÎÏ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÑ '%s@%s' ÐÁÒÏÌØ ÓÏÈÒÁÎ£Î × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ; ÎÅÏÂÈÏÄÉÍÏ ÏÂÎÏ×ÉÔØ ÆÏÒÍÁÔ ÐÁÒÏÌÑ" "ðÏÌÅ ÉÌÉ ÓÓÙÌËÁ '%-.64s%s%-.64s%s%-.64s' ÉÚ SELECTÁ #%d ÂÙÌÁ ÎÁÊÄÅÎÁ × SELECTÅ #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index 1683d354d63..5869fa62c04 100644 --- a/sql/share/serbian/errmsg.txt +++ b/sql/share/serbian/errmsg.txt @@ -272,3 +272,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index b4ce439bdc3..9cf4d874339 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -285,3 +285,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index 5f73463e157..72f4249b4c9 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -278,3 +278,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index a550ff891b8..cf7859712ee 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -277,3 +277,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt index 7b09e2ce94a..2e7a01d9573 100644 --- a/sql/share/ukrainian/errmsg.txt +++ b/sql/share/ukrainian/errmsg.txt @@ -282,3 +282,6 @@ "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started." "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format" "óÔÏ×ÂÅÃØ ÁÂÏ ÐÏÓÉÌÁÎÎÑ '%-.64s%s%-.64s%s%-.64s' ¦Ú SELECTÕ #%d ÂÕÌÏ ÚÎÁÊÄÅÎÅ Õ SELECT¦ #%d", +"Wrong parameter or combination of parameters for START SLAVE UNTIL" +"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart" +"SQL thread is not to be started so UNTIL options are ignored" |