1. 25 Nov, 2009 3 commits
  2. 24 Nov, 2009 1 commit
  3. 20 Nov, 2009 2 commits
  4. 19 Nov, 2009 2 commits
  5. 18 Nov, 2009 2 commits
  6. 11 Nov, 2009 2 commits
    • vasil's avatar
      branches/5.1: · 5c016fa5
      vasil authored
      Merge a change from MySQL:
      (this has been reviewed by Calvin and Marko, and Calvin says Luis has
      incorporated Marko's suggestions)
      
        ------------------------------------------------------------
        revno: 3092.5.1
        committer: Luis Soares <luis.soares@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Thu 2009-09-24 15:52:52 +0100
        message:
          BUG#42829: binlogging enabled for all schemas regardless of
          binlog-db-db / binlog-ignore-db
                
          InnoDB will return an error if statement based replication is used
          along with transaction isolation level READ-COMMITTED (or weaker),
          even if the statement in question is filtered out according to the
          binlog-do-db rules set. In this case, an error should not be printed.
                
          This patch addresses this issue by extending the existing check in
          external_lock to take into account the filter rules before deciding to
          print an error. Furthermore, it also changes decide_logging_format to
          take into consideration whether the statement is filtered out from 
          binlog before decision is made.
        added:
          mysql-test/suite/binlog/r/binlog_stm_do_db.result
          mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
          mysql-test/suite/binlog/t/binlog_stm_do_db.test
        modified:
          sql/sql_base.cc
          sql/sql_class.cc
          storage/innobase/handler/ha_innodb.cc
          storage/innobase/handler/ha_innodb.h
          storage/innodb_plugin/handler/ha_innodb.cc
          storage/innodb_plugin/handler/ha_innodb.h
      5c016fa5
    • calvin's avatar
      branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995' · 7451508d
      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
      7451508d
  7. 10 Nov, 2009 1 commit
  8. 09 Nov, 2009 2 commits
    • vasil's avatar
      branches/5.1: · 1a94ff5f
      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
      1a94ff5f
    • vasil's avatar
      branches/5.1: · ed1e80b3
      vasil authored
      Followup to r5700: Adjust the changes so they are the same as in the BZR
      repository.
      ed1e80b3
  9. 04 Nov, 2009 1 commit
    • marko's avatar
      branches/5.1: Port r6134 from branches/zip: · 19dc01be
      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().
      19dc01be
  10. 30 Oct, 2009 5 commits
    • vasil's avatar
      branches/5.1: · ce0b6eaa
      vasil authored
      Revert a change to Makefile.am that sneaked unnoticed in c6127.
      ce0b6eaa
    • vasil's avatar
      branches/5.1: · d8accf91
      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.
        
        ------------------------------------------------------------------------
      d8accf91
    • vasil's avatar
      branches/5.1: · 6c6ec327
      vasil authored
      White-space fixup.
      6c6ec327
    • jyang's avatar
      branches/5.1: In os_mem_alloc_large(), if we fail to attach · e5e22b37
      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
      
      e5e22b37
    • jyang's avatar
      branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN · f20acaf8
      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.
      
      f20acaf8
  11. 14 Oct, 2009 1 commit
  12. 12 Oct, 2009 3 commits
  13. 07 Oct, 2009 1 commit
  14. 01 Oct, 2009 1 commit
    • vasil's avatar
      branches/5.1: · 4d29c792
      vasil authored
      Fix Bug#38996 Race condition in ANALYZE TABLE
      
      by serializing ANALYZE TABLE inside InnoDB.
      
      Approved by:	Heikki (rb://175)
      4d29c792
  15. 22 Sep, 2009 1 commit
  16. 14 Sep, 2009 1 commit
  17. 10 Sep, 2009 2 commits
    • jyang's avatar
      branches/5.1: Block creating table with column name conflicting · 43346ad7
      jyang authored
      with Innodb reserved key words. (Bug #44369) rb://151 approved
      by Sunny Bains.
      
      43346ad7
    • vasil's avatar
      branches/5.1: · 1261cab7
      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'
      1261cab7
  18. 09 Sep, 2009 2 commits
    • calvin's avatar
      branches/5.1: fix bug#46256 · 2d81e56f
      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)
      2d81e56f
    • calvin's avatar
      branches/5.1: merge change from 5.1.38 · adf8fc6e
      calvin authored
      HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.
      adf8fc6e
  19. 04 Sep, 2009 2 commits
  20. 03 Sep, 2009 2 commits
  21. 26 Aug, 2009 1 commit
    • calvin's avatar
      branches/5.1: · 257804f6
      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
      257804f6
  22. 03 Aug, 2009 1 commit
    • vasil's avatar
      branches/5.1: · 15e91443
      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
      15e91443
  23. 20 Jul, 2009 1 commit
    • vasil's avatar
      branches/5.1: · def8a38d
      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
      def8a38d