[patch 095/129] Merge patch for revision 1898 from InnoDB SVN:
revno: 1898
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6099
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6096
committer: jyang
timestamp: Thu 2009-10-22 01:58:39 +0000
message:
  branches/zip: Port bug #46000 related changes from 5.1 to zip
  branch. Due to different code path for creating index in zip
  branch comparing to 5.1), the index reserved name check function
  is extended to be used in ha_innobase::add_index(). 
  rb://190  Approved by: Marko
modified:
  handler/ha_innodb.cc           2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
  handler/ha_innodb.h            2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.h
  handler/handler0alter.cc       1845@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fhandler%2Fhandler0alter.cc
  mysql-test/innodb_bug46000.result 5916@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46000.result
  mysql-test/innodb_bug46000.test 5916@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46000.test
diff:
=== modified file 'handler/ha_innodb.cc'