bzr push into mysql-5.6 branch (bjorn.munch:4792 to 4795)

[Bjorn Munch]

 4795 Bjorn Munch	2012-12-20
      Update copyright year

    modified:
      include/welcome_copyright_notice.h
 4794 Bjorn Munch	2012-12-20
      Remove some internal comments from mysql_install_db

    modified:
      scripts/mysql_install_db.pl.in
 4793 Bjorn Munch	2012-12-20
      A bit more intelligent processing of .in files in mysql-test/collections

    modified:
      mysql-test/CMakeLists.txt
 4792 Nuno Carvalho	2012-12-14 {clone-5.6.10-build}
      BUG#15956714: REPLICATION DOESN'T WORK IN MYSQL 5.6.80-RC IF STARTED WITH SKIP-INNODB
      
      When a slave was started with --skip-innodb and info file repositories
      (default values), replication was incorrectly stopped. If slave is not
      doing a migration between info repositories and is using file
      repositories, replication can work flawless.
      
      When server is started with info file repositories and it is not doing a
      live migration, ignore errors when trying to open table info
      repositories.

    added:
      internal/mysql-test/suite/i_rpl/r/rpl_innodb_disabled.result
      internal/mysql-test/suite/i_rpl/t/rpl_innodb_disabled-slave.opt
      internal/mysql-test/suite/i_rpl/t/rpl_innodb_disabled.test
    modified:
      internal/mysql-test/extra/binlog_tests/binlog_innodb_disabled.inc
      internal/mysql-test/suite/i_binlog/r/binlog_row_innodb_disabled.result
      internal/mysql-test/suite/i_binlog/r/binlog_stm_mix_innodb_disabled.result
      mysql-test/suite/rpl/r/rpl_mts_debug.result
      mysql-test/suite/rpl/t/rpl_mts_debug.test
      sql/log_event.cc
      sql/rpl_info_factory.cc
      sql/rpl_info_factory.h
      sql/rpl_info_file.cc
      sql/rpl_info_file.h
      sql/rpl_rli_pdb.cc
=== modified file 'include/welcome_copyright_notice.h'
--- a/include/welcome_copyright_notice.h	2012-08-07 13:56:51 +0000
+++ b/include/welcome_copyright_notice.h	2012-12-20 11:34:11 +0000
@@ -16,7 +16,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2012"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL

=== modified file 'mysql-test/CMakeLists.txt'
--- a/mysql-test/CMakeLists.txt	2012-02-16 09:51:14 +0000
+++ b/mysql-test/CMakeLists.txt	2012-12-20 11:27:26 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -113,8 +113,10 @@ ENDMACRO()
 FILE(GLOB infiles "collections/*.in")
 FOREACH(collin ${infiles})
   STRING(REPLACE ".in" "" collection ${collin})
+  STRING(REPLACE ".in" ".done" colldone ${collin})
   # Only generate file once
-  IF(NOT EXISTS ${collection})
+  IF(NOT EXISTS ${colldone})
     PROCESS_COLLECTION_INCLUDE(${collin} ${collection})
+    FILE(APPEND ${colldone} "${collin}\n")
   ENDIF()
 ENDFOREACH()

=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2012-11-19 13:53:28 +0000
+++ b/scripts/mysql_install_db.pl.in	2012-12-20 11:31:35 +0000
@@ -356,20 +356,10 @@ sub tell_root_password {
 ##############################################################################
 
 sub generate_random_password {
-  # Short term:
   # On (at least) Linux and Solaris, a "random" device is available, use it:
   # cat /dev/urandom | LC_ALL=C tr -dc "[:alnum:]" | fold -w 8  | head -1
   # Without LC_ALL, "tr" may not know the "alnum" character class -
   # and there are user profiles which do not have this set.
-  # Note: There is no guarantee the results will pass a validation checker
-  # as resulted from WL#2739
-  # http://wl.no.oracle.com/worklo/?tid=2739
-  # http://dev.mysql.com/doc/refman/5.6/en/validate-password-plugin.html
-  #
-  # Long term:
-  # Password generated via Perl module "String::MkPasswd" available at
-  # http://search.cpan.org/~cgrau/String-MkPasswd/bin/mkpasswd.pl
-  # Using it got approved recently.
   #
   my $password = `cat /dev/urandom | LC_ALL=C tr -dc "[:alnum:]" | fold -w 8  | head -1`;
   chomp ($password);

No bundle (reason: useless for push emails).