1. 11 Nov, 2009 1 commit
    • calvin's avatar
      branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995' · 9ca18bed
      calvin authored
      after several selects on a large DB
      
      During stress environment, Windows AIO may fail with error code
      ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
      crashes. The cause of the error is unknown, but likely due to
      faulty hardware or driver.
      
      This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
      which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
      is detected during AIO, the InnoDB will issue a synchronous retry
      (read/write).
      
      This patch has been extensively tested by MySQL support.
      
      Approved by: Marko
      rb://196
      9ca18bed
  2. 10 Nov, 2009 1 commit
  3. 09 Nov, 2009 2 commits
    • vasil's avatar
      branches/5.1: · 2c140ed3
      vasil authored
      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
      2c140ed3
    • vasil's avatar
      branches/5.1: · b8a2d8f2
      vasil authored
      Followup to r5700: Adjust the changes so they are the same as in the BZR
      repository.
      b8a2d8f2
  4. 04 Nov, 2009 1 commit
    • marko's avatar
      branches/5.1: Port r6134 from branches/zip: · 8b637965
      marko authored
        ------------------------------------------------------------------------
        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().
      8b637965
  5. 30 Oct, 2009 5 commits
    • vasil's avatar
      branches/5.1: · 69ac160b
      vasil authored
      Revert a change to Makefile.am that sneaked unnoticed in c6127.
      69ac160b
    • vasil's avatar
      branches/5.1: · b3bfd1d1
      vasil authored
      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.
        
        ------------------------------------------------------------------------
      b3bfd1d1
    • vasil's avatar
      branches/5.1: · 4184240b
      vasil authored
      White-space fixup.
      4184240b
    • jyang's avatar
      branches/5.1: In os_mem_alloc_large(), if we fail to attach · 693296b5
      jyang authored
      the shared memory, reset memory pointer ptr to NULL, and
      allocate memory from conventional pool. This is a port
      from branches/zip.
      Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
      rb://198  Approved by: Marko
      693296b5
    • jyang's avatar
      branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN · a0369766
      jyang authored
      for push_warning_printf() call in innodb.
      Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
      
      rb://170 approved by Marko.
      a0369766
  6. 14 Oct, 2009 1 commit
  7. 12 Oct, 2009 3 commits
  8. 07 Oct, 2009 1 commit
  9. 01 Oct, 2009 1 commit
    • vasil's avatar
      branches/5.1: · ece195f7
      vasil authored
      Fix Bug#38996 Race condition in ANALYZE TABLE
      
      by serializing ANALYZE TABLE inside InnoDB.
      
      Approved by:	Heikki (rb://175)
      ece195f7
  10. 22 Sep, 2009 1 commit
  11. 14 Sep, 2009 1 commit
  12. 10 Sep, 2009 2 commits
    • jyang's avatar
      branches/5.1: Block creating table with column name conflicting · 5224d8a7
      jyang authored
      with Innodb reserved key words. (Bug #44369) rb://151 approved
      by Sunny Bains.
      5224d8a7
    • vasil's avatar
      branches/5.1: · 2fb3a5a7
      vasil authored
      Fix a compilation warning caused by c5799:
      
      handler/ha_innodb.cc: In function 'void innobase_get_cset_width(ulint, ulint*, ulint*)':
      handler/ha_innodb.cc:830: warning: format '%d' expects type 'int', but argument 2 has type 'ulint'
      2fb3a5a7
  13. 09 Sep, 2009 2 commits
    • calvin's avatar
      branches/5.1: fix bug#46256 · d6784c3d
      calvin authored
      Allow tables to be dropped even if the collation is not found,
      but issue a warning.
      
      Could not find an easy way to add mysql-test since it requires
      changes to charsets and restarting the server. Tests were
      executed manually.
      
      Approved by: Heikki (on IM)
      d6784c3d
    • calvin's avatar
      branches/5.1: merge change from 5.1.38 · 180ed3e4
      calvin authored
      HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.
      180ed3e4
  14. 04 Sep, 2009 2 commits
  15. 03 Sep, 2009 2 commits
  16. 26 Aug, 2009 1 commit
    • calvin's avatar
      branches/5.1: · 06db0143
      calvin authored
      Merge PART OF r2911.5.5 from MySQL:
      
      adjust CMakeLists.txt to work with MySQL 5.1.38
      and beyond.
      
      MySQL changed how the build works on Windows starting from 5.1.38.
      All shared properties are defined in mysql_storage_engine.cmake.
      And the top level CMakeLists.txt determines what engines to build
      and how (static vs. dynamic).
      
      log message from BZR:
      
        ------------------------------------------------------------
        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
      06db0143
  17. 03 Aug, 2009 1 commit
    • vasil's avatar
      branches/5.1: · 69362950
      vasil authored
      Merge a change from MySQL:
      
        ------------------------------------------------------------
        revno: 2988
        committer: Satya B <satya.bn@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Wed 2009-07-01 11:06:05 +0530
        message:
          Fix build failure after applying Innodb snapshot 5.1-ss5282
          
          After applying Innodb snapshot 5.1-ss5282, build was broken
          because of missing header file. 
          
          Adding the header file to Makefile.am after informing the 
          innodb developers.
        modified:
          storage/innobase/Makefile.am
      69362950
  18. 20 Jul, 2009 1 commit
    • vasil's avatar
      branches/5.1: · 03906dfb
      vasil authored
      Merge a change from MySQL:
      
        ------------------------------------------------------------
        revno: 2874.2.1
        committer: Anurag Shekhar <anurag.shekhar@sun.com>
        branch nick: mysql-5.1-bugteam-windows-warning
        timestamp: Wed 2009-05-13 15:41:24 +0530
        message:
          Bug #39802 On Windows, 32-bit time_t should be enforced
          
          This patch fixes compilation warning, "conversion from 'time_t' to 'ulong', 
          possible loss of data". 
          The fix is to typecast time_t to ulong before assigning it to ulong. 
          Backported this from 6.0-bugteam tree.
        modified:
          storage/archive/ha_archive.cc
          storage/federated/ha_federated.cc
          storage/innobase/handler/ha_innodb.cc
          storage/myisam/ha_myisam.cc
      03906dfb
  19. 09 Jul, 2009 1 commit
    • vasil's avatar
      branches/5.1: · 6fab83e1
      vasil authored
      Fix Bug#21704 Renaming column does not update FK definition
      
      by checking whether a column that participates in a FK definition is being
      renamed and denying the ALTER in this case.
      
      The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
      http://lists.mysql.com/commits/77714
      and was later adjusted to conform to InnoDB coding style by me (Vasil),
      I also added some more comments and moved the bug specific mysql-test to
      a separate file to make it more manageable and flexible.
      6fab83e1
  20. 02 Jul, 2009 1 commit
    • vasil's avatar
      branches/5.1: · fec0e9f7
      vasil authored
      Adjust the failing innodb-autoinc test to conform to the latest behavior
      of the MySQL code. The idea and the comment in innodb-autoinc.test come
      from Sunny.
      fec0e9f7
  21. 30 Jun, 2009 1 commit
  22. 25 Jun, 2009 1 commit
    • marko's avatar
      branches/5.1: Merge r5418 from branches/zip: · 274dd549
      marko authored
        ------------------------------------------------------------------------
        r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
        Changed paths:
           M /branches/zip/ChangeLog
           M /branches/zip/handler/ha_innodb.cc
           M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
           M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
           M /branches/zip/mysql-test/innodb_bug42101.result
           M /branches/zip/mysql-test/innodb_bug42101.test
        
        branches/zip: Fix a race condition caused by
        SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
        When innodb_commit_concurrency is initially set nonzero,
        DEFAULT would change it back to 0, triggering Bug #42101.
        rb://139 approved by Heikki Tuuri.
        ------------------------------------------------------------------------
      274dd549
  23. 24 Jun, 2009 1 commit
  24. 17 Jun, 2009 2 commits
  25. 05 Jun, 2009 1 commit
    • vasil's avatar
      branches/5.1: · 13738529
      vasil authored
      Remove the word "Error" from the printout because the mysqltest suite
      interprets it as an error and thus the innodb-autoinc test fails.
      
      Approved by:	Sunny (via IM)
      13738529
  26. 04 Jun, 2009 1 commit
  27. 03 Jun, 2009 2 commits
    • sunny's avatar
      branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before · 992a74f4
      sunny authored
      the bug fix we would assert on missing autoinc columns. With this fix we allow
      MySQL to open the table but set the next autoinc value for the column to the
      MAX value. This effectively disables the next value generation. INSERTs will
      fail with a generic AUTOINC failure. However, the user should be able to
      read/dump the table, set the column values explicitly, use ALTER TABLE to
      set the next autoinc value and/or sync the two data dictionaries to resume
      normal operations.
      
      Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
      index (PRIMARY)
      
      rb://118
      992a74f4
    • marko's avatar
      branches/5.1: Merge the test case from r5232 from branches/5.0: · 1a9e35d4
      marko authored
        ------------------------------------------------------------------------
        r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
      
        branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
        (Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
      
        Also, add a test case for Bug #40565.
      
        rb://128 approved by Heikki Tuuri
        ------------------------------------------------------------------------
      1a9e35d4