1. 30 Nov, 2009 11 commits
    • Magne Mahre's avatar
      Bug #20837 Apparent change of isolation level during transaction · 732e5a26
      Magne Mahre authored
            
      SET TRANSACTION ISOLATION LEVEL is used to temporarily set
      the trans.iso.level for the next transaction.  After the
      transaction, the iso.level is (re-)set to value of the 
      session variable 'tx_isolation'.
      
      The bug is caused by setting the thd->variables.tx_isolation 
      field to the value of the session variable upon each
      statement commit.  It should only be set at the end of the
      full transaction.
      
      The fix has been to remove the setting of the variable in
      ha_autocommit_or_rollback if we're in a transaction, as it 
      will be correctly set in  either ha_rollback or 
      ha_commit_one_phase.  
      
      If, on the other hand, we're in  autocommit mode, tx_isolation 
      will be explicitly set here.
      
      
      
      mysql-test/t/innodb_mysql.test:
        "SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED" sets
        the trans.isolation for the next transaction.  We test
        that @@tx_isolation keeps this value during the transaction,
        and is only reset back to the session value at the end
        of the transaction.
      732e5a26
    • Satya B's avatar
      Applying Innodb Snapshot 5.1-ss6242, part 9. · cefd968d
      Satya B authored
      1. Enabling the disabled test for BUG#32430 for builtin innodb
      2. Disabling the innodb-autoinc.test for innodb plugin.
      cefd968d
    • Satya B's avatar
      Applying InnoDB snapshot 5.1-ss6242, part 8. Fixes BUG#47720 · cde05f06
      Satya B authored
      1. BUG#47720 - REPLACE INTO Autoincrement column with negative values.
      
      Detailed revision comments:
      
      r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
      branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
      
      This bug is similiar to the negative autoinc filter patch from earlier,
      with the additional handling of filtering out the negative column values
      set explicitly by the user.
      
      rb://184
      Approved by Heikki.
      
      cde05f06
    • Satya B's avatar
      Applying InnoDB snapshot 5.1-ss6242, part 7. Fixes BUG#49032 · 4b3114b6
      Satya B authored
      1. BUG#49032 - auto_increment field does not initialize to last value 
                     in InnoDB Storage Engine
      
      2. Fix whitespace issues and fix tests and make read float/double arg const
      
      Detailed revision comments:
      
      r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
      branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
      
      We use the appropriate function to read the column value for non-integer
      autoinc column types, namely float and double.
      
      rb://208. Approved by Marko.
      
      r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
      branches/5.1: This is an interim fix, fix white space errors.
      
      r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
      branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
      
      
      r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
      branches/5.1: This is an interim fix, fix whitepsace issues.
      
      4b3114b6
    • Satya B's avatar
      Applying InnoDB snapshot 5.1-ss6242, part 6. Fixes BUG#48482 · 2faa75ed
      Satya B authored
      1. BUG#48482 - innodb-autoinc.test fails with results difference
      
      2. enable the disabled test
      
      Detailed revision comments:
      
      r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
      branches/5.1: Fix autoinc failing test results.
      (this should be skipped when merging 5.1 into zip)
      
      2faa75ed
    • Satya B's avatar
      Applying InnoDB snapshot 5.1-ss6242, part 5. Fixes BUG#45961 · 96a121d3
      Satya B authored
      1. BUG#45961 - DDL on partitioned innodb tables leaves data dictionary 
                     in an inconsistent state
      
      2. Fix formatting
      
      Detailed revision comments:
      
      r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
      branches/5.1: Add a special case to handle the Duplicated Key error
      and return DB_ERROR instead. This is to avoid a possible SIGSEGV
      by mysql error handling re-entering the storage layer for dup key
      info without proper table handle.
      This is to prevent a server crash when error situation in bug
      #45961 "DDL on partitioned innodb tables leaves data dictionary
      in an inconsistent state" happens.
      
      rb://157 approved by Sunny Bains.
      
      
      r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
      branches/5.1: Non-functional change, fix formatting.
      
      
      96a121d3
    • Satya B's avatar
      Applying InnoDB snapshot 5.1-ss6242, part 4. Fixes BUG#48526 · 2df31d44
      Satya B authored
      1. BUG#48526 - Data type for float and double is incorrectly 
                     reported in InnoDB table monitor
      
      Detailed revision comments:
      
      r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
      branches/5.1: Fix bug #48526 "Data type for float and
      double is incorrectly reported in InnoDB table monitor".
      Certain datatypes are not printed correctly in
      dtype_print().
      
      rb://204 Approved by Marko.
      
      
      2df31d44
    • Satya B's avatar
      Applying InnoDB snapshot 5.1-ss6242, part 3. Fixes BUG#48469 · 3431bede
      Satya B authored
      1. BUG#4869 - when innodb tablespace is configured too small,
                    crash and corruption!
      
      Detailed revision comments:
      
      r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
      branches/5.1: Fix bug #48469 "when innodb tablespace is
      configured too small, crash and corruption!". Function
      btr_create() did not check the return status of fseg_create(),
      and continue the index creation even there is no sufficient
      space.
      
      rb://205 Approved by Marko
      
      r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
      branches/5.1:
      
      White space fixup - indent under the opening (
      
      r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
      branches/5.1: Use btr_free_root() instead of fseg_free() for
      the fix of bug #48469, because fseg_free() is not defined
      in the zip branch. And we could save one mini-trasaction started
      by fseg_free().
      
      Approved by Marko.
      
      
      3431bede
    • Satya B's avatar
      Applying InnoDB snapshot 5.1-ss6242, part 2. Fixes BUG#3139 · 18887506
      Satya B authored
      1. BUG#3139 - Mysql crashes: "windows error 995" after several 
                    selects on a large DB
      
      Detailed revision comments:
      
      r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
      branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
      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
      18887506
    • Satya B's avatar
      Applying InnoDB snapshot 5.1-ss6242, part 1. Fixes BUG#32430 · ca79b2bc
      Satya B authored
      1. BUG#32430 - 'show innodb status' causes errors Invalid (old?) table
                     or database name in logs
      
      2. White space fixup
      
      Detailed revision comments:
      
      r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
      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().
      r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
      branches/5.1:
      
      White space fixup.
      
      ca79b2bc
    • Satya B's avatar
      Additional Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39 · 181a29f2
      Satya B authored
      Fix for failure on windows PB2 because of the result content mismatch.
      In windows additional information about TCP port was causing failures.
      Added to regex.
      181a29f2
  2. 28 Nov, 2009 1 commit
    • unknown's avatar
      Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm · b9f9fe2e
      unknown authored
            
      The 'slave_patternload_file' is assigned to the real path of the load data file 
      when initializing the object of Relay_log_info. But the path of the load data
      file is not formatted to real path when executing event from relay log. So the 
      error will be encountered if the path of the load data file is a symbolic link.
      
      Actually the global 'opt_secure_file_priv' is not formatted to real path when 
      loading data from file. So the same thing will happen too.
      
            
      To fix these errors, the path of the load data file should be formatted to 
      real path when executing event from relay log. And the 'opt_secure_file_priv' 
      should be formatted to real path when loading data infile.
      
      
      mysql-test/suite/rpl/r/rpl_loaddata_symlink.result:
        Test result for bug#43913.
      mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh:
        Added the test file to create a link from $MYSQLTEST_VARDIR/std_data 
        to $MYSQLTEST_VARDIR/std_data_master_link
      mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh:
        Added the test file to create a link from $MYSQLTEST_VARDIR/std_data 
        to $MYSQLTEST_VARDIR/std_data_slave_link
      mysql-test/suite/rpl/t/rpl_loaddata_symlink.test:
        Added the test file to verify if loading data infile will work fine 
        if the path of the load data file is a symbolic link.
      sql/rpl_rli.cc:
        Added call 'my_realpath' function for avoiding sometimes the 'fn_format' 
        function can't format real path rightly.
      b9f9fe2e
  3. 27 Nov, 2009 13 commits
  4. 26 Nov, 2009 2 commits
  5. 25 Nov, 2009 10 commits
    • Kent Boortz's avatar
      Move DBG_* macros to after the variable declaration section in a · e55e76d2
      Kent Boortz authored
      block, might expand to function calls (Bug#48331)
      e55e76d2
    • Davi Arnaut's avatar
      Automerge. · 8022ff5c
      Davi Arnaut authored
      8022ff5c
    • Satya B's avatar
      fb436977
    • Martin Hansson's avatar
      Bug#48459: valgrind errors with query using 'Range checked · 14f2eb12
      Martin Hansson authored
      for each record'
      
      There was an error in an internal structure in the range
      optimizer (SEL_ARG). Bad design causes parts of a data
      structure not to be initialized when it is in a certain
      state. All client code must check that this state is not
      present before trying to access the structure's data. Fixed
      by
      
      - Checking the state before trying to access data (in
      several places, most of which not covered by test case.)
      
      - Copying the keypart id when cloning SEL_ARGs
      
      
      mysql-test/r/range.result:
        Bug#48459: Test result.
      mysql-test/t/range.test:
        Bug#48459: Test case.
      sql/opt_range.cc:
        Bug#48459: Fix + doxygenated count_key_part_usage comment.
      14f2eb12
    • Satya B's avatar
      Applying InnoDB snapshot 5.0-ss6230, part 2. Fixes BUG#46000 · 97d74332
      Satya B authored
      BUG#46000 - using index called GEN_CLUST_INDEX crashes server
      
      Detailed revision comments:
      
      r6180 | jyang | 2009-11-17 10:54:57 +0200 (Tue, 17 Nov 2009) | 7 lines
      branches/5.0: Merge/Port fix for bug #46000 from branches/5.1
      -r5895 to branches/5.0. Disallow creating index with the
      name of "GEN_CLUST_INDEX" which is reserved for the default
      system primary index. Minor adjusts on table name screening
      format for added tests.
      
      
      97d74332
    • Evgeny Potemkin's avatar
      Auto-merge. · c45da992
      Evgeny Potemkin authored
      c45da992
    • Evgeny Potemkin's avatar
      Additional fix for the bug#43668. · 0039944e
      Evgeny Potemkin authored
      Arg_comparator now takes into account that some of
      optimizations aren't done in the PREPARE stmt.
      0039944e
    • Satya B's avatar
      Applying InnoDB snapshot 5.0-ss6230, Part 1. Fixes BUG#47777 · 2bf2e8f9
      Satya B authored
      BUG#47777 - innodb dies with spatial pk: Failing assertion: buf <= original_buf + buf_len
      
      Detailed revision comments:
      
      r6178 | jyang | 2009-11-17 08:52:11 +0200 (Tue, 17 Nov 2009) | 6 lines
      branches/5.0: Merge fix for bug #47777 from branches/5.1 -r6045
      to bracnches/5.0. Treat the Geometry data same as Binary BLOB
      in ha_innobase::store_key_val_for_row(), since the Geometry
      data is stored as Binary BLOB in Innodb.
      
      
      2bf2e8f9
    • Satya B's avatar
      Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39 · 82b115ec
      Satya B authored
      mysql client displays wrong character-set of server. When a user changes the
      charset of a server, mysql client 'status' command displays wrong charset but
      the command "SHOW VARIABLES LIKE "%charset%" displayed correct charset results.
      The problem is only with the mysql client's 'status' command output.
      
      In mysql client, the method mysql_store_lazy_result() returns 0 for
      success and non-zero for failure. The method com_status() was using this method
      wrongly. Fixed all such instances according to return value of the method 
      mysql_store_lazy_result().
      
      client/mysql.cc:
        Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39
        
        Fix com_status() method to use mysql_store_lazy_result() properly.
      mysql-test/r/bug47671.result:
        Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39
        
        Testcase for BUG#47671
      mysql-test/t/bug47671-master.opt:
        Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39
        
        Testcase for BUG#47671
      mysql-test/t/bug47671.test:
        Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39
        
        Testcase for BUG#47671
      82b115ec
    • Tatiana A. Nurnberg's avatar
      auto-merge · 42fcc56f
      Tatiana A. Nurnberg authored
      42fcc56f
  6. 24 Nov, 2009 3 commits