~drizzle-trunk/drizzle/development

Viewing all changes in revision 1819.5.129.

[patch 129/129] Merge patch for revision 1947 from InnoDB SVN:
revno: 1947
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6252
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6248
committer: marko
timestamp: Mon 2009-11-30 10:50:11 +0000
message:
  branches/zip: Suppress errors about non-found temporary tables.
  Write the is_temp flag to SYS_TABLES.MIX_LEN.
  
  dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
  Unlike other flags, this will not be written to the tablespace flags
  or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
  
  dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
  
  dict_check_tablespaces_and_store_max_id(), dict_load_table():
  Suppress errors about temporary tables not being found.
  
  dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
  to SYS_TABLES.MIX_LEN.
  
  fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
  about space->flags.
  
  row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
  
  rb://160 approved by Heikki Tuuri.  This addresses the second part of
  Bug #41609 Crash recovery does not work for InnoDB temporary tables.
modified:
  ChangeLog                      2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
  dict/dict0boot.c               2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0boot.c
  dict/dict0crea.c               2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0crea.c
  dict/dict0load.c               2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0load.c
  dict/dict0mem.c                2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0mem.c
  fil/fil0fil.c                  2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Ffil%2Ffil0fil.c
  handler/ha_innodb.cc           2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
  include/dict0mem.h             2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0mem.h
  row/row0mysql.c                2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0mysql.c
diff:
=== modified file 'ChangeLog'

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: