List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:February 1 2012 9:08am
Subject:bzr push into mysql-trunk branch (tor.didriksen:3814 to 3817)
View as plain text  
 3817 Tor Didriksen	2012-02-01
      All the subquery_sj_xxx tests can get thread stack overrun on solaris

    modified:
      mysql-test/collections/default.experimental
 3816 Tor Didriksen	2012-02-01
      re-enable test for Bug#13536661, but not for embedded

    modified:
      mysql-test/r/optimizer_debug_sync.result
      mysql-test/t/optimizer_debug_sync.test
 3815 Tor Didriksen	2012-02-01
      WL#6159 post-push fix: adding a new directory was not such a good idea

    removed:
      include/byteorder/
    renamed:
      include/byteorder/big_endian.h => include/big_endian.h
      include/byteorder/byte_order_generic.h => include/byte_order_generic.h
      include/byteorder/byte_order_generic_x86.h => include/byte_order_generic_x86.h
      include/byteorder/byte_order_generic_x86_64.h => include/byte_order_generic_x86_64.h
      include/byteorder/little_endian.h => include/little_endian.h
    modified:
      include/CMakeLists.txt
      include/my_byteorder.h
 3814 Hemant Kumar	2012-02-01
      Added engine independent tests to default.daily collection.

    modified:
      mysql-test/collections/default.daily
=== modified file 'include/CMakeLists.txt'
--- a/include/CMakeLists.txt	2012-01-11 09:33:52 +0000
+++ b/include/CMakeLists.txt	2012-02-01 08:31:03 +0000
@@ -56,10 +56,11 @@ SET(HEADERS 
   my_compiler.h
   mysql_com_server.h
   my_byteorder.h
-  byteorder/byte_order_generic_x86.h
-  byteorder/little_endian.h
-  byteorder/byte_order_generic.h
-  byteorder/big_endian.h
+  byte_order_generic.h
+  byte_order_generic_x86.h
+  byte_order_generic_x86_64.h
+  little_endian.h
+  big_endian.h
   ${HEADERS_GEN_CONFIGURE}
 )
 

=== renamed file 'include/byteorder/big_endian.h' => 'include/big_endian.h'
=== renamed file 'include/byteorder/byte_order_generic.h' => 'include/byte_order_generic.h'
=== renamed file 'include/byteorder/byte_order_generic_x86.h' => 'include/byte_order_generic_x86.h'
=== renamed file 'include/byteorder/byte_order_generic_x86_64.h' => 'include/byte_order_generic_x86_64.h'
=== removed directory 'include/byteorder'
=== renamed file 'include/byteorder/little_endian.h' => 'include/little_endian.h'
=== modified file 'include/my_byteorder.h'
--- a/include/my_byteorder.h	2012-01-11 09:33:52 +0000
+++ b/include/my_byteorder.h	2012-02-01 08:31:03 +0000
@@ -33,11 +33,11 @@
 */
 #if defined(__i386__) || defined(_WIN32)
 #define MY_BYTE_ORDER_ARCH_OPTIMIZED
-#include "byteorder/byte_order_generic_x86.h"
+#include "byte_order_generic_x86.h"
 #elif defined(__x86_64__)
-#include "byteorder/byte_order_generic_x86_64.h"
+#include "byte_order_generic_x86_64.h"
 #else
-#include "byteorder/byte_order_generic.h"
+#include "byte_order_generic.h"
 #endif
 
 /*
@@ -46,9 +46,9 @@
   a register) and M a pointer to byte.
 */
 #ifdef WORDS_BIGENDIAN
-#include "byteorder/big_endian.h"
+#include "big_endian.h"
 #else
-#include "byteorder/little_endian.h"
+#include "little_endian.h"
 #endif
 
 #endif /* MY_BYTEORDER_INCLUDED */

=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2012-01-12 13:22:52 +0000
+++ b/mysql-test/collections/default.experimental	2012-02-01 08:59:14 +0000
@@ -9,10 +9,39 @@ main.func_math @freebsd                 
 main.mysqlslap @windows                  # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 main.signal_demo3 @solaris               # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.sp @solaris                         # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-main.subquery_sj_none @solaris           # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-main.subquery_sj_none_bka @solaris       # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrunbzr rename 
-main.subquery_sj_none_bkaunique @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-main.subquery_sj_none_bka_nixbnl @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_all_bka_nixbnl @solaris
+main.subquery_sj_all_bka @solaris
+main.subquery_sj_all_bkaunique @solaris
+main.subquery_sj_all @solaris
+main.subquery_sj_dupsweed_bka_nixbnl @solaris
+main.subquery_sj_dupsweed_bka @solaris
+main.subquery_sj_dupsweed_bkaunique @solaris
+main.subquery_sj_dupsweed @solaris
+main.subquery_sj_firstmatch_bka_nixbnl @solaris
+main.subquery_sj_firstmatch_bka @solaris
+main.subquery_sj_firstmatch_bkaunique @solaris
+main.subquery_sj_firstmatch @solaris
+main.subquery_sj_innodb_all_bka_nixbnl @solaris
+main.subquery_sj_innodb_all_bka @solaris
+main.subquery_sj_innodb_all_bkaunique @solaris
+main.subquery_sj_innodb_all @solaris
+main.subquery_sj_innodb_none_bka_nixbnl @solaris
+main.subquery_sj_innodb_none_bka @solaris
+main.subquery_sj_innodb_none_bkaunique @solaris
+main.subquery_sj_innodb_none @solaris
+main.subquery_sj_loosescan_bka_nixbnl @solaris
+main.subquery_sj_loosescan_bka @solaris
+main.subquery_sj_loosescan_bkaunique @solaris
+main.subquery_sj_loosescan @solaris
+main.subquery_sj_mat_bka_nixbnl @solaris
+main.subquery_sj_mat_bka @solaris
+main.subquery_sj_mat_bkaunique @solaris
+main.subquery_sj_mat_nosj @solaris
+main.subquery_sj_mat @solaris
+main.subquery_sj_none_bka_nixbnl @solaris
+main.subquery_sj_none_bka @solaris
+main.subquery_sj_none_bkaunique @solaris
+main.subquery_sj_none @solaris
 main.kill @freebsd                       # Bug#12619719 2011-08-04 Occasional failure in PB2
 
 innodb.innodb_monitor                    # Bug#12320827 2011-08-04 Occasional failure in PB2

=== modified file 'mysql-test/r/optimizer_debug_sync.result'
--- a/mysql-test/r/optimizer_debug_sync.result	2012-01-31 06:42:46 +0000
+++ b/mysql-test/r/optimizer_debug_sync.result	2012-02-01 08:32:05 +0000
@@ -21,3 +21,21 @@ MAX(i)
 MAX(i)
 2
 DROP TABLE t;
+# End of BUG#56080
+#
+# Bug #13536661: VALGRIND: DEFINITELY LOST: 552 BYTES IN 1 BLOCKS IN
+# CREATE_TMP_TABLE AND HIGHER
+#
+CREATE TABLE t1 ( a INT, b INT );
+INSERT INTO t1 VALUES (4, 40), (1, 10), (2, 20), (2, 20), (3, 30);
+SET debug_sync = "tmp_table_created SIGNAL parked WAIT_FOR go";
+# This should not leak memory.
+SELECT b, COUNT(DISTINCT b) FROM t1 GROUP BY b ORDER BY -b;
+SET debug_sync = "now WAIT_FOR parked";
+# Set locally to shadow the global variable.
+SET debug = '';
+SET GLOBAL debug = '+d,simulate_out_of_memory';
+SET debug_sync = "now SIGNAL go";
+ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+SET GLOBAL debug = '';
+DROP TABLE t1;

=== modified file 'mysql-test/t/optimizer_debug_sync.test'
--- a/mysql-test/t/optimizer_debug_sync.test	2012-01-31 06:42:46 +0000
+++ b/mysql-test/t/optimizer_debug_sync.test	2012-02-01 08:32:05 +0000
@@ -4,6 +4,7 @@
 --source include/have_debug_sync.inc
 --source include/have_innodb.inc
 --source include/have_materialization.inc
+--source include/not_embedded.inc
 
 --echo
 --echo BUG#11763382 Assertion 'inited==INDEX' on SELECT MAX(...)
@@ -54,9 +55,12 @@ SET DEBUG_SYNC='RESET';
 --connection con3
 --reap
 
+--connection default
 DROP TABLE t;
+--disconnect con1
+--disconnect con2
+--disconnect con3
 
---exit
 
 --echo # End of BUG#56080
 --echo #

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3814 to 3817) Tor Didriksen1 Feb