From: Tatjana Azundris Nuernberg
Date: May 12 2011 4:44am
Subject: bzr push into mysql-trunk branch (tatjana.nuernberg:3367)
List-Archive: http://lists.mysql.com/commits/137158
Message-Id: <201105120445.p4C4j2xB017532@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3367 Tatjana Azundris Nuernberg	2011-05-12 [merge]
      manual merge

    added:
      mysql-test/include/start_slave_io.inc
      mysql-test/include/start_slave_sql.inc
    modified:
      .bzrignore
      BUILD/SETUP.sh
      client/mysql.cc*
      client/mysqlbinlog.cc
      client/mysqltest.cc
      extra/replace.c
      include/mysql.h
      include/mysql.h.pp
      libmysql/libmysql.c
      mysql-test/collections/default.experimental
      mysql-test/extra/rpl_tests/check_type.inc
      mysql-test/include/wait_show_condition.inc
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/distinct.result
      mysql-test/r/explain.result
      mysql-test/r/innodb_mysql_lock.result
      mysql-test/r/metadata.result
      mysql-test/r/mysqlbinlog_base64.result
      mysql-test/r/mysqldump.result
      mysql-test/r/trigger.result
      mysql-test/r/type_ranges.result
      mysql-test/r/variables-big.result
      mysql-test/suite/binlog/t/binlog_bug23533.test
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/rpl/r/rpl_crash_safe_master.result
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
      mysql-test/suite/rpl/r/rpl_typeconv.result
      mysql-test/suite/rpl/t/rpl_crash_safe_master.test
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
      mysql-test/suite/rpl/t/rpl_typeconv.test
      mysql-test/t/distinct.test
      mysql-test/t/explain.test
      mysql-test/t/innodb_mysql_lock.test
      mysql-test/t/mysqlbinlog_base64.test
      mysql-test/t/mysqlbinlog_raw_mode.test
      mysql-test/t/mysqldump.test
      mysql-test/t/trigger.test
      mysql-test/t/variables-big.test
      scripts/make_win_bin_dist
      scripts/mysql_system_tables.sql
      sql/handler.h
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_row.cc
      sql/item_strfunc.cc
      sql/log_event.cc
      sql/my_decimal.cc
      sql/opt_range.cc
      sql/protocol.cc
      sql/rpl_slave.cc
      sql/sql_analyse.cc
      sql/sql_class.h
      sql/sql_lex.h
      sql/sql_partition.cc
      storage/archive/ha_archive.cc
      storage/ndb/src/kernel/blocks/lgman.cpp
      strings/decimal.c
      vio/viosocket.c
=== modified file 'mysql-test/r/type_newdecimal.result'
--- a/mysql-test/r/type_newdecimal.result	2011-05-05 06:55:53 +0000
+++ b/mysql-test/r/type_newdecimal.result	2011-05-12 04:28:33 +0000
@@ -1909,6 +1909,18 @@ mult	v_net_with_discount	v_total
 1.0000	27.18	27.180000
 DROP TABLE currencies, payments, sub_tasks;
 #
+# BUG#52171: distinct aggregates on unsigned decimal fields trigger assertions
+#
+CREATE TABLE t1 (a DECIMAL(4,4) UNSIGNED);
+INSERT INTO t1 VALUES (0);
+SELECT AVG(DISTINCT a) FROM t1;
+AVG(DISTINCT a)
+0.00000000
+SELECT SUM(DISTINCT a) FROM t1;
+SUM(DISTINCT a)
+0.0000
+DROP TABLE t1;
+#
 # Bug#55436: buffer overflow in debug binary of dbug_buff in
 #            Field_new_decimal::store_value
 #
@@ -1921,16 +1933,4 @@ SELECT f1 FROM t1;
 f1
 0.000000000000000000000000
 DROP TABLE IF EXISTS t1;
-#
-# BUG#52171: distinct aggregates on unsigned decimal fields trigger assertions
-#
-CREATE TABLE t1 (a DECIMAL(4,4) UNSIGNED);
-INSERT INTO t1 VALUES (0);
-SELECT AVG(DISTINCT a) FROM t1;
-AVG(DISTINCT a)
-0.00000000
-SELECT SUM(DISTINCT a) FROM t1;
-SUM(DISTINCT a)
-0.0000
-DROP TABLE t1;
 End of 5.1 tests

=== modified file 'mysql-test/t/type_newdecimal.test'
--- a/mysql-test/t/type_newdecimal.test	2011-05-05 06:40:33 +0000
+++ b/mysql-test/t/type_newdecimal.test	2011-05-12 04:28:33 +0000
@@ -1510,6 +1510,16 @@ group by PAY.id + 1;
 DROP TABLE currencies, payments, sub_tasks;
 
 --echo #
+--echo # BUG#52171: distinct aggregates on unsigned decimal fields trigger assertions
+--echo #
+
+CREATE TABLE t1 (a DECIMAL(4,4) UNSIGNED);
+INSERT INTO t1 VALUES (0);
+SELECT AVG(DISTINCT a) FROM t1;
+SELECT SUM(DISTINCT a) FROM t1;
+DROP TABLE t1;
+
+--echo #
 --echo # Bug#55436: buffer overflow in debug binary of dbug_buff in
 --echo #            Field_new_decimal::store_value
 --echo #
@@ -1522,14 +1532,6 @@ INSERT INTO t1 SET f1 = -64878E-85;
 SELECT f1 FROM t1;
 DROP TABLE IF EXISTS t1;
 
---echo #
---echo # BUG#52171: distinct aggregates on unsigned decimal fields trigger assertions
---echo #
 
-CREATE TABLE t1 (a DECIMAL(4,4) UNSIGNED);
-INSERT INTO t1 VALUES (0);
-SELECT AVG(DISTINCT a) FROM t1;
-SELECT SUM(DISTINCT a) FROM t1;
-DROP TABLE t1;
 
 --echo End of 5.1 tests

No bundle (reason: useless for push emails).