1. 27 Jan, 2010 11 commits
  2. 25 Jan, 2010 3 commits
  3. 22 Jan, 2010 2 commits
  4. 21 Jan, 2010 3 commits
  5. 20 Jan, 2010 5 commits
    • Alexander Nozdrin's avatar
      Fix manual merge error. · c730af0e
      Alexander Nozdrin authored
      c730af0e
    • Alfranio Correia's avatar
      BUG#46364 MyISAM transbuffer problems (NTM problem) · 985c06d0
      Alfranio Correia authored
      It is well-known that due to concurrency issues, a slave can become
      inconsistent when a transaction contains updates to both transaction and
      non-transactional tables in statement and mixed modes.
      
      In a nutshell, the current code-base tries to preserve causality among the
      statements by writing non-transactional statements to the txn-cache which
      is flushed upon commit. However, modifications done to non-transactional
      tables on behalf of a transaction become immediately visible to other
      connections but may not immediately get into the binary log and therefore
      consistency may be broken.
      
      In general, it is impossible to automatically detect causality/dependency
      among statements by just analyzing the statements sent to the server. This
      happen because dependency may be hidden in the application code and it is
      necessary to know a priori all the statements processed in the context of
      a transaction such as in a procedure. Moreover, even for the few cases that
      we could automatically address in the server, the computation effort
      required could make the approach infeasible.
      
      So, in this patch we introduce the option
          - "--binlog-direct-non-transactional-updates" that can be used to bypass
          the current behavior in order to write directly to binary log statements
          that change non-transactional tables.
      
      mysql-test/extra/rpl_tests/rpl_mixing_engines.inc:
        Backported this from Celosia to improve the test cases related to the NTM issue.
      sql/log.cc:
        Checks the --binlog-direct-non-transactional-updates before choosing
        to either use the trxn-cache or not.
      sql/mysqld.cc:
        Introduces the option --binlog-direct-non-transactional-updates.
      sql/set_var.cc:
        Introduces the option --binlog-direct-non-transactional-updates.
      sql/sql_class.h:
        Introduces the option --binlog-direct-non-transactional-updates.
      985c06d0
    • Luis Soares's avatar
      Removes duplicate entry for ER_SLAVE_IGNORE_SERVER_IDS · 8b7d5366
      Luis Soares authored
      in errmsg.txt. Kept the one in that matched the location
      in errmsg-utf8.txt, ie after ER_UNKNOWN_LOCALE.
      8b7d5366
    • Alexander Nozdrin's avatar
      Add client/dtoa.c to .bzrignore. · 725936c6
      Alexander Nozdrin authored
      725936c6
    • Alexander Nozdrin's avatar
      da32064b
  6. 19 Jan, 2010 10 commits
    • Alexander Nozdrin's avatar
      ce3dcc6c
    • Sergey Vojtovich's avatar
      d0ceec60
    • Alexander Nozdrin's avatar
      Manual merge from mysql-trunk-merge. · a6667f85
      Alexander Nozdrin authored
      Conflicts:
        - configure.in
        - include/m_string.h
        - mysql-test/extra/rpl_tests/rpl_row_func003.test
        - mysql-test/r/mysqlbinlog.result
        - mysql-test/r/union.result
        - mysql-test/suite/binlog/r/binlog_killed_simulate.result
        - mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
        - mysql-test/suite/binlog/r/binlog_unsafe.result
        - mysql-test/suite/binlog/t/binlog_unsafe.test
        - mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
        - mysql-test/suite/rpl/r/rpl_loaddata_map.result
        - mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
        - mysql-test/suite/rpl/r/rpl_stm_log.result
        - mysql-test/suite/rpl/t/rpl_optimize.test
        - mysql-test/t/mysqlbinlog.test
        - mysql-test/t/union.test
        - sql/rpl_utility.h
        - sql/sql_union.cc
        - strings/Makefile.am
      a6667f85
    • Mattias Jonsson's avatar
      post-push patch for bug#47343. · 4839c426
      Mattias Jonsson authored
      Missing ha_rnd_end in copy_partitions, found due to a
      DBUG_ASSERT in mysql-pe
      
      sql/ha_partition.cc:
        Post-push patch for bug#47343
        
        Must call ha_rnd_end since ha_rnd_init has been called.
      4839c426
    • Sergey Vojtovich's avatar
      667b5944
    • Georgi Kodinov's avatar
      2fa49930
    • Mattias Jonsson's avatar
      merge · 8c6d6c0c
      Mattias Jonsson authored
      8c6d6c0c
    • Georgi Kodinov's avatar
      merge · b60d59b9
      Georgi Kodinov authored
      b60d59b9
    • Sergey Glukhov's avatar
      Bug#49501 Inefficient information_schema check (system collation) · 81391bd0
      Sergey Glukhov authored
      added check_length optimization for I_S_NAME comparison
      
      
      sql/event_data_objects.cc:
        added check_length optimization for I_S_NAME comparison
      sql/events.cc:
        added check_length optimization for I_S_NAME comparison
      sql/mysql_priv.h:
        added check_length optimization for I_S_NAME comparison
      sql/repl_failsafe.cc:
        added check_length optimization for I_S_NAME comparison
      sql/sql_db.cc:
        added check_length optimization for I_S_NAME comparison
      sql/sql_parse.cc:
        added check_length optimization for I_S_NAME comparison
      sql/sql_show.cc:
        added check_length optimization for I_S_NAME comparison
      sql/sql_view.cc:
        added check_length optimization for I_S_NAME comparison
      sql/table.cc:
        added check_length optimization for I_S_NAME comparison
      81391bd0
    • Luis Soares's avatar
      Fix for BUG#49481 and BUG#49482 reverted. · d1d16f9c
      Luis Soares authored
      PB2 run uncovered issue that needs further analysis.
      d1d16f9c
  7. 18 Jan, 2010 6 commits
    • Alexander Nozdrin's avatar
      Manual merge from mysql-next-mr. · 40271e4f
      Alexander Nozdrin authored
      Conflicts:
        - sql/sql_plugin.cc
      40271e4f
    • Alexander Nozdrin's avatar
      Manual merge from mysql-trunk. · 0835775b
      Alexander Nozdrin authored
      Conflicts:
        - support-files/mysql.spec.sh
      0835775b
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 6060c8d3
      Alexander Nozdrin authored
      6060c8d3
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · f143270f
      Alexander Nozdrin authored
      f143270f
    • Mattias Jonsson's avatar
      Bug#47343: InnoDB fails to clean-up after lock wait timeout on · eab2be0a
      Mattias Jonsson authored
                 REORGANIZE PARTITION
      
      There were several problems which lead to this this,
      all related to bad error handling.
      
      1) There was several bugs preventing the ddl-log to be used for
         cleaning up created files on error.
      
      2) The error handling after the copy partition rows did not close
         and unlock the tables, resulting in deletion of partitions
         which were in use, which lead InnoDB to put the partition to
         drop in a background queue.
      
      sql/ha_partition.cc:
        Bug#47343: InnoDB fails to clean-up after lock wait timeout on
                   REORGANIZE PARTITION
        
        Better error handling, if partition has been created/opened/locked
        then make sure it is unlocked and closed before returning error.
        The delete of the newly created partition is handled by the ddl-log.
      sql/sql_parse.cc:
        Bug#47343: InnoDB fails to clean-up after lock wait timeout on
                   REORGANIZE PARTITION
        
        Fix a bug found when experimenting, thd could really be NULL here,
        as mentioned in the function header.
      sql/sql_partition.cc:
        Bug#47343: InnoDB fails to clean-up after lock wait timeout on
                   REORGANIZE PARTITION
        
        Used the correct .frm shadow name to put into the ddl-log.
        Really use the ddl-log to handle errors.
      sql/sql_table.cc:
        Bug#47343: InnoDB fails to clean-up after lock wait timeout on
                   REORGANIZE PARTITION
        
        Fixes of the ddl-log when used as error recovery (no crash).
        When executing an entry from memory (not read from disk)
        the name_len was not set correctly.
      eab2be0a
    • Georgi Kodinov's avatar
      Bug #45989 take 2 : memory leak after explain encounters an · 5ba1dd04
      Georgi Kodinov authored
      error in the query.
      
      Fixes a leak after materializing a GROUP BY subquery to a 
      temp table when the subquery has a blob column in the SELECT
      list.
      Fixed by correctly destructing temporary buffers after doing
      the conversion.
      5ba1dd04