1. 19 Jan, 2010 1 commit
  2. 17 Jan, 2010 1 commit
  3. 16 Jan, 2010 1 commit
    • unknown's avatar
      BUG#47418 RBR fails, failure with mixup of base/temporary/view · 377d7102
      unknown authored
      'CREATE TABLE IF NOT EXISTS ... SELECT' statement were causing 'CREATE
      TEMPORARY TABLE ...' to be written to the binary log in row-based 
      mode (a.k.a. RBR), when there was a temporary table with the same name.
      Because the 'CREATE TABLE ... SELECT' statement was executed as 
      'INSERT ... SELECT' into the temporary table. Since in RBR mode no 
      other statements related to temporary tables are written into binary log,
      this sometimes broke replication.
      
      This patch changes behavior of 'CREATE TABLE [IF NOT EXISTS] ... SELECT ...'.
      it ignores existence of temporary table with the 
      same name as table being created and is interpreted
      as attempt to create/insert into base table. This makes behavior of
      'CREATE TABLE [IF NOT EXISTS] ... SELECT' consistent with
      how ordinary 'CREATE TABLE' and 'CREATE TABLE ... LIKE' behave.
      377d7102
  4. 15 Jan, 2010 3 commits
    • Georgi Kodinov's avatar
      Bug #46175: NULL read_view and consistent read assertion · 7a7147c5
      Georgi Kodinov authored
      The optimizer must not continue executing the current query
      if e.g. the storage engine reports an error.
      This is somewhat hard to implement with Item::val_xxx()
      because they do not have means to return error code.
      This is why we need to check the thread's error state after
      a call to one of the Item::val_xxx() methods.
      
      Fixed store_key_item::copy_inner() to return an error state 
      if an error happened during the call to Item::save_in_field() 
      because it calls Item::val_xxx().
      Also added similar checks to related places.
      7a7147c5
    • Georgi Kodinov's avatar
      merge · 0305aea8
      Georgi Kodinov authored
      0305aea8
    • Georgi Kodinov's avatar
      merge of version change. · a07ca237
      Georgi Kodinov authored
      Added not_embedded to the new dbug_sync test file.
      a07ca237
  5. 14 Jan, 2010 4 commits
    • Luis Soares's avatar
      Fix for BUG#49481 and BUG#49482. · 32aa6128
      Luis Soares authored
      BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete: 
      cant find record
            
      BUG#49482: RBR: Replication may break on deletes when MyISAM tables + 
      char field are used
      
      When using MyISAM tables, despite the fact that the null bit is
      set for some fields, their old value is still in the row. This
      can cause the comparison of records to fail when the slave is
      doing an index or range scan.
      
      We fix this by avoiding memcmp for MyISAM tables when comparing
      records. Additionally, when comparing field by field, we first
      check if both fields are not null and if so, then we compare
      them. If just one field is null we return failure immediately. If
      both fields are null, we move on to the next field.
      32aa6128
    • Luis Soares's avatar
      BUG#50018: binlog corruption when table has many columns · 5ae7b3c9
      Luis Soares authored
      Small fix in the test case. Changed the UNLOCK tables 
      to happen after each insert.
      5ae7b3c9
    • Luis Soares's avatar
    • Georgi Kodinov's avatar
      version change · 7ecd6c6d
      Georgi Kodinov authored
      7ecd6c6d
  6. 13 Jan, 2010 13 commits
    • Kristofer Pettersson's avatar
      automerge · a0fe99a8
      Kristofer Pettersson authored
      a0fe99a8
    • Kristofer Pettersson's avatar
      Bug#33982 debug assertion and crash reloading grant tables after sighup or kill · b3dd4d94
      Kristofer Pettersson authored
      In certain rare cases when a process was interrupted
      during a FLUSH PRIVILEGES operation the diagnostic
      area would be set to an error state but the function
      responsible for the operation would still signal
      success. This would lead to a debug assertion error
      later on when the server would attempt to reset the
      DA before sending the error message.
      
      This patch fixes the issue by assuring that
      reload_acl_and_cache() always fails if an error
      condition is raised.
      
      The second issue was that a KILL could cause
      a console error message which referred to a DA
      state without first making sure that such a
      state existed.
      
      This patch fixes this issue in two different
      palces by first checking DA state before
      fetching the error message.
      
       
      
      sql/sql_acl.cc:
        * Make sure that there is an error to print before attempting to do so.
        * Minor style change: change 1 to TRUE for clarity.
      sql/sql_parse.cc:
        * Always fail reload_acl_and_cache() if the query was killed.
      sql/sql_servers.cc:
        * Make sure that there is an error to print before attempting to do so.
      b3dd4d94
    • Martin Hansson's avatar
      Merge of fix for Bug#48157. · 34e5c675
      Martin Hansson authored
      34e5c675
    • Ramil Kalimullin's avatar
      Auto-merge. · 200f083c
      Ramil Kalimullin authored
      200f083c
    • Ramil Kalimullin's avatar
      Auto-merge. · 08dfd4ad
      Ramil Kalimullin authored
      08dfd4ad
    • Georgi Kodinov's avatar
      merge · 90274e37
      Georgi Kodinov authored
      90274e37
    • Georgi Kodinov's avatar
      version change · c4ec2de7
      Georgi Kodinov authored
      c4ec2de7
    • Joerg Bruehe's avatar
      Automerge from parent - no conflicts. · 1b2826e7
      Joerg Bruehe authored
      1b2826e7
    • Georgi Kodinov's avatar
      merge 5.1-main to 5.1-bugteam · 6e72f417
      Georgi Kodinov authored
      6e72f417
    • Ramil Kalimullin's avatar
      Auto-merge. · 7fe31548
      Ramil Kalimullin authored
      7fe31548
    • Sven Sandberg's avatar
      BUG#49222: Mark RAND() as unsafe · 4dc7be62
      Sven Sandberg authored
      Problem: When RAND() is binlogged in statement mode, the seed is
      binlogged too, so the replication slave generates the same
      sequence of random numbers. This makes replication work in many
      cases, but not in all cases: the order of rows is not guaranteed
      for, e.g., UPDATE or INSERT...SELECT statements, so the row data
      will be different if master and slave retrieve the rows in
      different orders.
      Fix: Mark RAND() as unsafe. It will generate a warning if
      binlog_format=STATEMENT and switch to row-logging if
      binlog_format=ROW.
      
      
      mysql-test/extra/rpl_tests/rpl_row_func003.test:
        updated test case to ignore new warnings
      mysql-test/suite/binlog/r/binlog_unsafe.result:
        updated result file
      mysql-test/suite/binlog/t/binlog_unsafe.test:
        Added test for RAND().
        Also clarified some old comments.
      mysql-test/suite/rpl/r/rpl_misc_functions.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result:
        updated test case to ignore new warnings
      mysql-test/suite/rpl/r/rpl_optimize.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_row_func003.result:
        updated result file
      mysql-test/suite/rpl/t/rpl_misc_functions.test:
        updated test case to ignore new warnings
      mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test:
        updated test case to ignore new warnings
      mysql-test/suite/rpl/t/rpl_optimize.test:
        updated test case to ignore new warnings
      mysql-test/suite/rpl/t/rpl_trigger.test:
        updated test case to ignore new warnings
      mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result:
        updated result file
      sql/item_create.cc:
        Mark RAND() unsafe.
      4dc7be62
    • Ramil Kalimullin's avatar
      Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL · 495810cd
      Ramil Kalimullin authored
      Problem: copying issuer's (or subject's) name tags into an internal
      buffer from incoming stream we didn't check the buffer overflow. 
      That may lead to memory overrun, crash etc.
      
      Fix: ensure we don't overrun the buffer.
      
      Note: there's no simple test case (exploit needed).
      
      
      extra/yassl/taocrypt/include/asn.hpp:
        Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL
          - CertDecoder::AddTag() introduced.
      extra/yassl/taocrypt/src/asn.cpp:
        Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL
          - copying data from incoming stream to the issuer_ or subject_
        buffers ensure we don't overrun them.
          - code cleanup.
      495810cd
    • Gleb Shchepa's avatar
      Bug #50096: CONCAT_WS inside procedure returning wrong data · 71fd38e4
      Gleb Shchepa authored
      Selecting of the CONCAT_WS(...<PS parameter>...) result into
      a user variable may return wrong data.
      
      Item_func_concat_ws::val_str contains a number of memory
      allocation-saving optimization tricks. After the fix
      for bug 46815 the control flow has been changed to a
      branch that is commented as "This is quite uncommon!":
      one of places where we are trying to concatenate
      strings inplace. However, that "uncommon" place
      didn't care about PS parameters, that have another
      trick in Item_sp_variable::val_str(): they use the
      intermediate Item_sp_variable::str_value field,
      where they may store a reference to an external
      argument's buffer.
      
      The Item_func_concat_ws::val_str function has been
      modified to take into account val_str functions
      (such as Item_sp_variable::val_str) that return a
      pointer to an internal Item member variable that
      may reference to a buffer provided.
      
      
      mysql-test/r/func_concat.result:
        Added test case for bug #50096.
      mysql-test/t/func_concat.test:
        Added test case for bug #50096.
      sql/item_strfunc.cc:
        Bug #50096: CONCAT_WS inside procedure returning wrong data
        
        The Item_func_concat_ws::val_str function has been
        modified to take into account val_str functions
        (such as Item_sp_variable::val_str) that return a
        pointer to an internal Item member variable that
        may reference to a buffer provided.
      71fd38e4
  7. 12 Jan, 2010 4 commits
    • Martin Hansson's avatar
      Bug#48157: crash in Item_field::used_tables · c8b5804f
      Martin Hansson authored
      MySQL handles the join syntax "JOIN ... USING( field1,
      ... )" and natural joins by building the same parse tree as
      a corresponding join with an "ON t1.field1 = t2.field1 ..."
      expression would produce. This parse tree was not cleaned up
      properly in the following scenario. If a thread tries to
      lock some tables and finds that the tables were dropped and
      re-created while waiting for the lock, it cleans up column
      references in the statement by means a per-statement free
      list. But if the statement was part of a stored procedure,
      column references on the stored procedure's free list weren't
      cleaned up and thus contained pointers to freed objects.
      
      Fixed by adding a call to clean up the current prepared
      statement's free list.
      
      
      mysql-test/r/sp_sync.result:
        Bug#48157: Test case
      mysql-test/t/sp_sync.test:
        Bug#48157: Test result
      sql/item.h:
        Bug#48157: Commented field.
      sql/sql_parse.cc:
        Bug#48157: Commented function.
      sql/sql_update.cc:
        Bug#48157: fix
      c8b5804f
    • Joerg Bruehe's avatar
      Upmerge the changes for RPM versioning/naming from 5.0 to 5.1. · c591ee59
      Joerg Bruehe authored
      This includes "MYSQL_U_SCORE_VERSION" in "configure.in".
      c591ee59
    • Joerg Bruehe's avatar
      Implement the change of RPM versioning and file naming: · 71465af9
      Joerg Bruehe authored
      - "release" starts from 1
      - "level" ("m2", "rc", ...) is included in the RPM version.
      71465af9
    • Joerg Bruehe's avatar
      Merge from main tree, · edf7f335
      Joerg Bruehe authored
      but don't take the "tree name" change.
      edf7f335
  8. 11 Jan, 2010 3 commits
    • Joerg Bruehe's avatar
      Implement the change of RPM versioning and file naming: · 3c9322e7
      Joerg Bruehe authored
      - "release" starts from 1
      - "level" ("m2", "rc", ...) is included in the RPM version.
      3c9322e7
    • Gleb Shchepa's avatar
      a852f464
    • Gleb Shchepa's avatar
      Bug #49955: ld error message: undefined reference to `strmov_overlapp' · 107f34ed
      Gleb Shchepa authored
      32bit builds with the --enable-assembler flag (enabled by default)
      fail with an error message: undefined reference to `strmov_overlapp'.
      
      Since the fix for bug 48866 we use a home-grown strmov function
      instead of the ctpcpy function, but the source file for this
      function was missed in the Makefile.am.
      
      The strings/Makefile.am file has been modified to include strmov.c
      file into ASSEMBLER_x86 and ASSEMBLER_sparc32 sections.
      
      
      strings/Makefile.am:
        Bug #49955: ld error message: undefined reference to `strmov_overlapp'
        
        The strings/Makefile.am file has been modified to include
        strmov.c file into ASSEMBLER_x86 and ASSEMBLER_sparc32 sections.
      107f34ed
  9. 08 Jan, 2010 2 commits
    • unknown's avatar
      Postfix · 4ae5679f
      unknown authored
      Recover the right contents of the index file at the end of the test case.
      4ae5679f
    • unknown's avatar
      BUG #28421 Infinite loop on slave relay logs · c1043021
      unknown authored
      Manually deleteing one or more entries from 'master-bin.index', will
      cause master infinitely loop to send one binlog file. 
      
      When starting a dump session, master opens index file and search the binlog file
      which is being requested by the slave. The position of the binlog file in the
      index file is recorded. it will be used to find the next binlog file when current
      binlog file has dumped completely. As only the position is used, it may
      not get the correct file if some entries has been removed manually from the index file.
      the master will reopen the current binlog file which has been dump completely
      and redump it if it can not get the next binlog file's name from index file.
      It obviously is a logical error.
      
      
      Even though it is allowed to manually change index file,
      but it is not recommended. so after this patch, master
      sends a fatal error to slave and close the dump session if a new binlog file
      has been generated and master can not get it from the index file.
      c1043021
  10. 07 Jan, 2010 2 commits
  11. 06 Jan, 2010 6 commits
    • Georgi Kodinov's avatar
      9eca4014
    • unknown's avatar
      Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE · efcbc349
      unknown authored
      Fixed valgrind failure on PB2.
      
      sql/log_event.cc:
        Added code to fix valgrind failure on PB2.
      efcbc349
    • unknown's avatar
      Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE · 98b989d7
      unknown authored
      Fixed valgrind failure on PB2.
      
      sql/log_event.cc:
        Added code to fix valgrind failure on PB2.
      98b989d7
    • unknown's avatar
      Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE · 88688471
      unknown authored
      Fixed valgrind failure on PB2.
      
      sql/log_event.cc:
        Added code to fix valgrind failure on PB2.
      88688471
    • unknown's avatar
      Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE · 0a64fbc5
      unknown authored
      Fixed valgrind failure on PB2.
      
      sql/log_event.cc:
        Added code to fix valgrind failure on PB2.
      0a64fbc5
    • Luis Soares's avatar
      BUG#50018: binlog corruption when table has many columns · f8758031
      Luis Soares authored
      For tables with metadata sizes ranging from 251 to 255 the size
      of the event data (m_data_size) was being improperly calculated
      in the Table_map_log_event constructor. This was due to the fact
      that when writing the Table_map_log_event body (in
      Table_map_log_event::write_data_body) a call to net_store_length
      is made for packing the m_field_metadata_size. It happens that
      net_store_length uses *one* byte for storing
      m_field_metadata_size when it is smaller than 251 but *three*
      bytes when it exceeds that value. BUG 42749 had already
      pinpointed and fix this fact, but the fix was incomplete, as the
      calculation in the Table_map_log_event constructor considers 255
      instead of 251 as the threshold to increment m_data_size by
      three. Thence, the window for having a mismatch between the
      number of bytes written and the number of bytes accounted in the
      event length (m_data_size) was left open for
      m_field_metadata_size values between 251 and 255.
      
      We fix this by changing the condition in the Table_map_log_event
      constructor to match the one in the net_store_length, ie,
      increment one byte if m_field_metadata_size < 251 and three if it
      exceeds this value.
      
      mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result:
        Updated result file.
      mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test:
        Changes to the original test case: added slave and moved
        file into the rpl suite.
        
        New test case: replicates two tables one with 250 and 
        another with 252 metadata sizes. This exercises the usage
        of 1 or 3 bytes while packing the m_field_metadata_size.
      sql/log_event.cc:
        Made the m_data_size calculation for the table map log event
        to match the number of bytes used while packing the 
        m_field_metadata_size value (according to net_store_length
        function in pack.c).
      f8758031