bzr push into mysql-5.6 branch (magnus.blaudd:4763 to 4764)

[magnus.blaudd]

 4764 magnus.blaudd@stripped	2012-12-12 [merge]
      Merge

    modified:
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
 4763 Mayank Prasad	2012-12-12
      Bug#14494893 : INNODB_FILE_PER_TABLE DOES NOT PERMIT ON/OFF AT STARTUP
      
      Details :
       - During server initialization, when boolean values 1/true OR 0/false
         are given, then they were accpected but if on/off were given then
         they were being considered wrong.
      
      Reason :
       - During server initialization, while checking for the valid values
         for boolean parameters, only 1/true AND 0/false were being checked.
      
      Solution :
       - Added code to check for On/Off and if found, make them valid values.
      
       Test case innodb_file_per_table_basic.test is already there to check
       this parameter. So no new test case required. I just added
       --innodb_file_per_table in master.opt files with value On (Default) 
       so that at startup this fix could be verified.

    added:
      mysql-test/suite/sys_vars/t/innodb_file_per_table_basic-master.opt
    modified:
      mysys_ssl/my_getopt.cc
=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test'
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	revid:[e-mail]-20121212133354-cuo05is44f72vlpo
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	revid:magnus.blaudd@stripped
@@ -1053,9 +1053,9 @@ SET @text= REPEAT(_utf8'ç', 255);
 INSERT INTO t1 VALUES (1, @text);
 -- enable_warnings
 
-SELECT * FROM t1; 
+SELECT * FROM t1 ORDER BY c1; 
 -- sync_slave_with_master
-SELECT * FROM t1; 
+SELECT * FROM t1 ORDER BY c1; 
 
 # clean up
 -- connection master

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result	revid:mayank.prasad@stripped2133354-cuo05is44f72vlpo
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result	revid:[e-mail]-20121212144649-j9xogz2862bkn460
@@ -852,11 +852,11 @@ CREATE TABLE t1 (c1 INT) ENGINE='InnoDB'
 INSERT INTO t1 VALUES ();
 SET @text= REPEAT(_utf8'ç', 255);
 INSERT INTO t1 VALUES (1, @text);
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY c1;
 c1	c2
 0	
 1	ççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY c1;
 c1
 0
 1

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result	revid:mayank.prasad@stripped05is44f72vlpo
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result	revid:magnus.blaudd@stripped212144649-j9xogz2862bkn460
@@ -852,11 +852,11 @@ CREATE TABLE t1 (c1 INT) ENGINE='MyISAM'
 INSERT INTO t1 VALUES ();
 SET @text= REPEAT(_utf8'ç', 255);
 INSERT INTO t1 VALUES (1, @text);
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY c1;
 c1	c2
 0	
 1	çççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç1 ORDER BY c1;
 c1
 0
 1

No bundle (reason: useless for push emails).