bzr push into mysql-trunk branch (tor.didriksen:4383 to 4384)

[Tor Didriksen]

 4384 Tor Didriksen	2012-08-30 [merge]
      merge 5.6 => trunk

    modified:
      plugin/semisync/semisync_master.cc
      scripts/comp_sql.c
      sql/sql_trigger.cc
      strings/ctype-uca.c
 4383 Vasil Dimov	2012-08-30 [merge]
      Merge mysql-5.6 -> mysql-trunk

    modified:
      mysql-test/suite/innodb/t/innodb-blob.test
=== modified file 'plugin/semisync/semisync_master.cc'
--- a/plugin/semisync/semisync_master.cc	2011-09-08 10:14:08 +0000
+++ b/plugin/semisync/semisync_master.cc	2012-08-30 11:44:55 +0000
@@ -1057,7 +1057,7 @@ int ReplSemiSyncMaster::readSlaveReply(N
   ulong    packet_len;
   int      result = -1;
 
-  struct timespec start_ts;
+  struct timespec start_ts= { 0, 0 };
   ulong trc_level = trace_level_;
 
   function_enter(kWho);

=== modified file 'scripts/comp_sql.c'
--- a/scripts/comp_sql.c	2012-05-03 03:16:40 +0000
+++ b/scripts/comp_sql.c	2012-08-30 11:44:55 +0000
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
   char* infile_name= argv[2];
   char* outfile_name= argv[3];
   int rc;
-  int query_length;
+  int query_length= 0;
   int error= 0;
   char *err_ptr;
 

=== modified file 'sql/sql_trigger.cc'
--- a/sql/sql_trigger.cc	2012-08-29 14:33:33 +0000
+++ b/sql/sql_trigger.cc	2012-08-30 11:59:50 +0000
@@ -1722,7 +1722,7 @@ bool add_table_for_trigger(THD *thd,
   LEX *lex= thd->lex;
   char trn_path_buff[FN_REFLEN];
   LEX_STRING trn_path= { trn_path_buff, 0 };
-  LEX_STRING tbl_name;
+  LEX_STRING tbl_name= { NULL, 0 };
 
   DBUG_ENTER("add_table_for_trigger");
 

=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c	2012-07-02 12:02:05 +0000
+++ b/strings/ctype-uca.c	2012-08-30 11:59:50 +0000
@@ -19798,6 +19798,7 @@ my_uca_scanner_contraction_find(my_uca_s
   size_t clen= 1;
   int flag;
   const uchar *s, *beg[MY_UCA_MAX_CONTRACTION];
+  memset(beg, 0, sizeof(beg));
 
   /* Scan all contraction candidates */
   for (s= scanner->sbeg, flag= MY_UCA_CNT_MID1;

No bundle (reason: useless for push emails).