bzr push into mysql-trunk branch (vasil.dimov:3398 to 3401) Bug#11765460

[vasil.dimov]

 3401 Vasil Dimov	2011-08-24
      Deploy a crash that will only trigger when running in MTR or PB2 in order
      to track down Bug #11765460 58432: INNODB.INNODB_BUG56143 FAILS IN PB2

    modified:
      mysql-test/collections/default.experimental
      storage/innobase/sync/sync0arr.c
 3400 Vasil Dimov	2011-08-23
      Fix unnecessary loop in non-debug builds
      
      Spotted by:	Sunny

    modified:
      storage/innobase/dict/dict0stats.c
 3399 Vasil Dimov	2011-08-22
      Fix deprecation messages for innodb_additional_mem_pool_size
      and innodb_use_sys_malloc - mention innodb_use_sys_malloc in the
      message for innodb_additional_mem_pool_size, not the other way around.

    modified:
      storage/innobase/handler/ha_innodb.cc
 3398 Georgi Kodinov	2011-08-23
      Addendum fix for bug #11747191: 31224: SUPPORT FOR SSL CERTIFICATE REVOCATION LISTS
      
      Test case and result changes:
      - Added basic ssl_crl and ssl_crlpath tests to the sys_vars testsuite to keep the check happy.
      - Added the two columns to the embedded I_S test result

    added:
      mysql-test/suite/sys_vars/r/ssl_crl_basic.result
      mysql-test/suite/sys_vars/r/ssl_crlpath_basic.result
      mysql-test/suite/sys_vars/t/ssl_crl_basic.test
      mysql-test/suite/sys_vars/t/ssl_crlpath_basic.test
    modified:
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	revid:georgi.kodinov@stripped
+++ b/mysql-test/collections/default.experimental	revid:vasil.dimov@stripped
@@ -21,7 +21,6 @@ main.innodb_mrr_cost_icp                
 main.innodb_mrr                          # Bug#12682554 2011-08-17 Occasional failure in PB2
 
 innodb.innodb_monitor                    # Bug#12320827 2011-08-04 Occasional failure in PB2
-innodb.innodb_bug56143 @solaris          # Bug#11765460 2011-08-04 Occasional failure in PB2
 
 rpl.rpl_change_master_dbug               # BUG#11933491 2011-06-13 Anitha  Test fails on redhat 
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb

=== modified file 'storage/innobase/dict/dict0stats.c'
--- a/storage/innobase/dict/dict0stats.c	revid:georgi.kodinov@stripped
+++ b/storage/innobase/dict/dict0stats.c	revid:vasil.dimov@stripped
@@ -598,6 +598,7 @@ dict_stats_analyze_index_level(
 	/* now in n_diff_boundaries[i] there are exactly n_diff[i] integers,
 	for i=1..n_uniq */
 
+#ifdef UNIV_STATS_DEBUG
 	for (i = 1; i <= n_uniq; i++) {
 
 		DEBUG_PRINTF("    %s(): total recs: %llu, total pages: %llu, "
@@ -605,7 +606,6 @@ dict_stats_analyze_index_level(
 			     __func__, *total_recs, *total_pages,
 			     i, n_diff[i]);
 
-#if 0
 		if (n_diff_boundaries != NULL) {
 			ib_int64_t	j;
 
@@ -621,8 +621,8 @@ dict_stats_analyze_index_level(
 			}
 			printf("\n");
 		}
-#endif
 	}
+#endif /* UNIV_STATS_DEBUG */
 
 	btr_pcur_close(&pcur);
 

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:georgi.kodinov@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:vasil.dimov@stripped
@@ -2713,7 +2713,8 @@ innobase_change_buffering_inited_ok:
 			" InnoDB: Warning: Using " 
 			"innodb_additional_mem_pool_size is DEPRECATED. "
 			"This option may be removed in future releases, "
-			"together with the InnoDB's internal memory "
+			"together with the option innodb_use_sys_malloc "
+			"and with the InnoDB's internal memory "
 			"allocator.\n");
 	}
 
@@ -2723,8 +2724,7 @@ innobase_change_buffering_inited_ok:
 			" InnoDB: Warning: Setting " 
 			"innodb_use_sys_malloc to FALSE is DEPRECATED. "
 			"This option may be removed in future releases, "
-			"together with the option innodb_use_sys_malloc "
-			"and with the InnoDB's internal memory "
+			"together with the InnoDB's internal memory "
 			"allocator.\n");
 	}
 

=== modified file 'storage/innobase/sync/sync0arr.c'
--- a/storage/innobase/sync/sync0arr.c	revid:georgi.kodinov@stripped
+++ b/storage/innobase/sync/sync0arr.c	revid:vasil.dimov@stripped
@@ -936,6 +936,15 @@ sync_array_print_long_waits_low(
 			      stderr);
 			sync_array_cell_print(stderr, cell);
 			*noticed = TRUE;
+
+			/* Temporarily crash the server if we get here
+			in order to track down
+			Bug #11765460 58432: INNODB.INNODB_BUG56143
+			FAILS IN PB2 */
+			if (getenv("PB2WORKDIR") != NULL
+			    || getenv("MTR_BUILD_THREAD") != NULL) {
+				ut_error;
+			}
 		}
 
 		if (diff > fatal_timeout) {

No bundle (reason: useless for push emails).