1. 05 Feb, 2010 4 commits
  2. 04 Feb, 2010 6 commits
  3. 03 Feb, 2010 9 commits
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.1-bugteam. · 63819d94
      Alexander Nozdrin authored
      Conflicts:
        - configure.in
        - mysql-test/include/setup_fake_relay_log.inc
        - sql/sql_select.cc
      63819d94
    • Luis Soares's avatar
      BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basic · 0b6b44f8
      Luis Soares authored
      fails in PB sporadically)
            
      The IO thread can concurrently access the relay log IO_CACHE
      while another thread is performing an FLUSH LOGS procedure.
            
      FLUSH LOGS closes and reopens the relay log and while doing so it
      (re)initializes its IO_CACHE. During this procedure the IO_CACHE
      mutex is also reinitialized, which can cause problems if some
      other thread (namely the IO THREAD) is concurrently accessing it
      at the time .
            
      This patch fixes the problem by extending the interface of the
      flush_master_info function to also include a second paramater, 
      "need_relay_log_lock", stating whether the thread should grab the 
      relay log lock or not before actually flushing the relay log. 
      Also, IO thread now calls flush_master_info with this flag set 
      when it flushes master info with in the event read_event loop.
      
      Finally, we also increase loop time in rpl_heartbeat_basic test 
      case, so that the number of calls to flush logs doubles, stressing
      this part of the code a little more.
      
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test:
        Doubled the number of iterations on the FLUSH LOGS loop by
        doubling the time available to perform all iterations.
      sql/repl_failsafe.cc:
        Updating flush_master_info call so that it uses two parameters
        instead of one.
      sql/rpl_mi.cc:
        Updating flush_master_info call so that it uses two parameters
        instead of one.
      sql/rpl_mi.h:
        Changed flush_master_info interface. Now takes a second parameter
        instead of just one. The second parameter is: need_lock_relay_log.
      sql/rpl_rli.cc:
        Small fix in comment.
      sql/slave.cc:
        Updating flush_master_info call so that it uses two parameters
        instead of one.
      sql/sql_repl.cc:
        Updating flush_master_info call so that it uses two parameters
        instead of one.
      0b6b44f8
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.1-bugteam. · 80f58920
      Alexander Nozdrin authored
      Conflicts:
        - sql/mysqld.cc
      80f58920
    • Georgi Kodinov's avatar
      merge · 0a08571f
      Georgi Kodinov authored
      0a08571f
    • Georgi Kodinov's avatar
      merge · 665920a3
      Georgi Kodinov authored
      665920a3
    • Georgi Kodinov's avatar
      merge · 60cbcf90
      Georgi Kodinov authored
      60cbcf90
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.1-bugteam. · b96e19fa
      Alexander Nozdrin authored
      Conflicts:
        - mysql-test/collections/default.experimental
        - mysql-test/suite/rpl/r/rpl_sp.result
      b96e19fa
    • Kent Boortz's avatar
      23dd8c2c
    • Luis Soares's avatar
  4. 02 Feb, 2010 6 commits
    • Kent Boortz's avatar
      Changes to be able to create source TAR packages with longer · 5458c143
      Kent Boortz authored
      path names than 99 characters, using the USTAR format of the
      resulting source TAR.
      
      To be able to specify the use of USTAR when creating the source
      TAR, we needed both to update the GNU autotools version requirements
      slightly, and update the initiation of the tools to use more
      modern constructs.
      5458c143
    • Magne Mahre's avatar
      Cleanup fix for WL#5154 that splits commands handling for · f37b172d
      Magne Mahre authored
      --default-character-set and --character-set-server such
      that only the first will give a deprecation warning.
      Apart from that, the two options should do the same.
      f37b172d
    • Luis Soares's avatar
      BUG#47639: The rpl_binlog_corruption test fails on Windows · 19062099
      Luis Soares authored
      The test case rpl_binlog_corruption fails on windows because when
      adding a line to the binary log index file it gets terminated
      with a CR+LF (which btw, is the normal case in windows, but not on
      Unixes - LF). This causes mismatch between the relay log names,
      causing mysqld to report that it cannot find the log file.
      
      We fix this by creating the instrumented index file through
      mysql, ie, using SELECT ... INTO DUMPFILE ..., as opposed on
      relying on ultimatly OS commands like: -- echo "..." >
      index. These changes go into the file and make the procedure
      platform independent:
      
        include/setup_fake_relay_log.inc
      
      Side note: when using SELECT ... INTO DUMPFILE ..., one needs to
      check if mysqld is running with secure_file_priv. If it is, we do
      it in two steps: 1. create the file on the allowed location;
      2. move it to the datadir. If it is not, then we just create the
      file directly on the datadir (so previous step 2. is not needed).
      19062099
    • Alexander Nozdrin's avatar
      Revert a patch for Bug#48231, which introduced valgrind warnings. · 2e9da841
      Alexander Nozdrin authored
      Original revision:
      ------------------------------------------------------------
      revision-id: li-bing.song@sun.com-20100130124925-o6sfex42b6noyc6x
      parent: joro@sun.com-20100129145427-0n79l9hnk0q43ajk
      committer: <Li-Bing.Song@sun.com>
      branch nick: mysql-5.1-bugteam
      timestamp: Sat 2010-01-30 20:49:25 +0800
      message:
        Bug #48321  CURRENT_USER() incorrectly replicated for DROP/RENAME USER;
                    REVOKE/GRANT; ALTER EVENT.
        
        The following statements support the CURRENT_USER() where a user is needed.
          DROP USER 
          RENAME USER CURRENT_USER() ...
          GRANT ... TO CURRENT_USER()
          REVOKE ... FROM CURRENT_USER()
          ALTER DEFINER = CURRENT_USER() EVENT
        but, When these statements are binlogged, CURRENT_USER() just is binlogged
        as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
        executes the log event, 'CURRENT_USER()' is expand to the user of slave 
        SQL thread, but SQL thread's user name always NULL. This breaks the replication.
        
        After this patch, All above statements are rewritten when they are binlogged.
        The CURRENT_USER() is expanded to the real user's name and host.
      ------------------------------------------------------------
      2e9da841
    • Davi Arnaut's avatar
      Fix for valgrind warning: check whether pointer was initialized. · 2f5a9dbb
      Davi Arnaut authored
      storage/myisammrg/ha_myisammrg.cc:
        myisam pointer is not relevant if a error was raised.
      2f5a9dbb
    • Georgi Kodinov's avatar
      ec64114e
  5. 01 Feb, 2010 3 commits
  6. 31 Jan, 2010 1 commit
  7. 30 Jan, 2010 8 commits
    • Alexander Nozdrin's avatar
    • unknown's avatar
      Auto Merge fix for bug#50157 · 3d50457e
      unknown authored
      3d50457e
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.1-bugteam. · 4b70e544
      Alexander Nozdrin authored
      Conflicts:
        - mysql-test/collections/default.experimental
        - mysql-test/suite/rpl/r/rpl_binlog_grant.result
        - mysql-test/suite/rpl/r/rpl_sp.result
        - mysql-test/suite/rpl/t/rpl_binlog_grant.test
        - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
      4b70e544
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.1-bugteam. · 54980ce1
      Alexander Nozdrin authored
      Conflicts:
        - sql/mysql_priv.h
      54980ce1
    • Alexander Nozdrin's avatar
      Null-merge from mysql-5.1-bugteam. · 36211342
      Alexander Nozdrin authored
      36211342
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.1-bugteam. · 17892c5f
      Alexander Nozdrin authored
      17892c5f
    • unknown's avatar
      BUG#50157 Assertion !active_tranxs_->is_tranx_end_pos(..) in ReplSemiSyncMaster::commitTrx · 2cd69a29
      unknown authored
      The root cause of the crash is that a TranxNode is freed before it is used.
      A TranxNode is allocated and inserted into the active list each time 
      a log event is written and flushed into the binlog file. 
      The memory for TranxNode is allocated with thd_alloc and will be freed 
      at the end of the statement. The after_commit/after_rollback callback
      was supposed to be called before the end of each statement and remove the node from
      the active list. However this assumption is not correct in all cases(e.g. call 
      'CREATE TEMPORARY TABLE myisam_t SELECT * FROM innodb_t' in a transaction
       and delete all temporary tables automatically when a session closed), 
      and can cause the memory allocated for TranxNode be freed
      before it was removed from the active list. So The TranxNode pointer in the active
      list would become a wild pointer and cause the crash.
      
      After this patch, We have a class called a TranxNodeAllocate which manages the memory
      for allocating and freeing TranxNode. It uses my_malloc to allocate memory.
      
      
      sql/rpl_handler.cc:
        params are not initialized.
      2cd69a29
    • unknown's avatar
      Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; · 35eb14cd
      unknown authored
                  REVOKE/GRANT; ALTER EVENT.
      
      The following statements support the CURRENT_USER() where a user is needed.
        DROP USER 
        RENAME USER CURRENT_USER() ...
        GRANT ... TO CURRENT_USER()
        REVOKE ... FROM CURRENT_USER()
        ALTER DEFINER = CURRENT_USER() EVENT
      but, When these statements are binlogged, CURRENT_USER() just is binlogged
      as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
      executes the log event, 'CURRENT_USER()' is expand to the user of slave 
      SQL thread, but SQL thread's user name always NULL. This breaks the replication.
      
      After this patch, All above statements are rewritten when they are binlogged.
      The CURRENT_USER() is expanded to the real user's name and host.
      35eb14cd
  8. 29 Jan, 2010 3 commits
    • Georgi Kodinov's avatar
      merge · a28fd124
      Georgi Kodinov authored
      a28fd124
    • Georgi Kodinov's avatar
      Bug #50642 : ssl certs in test suite are expiring soon. · a9e65862
      Georgi Kodinov authored
      Updated the certs to expire on 2015. 
      Made sure they work with both yassl and openssl.
      a9e65862
    • Ramil Kalimullin's avatar
      Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL · 57f9915f
      Ramil Kalimullin authored
      column is used for ORDER BY
      
      Problem: filesort isn't meant for null length sort data
      (e.g. char(0)), that leads to a server crash.
      
      Fix: disregard sort order if sort data record length is 0 (nothing
      to sort).
      
      
      mysql-test/r/select.result:
        Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL 
        column is used for ORDER BY
          - test result.
      mysql-test/t/select.test:
        Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL 
        column is used for ORDER BY
          - test case.
      sql/filesort.cc:
        Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL 
        column is used for ORDER BY
          - assert added as filesort cannot handle null length sort data.
      sql/sql_select.cc:
        Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL 
        column is used for ORDER BY
          - don't sort null length data e.g. in case of ORDER BY CHAR(0).
      57f9915f