Added last_errno and last_error to show slave status

slave will skip the first SQL_SLAVE_SKIP_COUNTER events on start - 
this is needed to recover from broken replication when the next log
event(s) should just be skipped.
Rotate binlogs when max_binlog_size is reached


include/my_sys.h:
  added my_snprintf()
include/mysqld_error.h:
  more error messages
mysql-test/r/rpl000014.result:
  updated results for new SHOW SLAVE STATUS format
mysql-test/r/rpl000015.result:
  update for SHOW SLAVE STATUS
mysql-test/r/rpl000016.result:
  update for additions to the test
mysql-test/t/rpl000016.test:
  test max_binlog_size and slave_skip_counter
mysys/my_vsnprintf.c:
  added my_snprintf()
sql/gen_lex_hash.cc:
  old values could not do it
sql/lex.h:
  updates for SQL_SLAVE_SKIP_COUNTER
sql/log.cc:
  rotate binlogs when max_binlog_size is reached
sql/mysqld.cc:
  added max_binlog_size
sql/share/czech/errmsg.txt:
  new errors
sql/share/danish/errmsg.txt:
  new errors
sql/share/dutch/errmsg.txt:
  new errors
sql/share/english/errmsg.txt:
  new errors
sql/share/estonian/errmsg.txt:
  new errors
sql/share/french/errmsg.txt:
  new errors
sql/share/german/errmsg.txt:
  new errors
sql/share/greek/errmsg.txt:
  new errors
sql/share/hungarian/errmsg.txt:
  new errors
sql/share/italian/errmsg.txt:
  new errors
sql/share/japanese/errmsg.txt:
  new errors
sql/share/korean/errmsg.txt:
  new errors
sql/share/norwegian-ny/errmsg.txt:
  new errors
sql/share/norwegian/errmsg.txt:
  new errors
sql/share/polish/errmsg.txt:
  new errors
sql/share/portuguese/errmsg.txt:
  new errors
sql/share/romanian/errmsg.txt:
  new errors
sql/share/russian/errmsg.txt:
  new errors, translated untranslated messages
sql/share/slovak/errmsg.txt:
  new errors
sql/share/spanish/errmsg.txt:
  new errors
sql/share/swedish/errmsg.txt:
  new errors
sql/slave.cc:
  updates for slave_skip_counter and extension to show slave status
sql/slave.h:
  slave_skip_counter
sql/sql_repl.cc:
  use error messages from errmsg.txt
sql/sql_yacc.yy:
  skip_slave_counter

21 files changed, 115 insertions, 10 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index c10d59dc21c..319d8a88149 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -208,3 +208,8 @@
 "Tabulka '%-.64s' je ozna-BХena jako poru╧enА a poslednМ (automatickА?) oprava se nezdaЬila",-A
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 79d7ae5efc4..43aad2f71e4 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -202,3 +202,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 1cfdbee8d43..86d8e095d20 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -199,3 +199,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 4900e4bd7ad..e11a182c6b7 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -187,7 +187,7 @@
 "Got error %d during CHECKPOINT",
 "Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
 "The handler for the table does not support binary table dump",
-"Binlog closed while trying to FLUSH MASTER",
+"Binlog closed, cannot RESET MASTER",
 "Failed rebuilding the index of  dumped table '%-.64s'",
 "Error from master: '%-.64s'",
 "Net error reading from master",
@@ -199,3 +199,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index cb609f66432..227b6336562 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -203,3 +203,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 0e1b9cf8e01..594da49c32e 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -199,3 +199,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 4d36544fedc..621cef7affa 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -202,3 +202,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index eb43678ddcf..0be996a0e8a 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -199,3 +199,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index eacc8a967a9..20e1af723fa 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -201,3 +201,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index f5e333696cf..699ab815e2a 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -199,3 +199,8 @@
 "La tabella '%-.64s' e' segnalata come rovinata e l'ultima ricostruzione (automatica?) e' fallita",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 4b7a3fd30e1..04b411239ae 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -201,3 +201,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index d772f8c46d5..e1efb0c15ae 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -199,3 +199,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index d6c29026c0b..5484b58425e 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -201,3 +201,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 4d0c1ef87f0..4db4af5457f 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -201,3 +201,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index a77f64b8b37..5e90cf05b8e 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -203,3 +203,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 946a64df5d0..1cd257e9ab1 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -199,3 +199,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 7c325b9c662..cc453ff4dfc 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -203,3 +203,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 7a83573e0ff..d3564e5ef5b 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -179,7 +179,7 @@
 "Результат содержит больше одной строки",
 "Таблица этого типа обязана иметь PRIMARY KEY",
 "Эта копия MySQL скомпилирована без поддержки RAID",
-"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
+"MySQL работает в режиме защиты от дураков (safe_mode) - не могу UPDATE без WHERE с каким-небудь KEY",
 "Индекс '%-.64s' не найден в таблице '%-.64s'",
 "Не могу открыть таблицу",
 "Данный тип таблиц не поддерживает check/repair",
@@ -190,15 +190,20 @@
 "Ошибка %d во время CHECKPOINT",
 "Прерванное соединение %ld к базе данных: '%-.64s' пользователь: '%-.32s' хост: `%-.64s' (%-.64s)",
 "Этот тип таблиц не поддерживает binary table dump",
-"Binlog closed while trying to FLUSH MASTER",
-"Failed rebuilding the index of dumped table '%-.64s'",
-"Error from master: '%-.64s'",
-"Net error reading from master",
-"Net error writing to master",
+"Репликационный лог закрыт, не могу сделать RESET MASTER",
+"Ошибка при восстановлении индекса перекачанной таблицы '%-.64s'",
+"Ошибка на мастере: '%-.64s'",
+"Сетевая ошибка при чтении с мастера",
+"Сетевая ошибка при писании мастеру",
 "FULLTEXT индекс, соответствующий заданному списку столбцов, не найден",
-"Can't execute the given command because you have active locked tables or an active transaction",
+"Не могу выполнить комманду из-за активных locked таблиц или активной транзакции",
 "Неизвестная системная переменная '%-.64'",
 "Таблица '%-.64s' помечена как испорченная и должна быть исправлена",
 "Таблица '%-.64s' помечена как испорченная и последняя попытка исправления (автоматическая?) не удалась",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Предупреждение: некоторые нетранзакционные таблицы не подчиняются ROLLBACK",
+"Многозапросная транзакция требует увеличения 'max_binlog_cache_size' - увеличте эту переменную и попробуйте еще раз",
+"Эта операция невозможна с активным  slave, надо SLAVE STOP",
+"Эта операция невозможна с пассивным slave, надо SLAVE START",
+"Этот сервер не slave, исправьте в конфигурационном файле или коммандой CHANGE MASTER TO",
+"Не получилось инициализировать структуру master info, проверте persmissions на файле master.info",
+"Не могу создать процесс SLAVE, проверьте системные ресурсы",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 774047be656..47d51506019 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -207,3 +207,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 0003e435183..6fc6451c0da 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -200,3 +200,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index ee3d913e51a..a47bdf7428e 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -199,3 +199,8 @@
 "Tabell '%-.64s' Дr crashad och senast (automatiska?) reparation misslyckades",
 "Warning:  NЕgra icke transaktionella tabeller kunde inte ЕterstДllas vid ROLLBACK",
 "Transaktionen krДvde mera Дn 'max_binlog_cache_size' minne. UtЖka denna mysqld variabel och fЖrsЖk pЕ nytt",
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",