• vasil's avatar
    branches/zip: Merge r6125:6152 from branches/5.1: · 59277a50
    vasil authored
    (everything except the last white-space change was skipped as it is already
    in branches/zip)
    
      ------------------------------------------------------------------------
      r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
      Changed paths:
         M /branches/5.1/Makefile.am
         M /branches/5.1/mysql-test/innodb-autoinc.result
         M /branches/5.1/mysql-test/innodb-autoinc.test
      
      branches/5.1:
      
      Backport c6121 from branches/zip:
      
        ------------------------------------------------------------------------
        r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
        Changed paths:
           M /branches/zip/mysql-test/innodb-autoinc.result
        
        branches/zip: This test has been problematic for sometime now. The underlying
        bug is that the data dictionaries get out of sync. In the AUTOINC code we
        try and apply salve to the symptoms. In the past MySQL made some unrelated
        change and the dictionaries stopped getting out of sync and this test started
        to fail. Now, it seems they have reverted that changed and the test is
        passing again. I suspect this is not he last time that this test will change.
        
        ------------------------------------------------------------------------
      
      ------------------------------------------------------------------------
      r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
      Changed paths:
         M /branches/5.1/Makefile.am
      
      branches/5.1:
      
      Revert a change to Makefile.am that sneaked unnoticed in c6127.
      
      ------------------------------------------------------------------------
      r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
         M /branches/5.1/include/ha_prototypes.h
         M /branches/5.1/ut/ut0ut.c
      
      branches/5.1: Port r6134 from branches/zip:
      
        ------------------------------------------------------------------------
        r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
      
        branches/zip: innobase_convert_identifier(): Convert table names with
        explain_filename() to address Bug #32430: 'show innodb status'
        causes errors Invalid (old?) table or database name in logs.
      
        rb://134 approved by Sunny Bains
        ------------------------------------------------------------------------
      
      innobase_print_identifier(): Replace with innobase_convert_name().
      
      innobase_convert_identifier(): New function, called by innobase_convert_name().
      ------------------------------------------------------------------------
      r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
      Changed paths:
         M /branches/5.1/CMakeLists.txt
      
      branches/5.1:
      
      Followup to r5700: Adjust the changes so they are the same as in the BZR
      repository.
      
      ------------------------------------------------------------------------
      r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
      
      branches/5.1:
      
      Merge a part of r2911.5.5 from MySQL:
      (the other part of this was merged in c5700)
      
        ------------------------------------------------------------
        revno: 2911.5.5
        committer: Vladislav Vaintroub <vvaintroub@mysql.com>
        branch nick: 5.1-innodb_plugin
        timestamp: Wed 2009-06-10 10:59:49 +0200
        message:
          Backport WL#3653 to 5.1 to enable bundled innodb plugin.
          Remove custom DLL loader code from innodb plugin code, use 
          symbols exported from mysqld.
        removed:
          storage/innodb_plugin/handler/handler0vars.h
          storage/innodb_plugin/handler/win_delay_loader.cc
        added:
          storage/mysql_storage_engine.cmake
          win/create_def_file.js
        modified:
          CMakeLists.txt
          include/m_ctype.h
          include/my_global.h
          include/my_sys.h
          include/mysql/plugin.h
          libmysqld/CMakeLists.txt
          mysql-test/mysql-test-run.pl
          mysql-test/t/plugin.test
          mysql-test/t/plugin_load-master.opt
          mysys/charset.c
          sql/CMakeLists.txt
          sql/handler.h
          sql/mysql_priv.h
          sql/mysqld.cc
          sql/sql_class.cc
          sql/sql_class.h
          sql/sql_list.h
          sql/sql_profile.h
          storage/Makefile.am
          storage/archive/CMakeLists.txt
          storage/blackhole/CMakeLists.txt
          storage/csv/CMakeLists.txt
          storage/example/CMakeLists.txt
          storage/federated/CMakeLists.txt
          storage/heap/CMakeLists.txt
          storage/innobase/CMakeLists.txt
          storage/innobase/handler/ha_innodb.cc
          storage/innodb_plugin/CMakeLists.txt
          storage/innodb_plugin/handler/ha_innodb.cc
          storage/innodb_plugin/handler/handler0alter.cc
          storage/innodb_plugin/handler/i_s.cc
          storage/innodb_plugin/plug.in
          storage/myisam/CMakeLists.txt
          storage/myisammrg/CMakeLists.txt
          win/Makefile.am
          win/configure.js
      
      ------------------------------------------------------------------------
      r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
      
      branches/5.1:
      
      White space fixup.
      
      ------------------------------------------------------------------------
    59277a50
ha_innodb.cc 295 KB