bzr push into mysql-trunk-innodb branch (Sunny.Bains:3586 to 3587)

[Sunny Bains]

 3587 Sunny Bains	2011-04-15
      Fix test that should have been fixed as part of Bug 12348462 fix.

    modified:
      mysql-test/suite/sys_vars/r/all_vars.result
 3586 Jimmy Yang	2011-04-14
      In dict_load_table(), the assertion about table cannot be corrupted
      did not consider the posibility of the dict_table_t is not loaded
      at all, in which case the "table" variable could be NULL. Add the
      NULL check in the assertion.
      
      Approved by Marko

    modified:
      storage/innobase/dict/dict0load.c
=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	revid:jimmy.yang@stripped
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	revid:sunny.bains@stripped
@@ -23,6 +23,7 @@ INNODB_PRINT_ALL_DEADLOCKS
 INNODB_MONITOR_RESET_ALL
 INNODB_STATS_METHOD
 LOG_BIN_INDEX
+INNODB_SYNC_ARRAY_SIZE
 INNODB_MONITOR_DISABLE
 INNODB_FILE_FORMAT_MAX
 INNODB_MONITOR_ENABLE
@@ -37,6 +38,7 @@ INNODB_PRINT_ALL_DEADLOCKS
 INNODB_MONITOR_RESET_ALL
 INNODB_STATS_METHOD
 LOG_BIN_INDEX
+INNODB_SYNC_ARRAY_SIZE
 INNODB_MONITOR_DISABLE
 INNODB_FILE_FORMAT_MAX
 INNODB_MONITOR_ENABLE


Attachment: [text/bzr-bundle] bzr/[e-mail]