bzr push into mysql-5.5-bugteam branch (jorgen.loland:3119 to 3120) Bug#57882

[Jorgen Loland]

 3120 Jorgen Loland	2010-11-04
      Bug#57882 - Item_func_conv_charset::val_str(String*): 
                  Assertion `fixed == 1' failed
      
      Followup patch. Test case relied on system variable that is
      only available if replication is compiled in. Replaced with
      variable available in all builds.
     @ mysql-test/r/errors.result
        Test case relied on system variable that is only available if
        replication is compiled in. Replaced with variable available in
        all builds.
     @ mysql-test/t/errors.test
        Test case relied on system variable that is only available if
        replication is compiled in. Replaced with variable available in
        all builds.

    modified:
      mysql-test/r/errors.result
      mysql-test/t/errors.test
 3119 smenon	2010-11-04 [merge]
      merge

    modified:
      .bzrignore
      configure.in
      mysql-test/r/1st.result
      mysql-test/r/connect.result
      mysql-test/r/errors.result
      mysql-test/r/information_schema.result
      mysql-test/r/log_tables_upgrade.result
      mysql-test/r/mysql_upgrade.result
      mysql-test/r/mysql_upgrade_ssl.result
      mysql-test/r/mysqlcheck.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/system_mysql_db.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_key_column_usage.result
      mysql-test/suite/funcs_1/r/is_statistics.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql.result
      mysql-test/suite/funcs_1/r/is_table_constraints.result
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
      mysql-test/suite/funcs_1/r/is_tables_mysql.result
      mysql-test/t/errors.test
      mysql-test/t/plugin_auth.test
      mysql-test/t/system_mysql_db_fix40123.test
      mysql-test/t/system_mysql_db_fix50030.test
      mysql-test/t/system_mysql_db_fix50117.test
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_data.sql
      scripts/mysql_system_tables_fix.sql
      sql/item.cc
      sql/mysqld.cc
      sql/rpl_handler.cc
      sql/sql_acl.cc
=== modified file 'mysql-test/r/errors.result'
--- a/mysql-test/r/errors.result	2010-11-04 08:36:04 +0000
+++ b/mysql-test/r/errors.result	2010-11-04 12:36:36 +0000
@@ -141,7 +141,7 @@ DROP TABLE t1;
 SELECT (CONVERT('0' USING latin1) IN (CHAR(COT('v') USING utf8),''));
 ERROR 22003: DOUBLE value is out of range in 'cot('v')'
 SET NAMES utf8 COLLATE utf8_latvian_ci ;
-SELECT UPDATEXML(-73 * -2465717823867977728,@@global.slave_net_timeout,null);
+SELECT UPDATEXML(-73 * -2465717823867977728,@@global.auto_increment_increment,null);
 ERROR 22003: BIGINT value is out of range in '(-(73) * -(2465717823867977728))'
 #
 # End Bug#57882

=== modified file 'mysql-test/t/errors.test'
--- a/mysql-test/t/errors.test	2010-11-04 08:36:04 +0000
+++ b/mysql-test/t/errors.test	2010-11-04 12:36:36 +0000
@@ -166,7 +166,7 @@ SELECT (CONVERT('0' USING latin1) IN (CH
 
 SET NAMES utf8 COLLATE utf8_latvian_ci ;
 --error ER_DATA_OUT_OF_RANGE
-SELECT UPDATEXML(-73 * -2465717823867977728,@@global.slave_net_timeout,null);
+SELECT UPDATEXML(-73 * -2465717823867977728,@@global.auto_increment_increment,null);
 
 --echo #
 --echo # End Bug#57882

No bundle (reason: useless for push emails).