From: Bjorn Munch
Date: January 4 2012 3:53pm
Subject: bzr push into mysql-trunk-mtr branch (bjorn.munch:3141 to 3143)
List-Archive: http://lists.mysql.com/commits/142287
Message-Id: <201201041553.q04FrW1W022833@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3143 Bjorn Munch	2012-01-04 [merge]
      merge trunk => trunk-mtr

    modified:
      sql/field.cc
      sql/rpl_slave.cc
 3142 Bjorn Munch	2012-01-04 [merge]
      upmerge followup for fix 13055685

    modified:
      mysql-test/include/show_slave_status.inc
      mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
      mysql-test/suite/rpl/t/rpl_log_pos.test
      mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
 3141 Bjorn Munch	2012-01-03 [merge]
      null upmerge

=== modified file 'mysql-test/include/show_slave_status.inc'
--- a/mysql-test/include/show_slave_status.inc	2010-12-20 14:57:35 +0000
+++ b/mysql-test/include/show_slave_status.inc	2012-01-04 15:48:00 +0000
@@ -55,6 +55,11 @@
 #     comma-separated list. Example:
 #
 #       --let $status_items= Master_Log_File, Relay_Master_Log_File
+#
+#   $slave_io_error_replace
+#     If set, one or more regex patterns for replacing variable
+#     text in the error message. Syntax as --replace-regex
+#
 
 
 --let $_show_slave_status_items= $status_items
@@ -70,6 +75,7 @@ while ($_show_slave_status_items)
   --let $_show_slave_status_items= `SELECT LTRIM(SUBSTRING('$_show_slave_status_items', LENGTH('$_show_slave_status_name') + 2))`
 
   --let $_show_slave_status_value= query_get_value(SHOW SLAVE STATUS, $_show_slave_status_name, 1)
+  --replace_regex $slave_io_error_replace
   --let $_show_slave_status_value= `SELECT REPLACE("$_show_slave_status_value", '$MYSQL_TEST_DIR', 'MYSQL_TEST_DIR')`
   --echo $_show_slave_status_name = '$_show_slave_status_value'
 }

=== modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result'
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result	2012-01-04 15:48:00 +0000
@@ -12,6 +12,7 @@ change master to master_log_pos=MASTER_L
 Read_Master_Log_Pos = '75'
 start slave;
 include/wait_for_slave_io_error.inc [errno=1236]
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from 'master-bin.000001' at XXX, the last byte read was read from 'master-bin.000001' at XXX.''
 include/stop_slave_sql.inc
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB

=== modified file 'mysql-test/suite/rpl/r/rpl_manual_change_index_file.result'
--- a/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result	2012-01-04 15:48:00 +0000
@@ -8,6 +8,7 @@ CREATE TABLE t1(c1 INT);
 FLUSH LOGS;
 call mtr.add_suppression('Got fatal error 1236 from master when reading data from binary log: .*could not find next log');
 include/wait_for_slave_io_error.inc [errno=1236]
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'could not find next log; the last event was read from 'master-bin.000002' at XXX, the last byte read was read from 'master-bin.000002' at XXX.''
 CREATE TABLE t2(c1 INT);
 FLUSH LOGS;
 CREATE TABLE t3(c1 INT);

=== modified file 'mysql-test/suite/rpl/t/rpl_log_pos.test'
--- a/mysql-test/suite/rpl/t/rpl_log_pos.test	2011-10-28 21:22:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_log_pos.test	2012-01-04 15:48:00 +0000
@@ -22,12 +22,9 @@ let $status_items= Read_Master_Log_Pos;
 source include/show_slave_status.inc;
 start slave;
 let $slave_io_errno= 1236;
-#
-# Win and Unix path is printed differently: BUG#13055685. So
-# show_slave_io_error is made 0 until the bug fixes provide necessary
-# facilities
-#
-let $show_slave_io_error= 0;
+--let $show_slave_io_error= 1
+# Mask line numbers, and whether master-bin is preceded by "./" or "."
+--let $slave_io_error_replace= / at [0-9]*/ at XXX/ /\.\/*master-bin/master-bin/
 source include/wait_for_slave_io_error.inc;
 source include/stop_slave_sql.inc;
 

=== modified file 'mysql-test/suite/rpl/t/rpl_manual_change_index_file.test'
--- a/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test	2011-10-28 21:22:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test	2012-01-04 15:48:00 +0000
@@ -61,12 +61,9 @@ call mtr.add_suppression('Got fatal erro
 connection slave;
 # 1236 = ER_MASTER_FATAL_ERROR_READING_BINLOG
 --let $slave_io_errno= 1236
-#
-# Win and Unix path is printed differently: BUG#13055685. So
-# show_slave_io_error is made 0 until the bug fixes provide necessary
-# facilities
-#
---let $show_slave_io_error= 0
+--let $show_slave_io_error= 1
+# Mask line numbers, and whether master-bin is preceded by "./" or "."
+--let $slave_io_error_replace= / at [0-9]*/ at XXX/ /\.\/*master-bin/master-bin/
 --source include/wait_for_slave_io_error.inc
 
 connection master;

=== modified file 'sql/field.cc'
--- a/sql/field.cc	2011-12-15 15:15:37 +0000
+++ b/sql/field.cc	2012-01-04 12:47:36 +0000
@@ -5925,7 +5925,8 @@ int
 Field_year::store_time(MYSQL_TIME *ltime,
                        uint8 dec_arg __attribute__((unused)))
 {
-  if (ltime->time_type != MYSQL_TIMESTAMP_DATETIME)
+  if (ltime->time_type != MYSQL_TIMESTAMP_DATETIME &&
+      ltime->time_type != MYSQL_TIMESTAMP_DATE)
   {
     /* Convert time to datetime, then store year of the result */
     THD *thd= table ? table->in_use : current_thd;

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2011-12-21 10:29:44 +0000
+++ b/sql/rpl_slave.cc	2012-01-04 06:06:07 +0000
@@ -7454,10 +7454,10 @@ bool change_master(THD* thd, Master_info
   mi->rli->clear_until_condition();
 
   sql_print_information("'CHANGE MASTER TO executed'. "
-    "Previous state master_host='%s', master_port='%u', master_log_file='%s', "
-    "master_log_pos='%ld', master_bind='%s'. "
-    "New state master_host='%s', master_port='%u', master_log_file='%s', "
-    "master_log_pos='%ld', master_bind='%s'.", 
+    "Previous state master_host='%s', master_port= %u, master_log_file='%s', "
+    "master_log_pos= %ld, master_bind='%s'. "
+    "New state master_host='%s', master_port= %u, master_log_file='%s', "
+    "master_log_pos= %ld, master_bind='%s'.", 
     saved_host, saved_port, saved_log_name, (ulong) saved_log_pos,
     saved_bind_addr, mi->host, mi->port, mi->get_master_log_name(),
     (ulong) mi->get_master_log_pos(), mi->bind_addr);

No bundle (reason: useless for push emails).