From: Georgi Kodinov
Date: August 16 2010 7:12am
Subject: bzr push into mysql-5.5-merge branch (Georgi.Kodinov:3170 to 3171)
List-Archive: http://lists.mysql.com/commits/115751
Message-Id: <201008160713.o7G7D3E5021898@magare.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7440849016662673984=="

--===============7440849016662673984==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3171 Georgi Kodinov	2010-08-16 [merge]
      merge

    modified:
      mysql-test/r/func_time.result
      mysql-test/t/func_time.test
 3170 Alexander Nozdrin	2010-08-16 [merge]
      Auto-merge from mysql-5.5.

    removed:
      BUILD/compile-pentium-mysqlfs-debug
    added:
      mysql-test/include/mysql_upgrade_preparation.inc
      mysql-test/r/mysql_upgrade_ssl.result
      mysql-test/t/mysql_upgrade_ssl.test
    modified:
      BUILD/Makefile.am
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/check-cpu
      BUILD/compile-ndb-autotest
      BUILD/compile-pentium-debug
      BUILD/compile-pentium-debug-max
      BUILD/compile-pentium-debug-max-no-ndb
      BUILD/compile-pentium-debug-openssl
      BUILD/compile-pentium-debug-yassl
      BUILD/compile-pentium64-debug
      BUILD/compile-pentium64-debug-max
      CMakeLists.txt
      client/CMakeLists.txt
      client/mysql_upgrade.c
      cmake/configure.pl
      cmake/plugin.cmake
      cmd-line-utils/libedit/CMakeLists.txt
      cmd-line-utils/readline/CMakeLists.txt
      config/ac-macros/ha_ndbcluster.m4
      configure.in
      dbug/CMakeLists.txt
      extra/CMakeLists.txt
      extra/yassl/CMakeLists.txt
      extra/yassl/taocrypt/CMakeLists.txt
      include/CMakeLists.txt
      libmysql/CMakeLists.txt
      libmysqld/CMakeLists.txt
      libmysqld/examples/CMakeLists.txt
      libservices/CMakeLists.txt
      man/CMakeLists.txt
      mysql-test/CMakeLists.txt
      mysql-test/extra/rpl_tests/create_recursive_construct.inc
      mysql-test/lib/My/SafeProcess/CMakeLists.txt
      mysql-test/lib/v1/mysql-test-run.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/func_group.result
      mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/ndb/r/ndb_cursor.result
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
      mysql-test/suite/rpl_ndb/t/disabled.def
      mysql-test/t/func_group.test
      mysql-test/t/mysql_upgrade.test
      mysys/CMakeLists.txt
      plugin/audit_null/CMakeLists.txt
      plugin/audit_null/audit_null.c
      plugin/daemon_example/CMakeLists.txt
      plugin/fulltext/CMakeLists.txt
      plugin/semisync/CMakeLists.txt
      regex/CMakeLists.txt
      scripts/CMakeLists.txt
      scripts/mysql_config.sh
      sql-bench/CMakeLists.txt
      sql/CMakeLists.txt
      sql/examples/CMakeLists.txt
      sql/item.cc
      sql/log.cc
      sql/log_event.cc
      sql/share/CMakeLists.txt
      sql/sp_head.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      storage/archive/CMakeLists.txt
      storage/blackhole/CMakeLists.txt
      storage/csv/CMakeLists.txt
      storage/example/CMakeLists.txt
      storage/federated/CMakeLists.txt
      storage/heap/CMakeLists.txt
      storage/ibmdb2i/CMakeLists.txt
      storage/innobase/CMakeLists.txt
      storage/myisam/CMakeLists.txt
      storage/myisammrg/CMakeLists.txt
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_events_waits.cc
      storage/perfschema/pfs_events_waits.h
      storage/perfschema/table_events_waits.cc
      strings/CMakeLists.txt
      support-files/CMakeLists.txt
      tests/CMakeLists.txt
      unittest/examples/CMakeLists.txt
      unittest/mysys/CMakeLists.txt
      unittest/mytap/CMakeLists.txt
      vio/CMakeLists.txt
      zlib/CMakeLists.txt
=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2010-02-24 13:52:27 +0000
+++ b/mysql-test/r/func_time.result	2010-08-16 07:11:57 +0000
@@ -1305,4 +1305,12 @@ date_sub("0069-01-01 00:00:01",INTERVAL 
 select date_sub("0169-01-01 00:00:01",INTERVAL 2 SECOND);
 date_sub("0169-01-01 00:00:01",INTERVAL 2 SECOND)
 0168-12-31 23:59:59
+CREATE TABLE t1(a DOUBLE NOT NULL);
+INSERT INTO t1 VALUES (0),(9.216e-096);
+# should not crash
+SELECT 1 FROM t1 ORDER BY @x:=makedate(a,a);
+1
+1
+1
+DROP TABLE t1;
 End of 5.1 tests

=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2010-02-17 09:18:17 +0000
+++ b/mysql-test/t/func_time.test	2010-08-16 07:11:57 +0000
@@ -821,4 +821,15 @@ select date_sub("0069-01-01 00:00:01",IN
 select date_sub("0169-01-01 00:00:01",INTERVAL 2 SECOND);
 
 
+#
+# Bug #55565: debug assertion when ordering by expressions with user
+# variable assignments
+#
+
+CREATE TABLE t1(a DOUBLE NOT NULL);
+INSERT INTO t1 VALUES (0),(9.216e-096);
+--echo # should not crash
+SELECT 1 FROM t1 ORDER BY @x:=makedate(a,a);
+DROP TABLE t1;
+
 --echo End of 5.1 tests


--===============7440849016662673984==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/georgi.kodinov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: georgi.kodinov@stripped\
#   2d8tobgdbyv2wqqf
# target_branch: file:///home/kgeorge/mysql/work/B55565-5.5-merge/
# testament_sha1: 8b77c6f26cad4f2571e6ca98792d4b05d4c5c103
# timestamp: 2010-08-16 10:13:03 +0300
# source_branch: file:///home/kgeorge/mysql/work/B55565-5.1-bugteam/
# base_revision_id: alik@stripped
# 
# Begin bundle
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
sbvr896icND+hMc2K5g26nf2YMNG51r7+jGmHY69pr/qdVNSPSQXHLgs8Z5cenf70RSVtqxr8aOL
DCBdPuJUd7D1+WLee6qq7weDFsyZUrTtu87Nh2U8ryvJpWNbrl7n6DqGc3S5RONKV6xqibtzr5YV
2PNk+N/s0fLPHPk6Ork8fJ5uG9291XPq0u/palk8HHvdujJZvqz7f8rDrTKPDU1o+qVKk/0cJJOn
u8FfPQx3lLrmddCi7R7L/Jitn7s4liyJTGsvPc1WJMazBD0xfZoxUrHkFD7PDz9u1R397tb83g5a
Hp65LF61gY08i5czfHlm0o3e7gjY/gOA6Q29R40e1s+4uT6PmUUKKFvkfb1Y0UPm6ST1sod0kp/V
oihqFFYoV8C2QZHp8GM4uj4nnwXz5mVTM8nM9HF8VX3p7vMtrcRS2ZlrunkfOyOWFe+lJyLM205T
HDQeSTisUgalZU8jqllO9yf7Q41XPN2I2vcvO4TzmAmFJ7+sTdZrWU8zTIP1e7uYvPKbYNXHZsOX
Yk7vD3cjxW4SjnO3/u/WLfrIep2HZ9byzevPv75Dj7T7bTifM2nt8FzOer2iZ/Q23aLD5Aw+JweR
sOetzcRektfAscJCiWfOhrZzMboFA9PD21/jQulMbVJKykTYmax8O1mad9/Y8IJvo3plOM/yrPKK
f43k2Qom5qUXaKLXVRt3lefg4Fzc+S/UzRsWu81mtMcb1eBlSsrRekulXhpLLIm0XCXqWLYmFeuU
WJdmqWWtOMtkHG10NUwmUzQwoHTxzLU07Df9u2caLjnvPI2HNhgTD6n9jTJJw9Da28TyglllKJNE
osWXKWT6GjHXSZ3v5ySa4lXKQdcfW1OB1zq0eTk+4ukGH6MHWJtmWv0UFCeXgmWKPx34vntYGnfn
kyn0mlaZvc79/rR3bmwlhxNg7zFtfYnwyPLibHXr9i19xRp75rmnKST96kTU0tc9LXTfO7dJF8r9
CUnY+SqNyZSDBK8KOrndHN2vsp0x1suyfKQrNMoz85DsKpqM2vXWVaqfaztupRnZdbiY3XPN4r25
Nxe4NTrvlneb1vZSUomQuXtiSksHWcGycKQpz+lMJ94/Sooooooo3a3qn2lilG6KTpKBt3xOEhZE
+5JZfp6/92drOtK3f09eEWPCpUodGDsH6JmsF58wos+W6xoLXCi931sTuaO1NaVCi2VntSN/qxV0
729DieVLJq21frxaI/ImcTrTv/DJ7ls3qUpt01JY5FJ42yO9okPg5e1wvLP2vo7ims+Jd8jDi2p+
LXEzNxVJZCcq8DpPpa2Ys05kzKoKXeNNKW7G2dD0MUnyLHDzlxqO3Sn0J49hukO2bvxLpDs3m02n
zWat/3yFxWI5dKNirBVb0q7PpOnVOd5vPBPfUTtkMtBYWmjdspCz0MfI3KYG5YbuvmcCoXckU4UJ
Dnnvl0A=


--===============7440849016662673984==--