1. 01 Feb, 2010 3 commits
  2. 30 Jan, 2010 1 commit
    • unknown's avatar
      Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; · d9e9a73e
      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.
      d9e9a73e
  3. 29 Jan, 2010 3 commits
    • Georgi Kodinov's avatar
      merge · f51a45cd
      Georgi Kodinov authored
      f51a45cd
    • Georgi Kodinov's avatar
      Bug #50642 : ssl certs in test suite are expiring soon. · d468e242
      Georgi Kodinov authored
      Updated the certs to expire on 2015. 
      Made sure they work with both yassl and openssl.
      d468e242
    • Ramil Kalimullin's avatar
      Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL · 172af372
      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).
      172af372
  4. 28 Jan, 2010 1 commit
  5. 29 Jan, 2010 2 commits
  6. 28 Jan, 2010 3 commits
    • Davi Arnaut's avatar
      Fix for compiler warnings: · c3a73a8f
      Davi Arnaut authored
      Rename method as to not hide a base.
      Reorder attributes initialization.
      Remove unused variable.
      Rework code to silence a warning due to assignment used as truth value.
      
      
      sql/item_strfunc.cc:
        Rename method as to not hide a base.
      sql/item_strfunc.h:
        Rename method as to not hide a base.
      sql/log_event.cc:
        Reorder attributes initialization.
      sql/rpl_injector.cc:
        Rework code to silence a warning due to assignment used as truth value.
      sql/rpl_record.cc:
        Remove unused variable.
      sql/sql_db.cc:
        Rework code to silence a warning due to assignment used as truth value.
      sql/sql_parse.cc:
        Rework code to silence a warning due to assignment used as truth value.
      sql/sql_table.cc:
        Rework code to silence a warning due to assignment used as truth value.
      c3a73a8f
    • Andrei Elkin's avatar
      1750b79f
    • Andrei Elkin's avatar
      0c0eb1d4
  7. 27 Jan, 2010 9 commits
    • Andrei Elkin's avatar
      bug#47142 · a5894999
      Andrei Elkin authored
      merging patches prepared for 5.0 to 5.1-bt. That caused a few changes in the test file
      a5894999
    • Bjorn Munch's avatar
      Bug #49210 Enable MTR timeout configuration through environment variables · 38e924b9
      Bjorn Munch authored
      Define env. vars for both timeout settings
      Also incorporated 5.0 patch into mtr version 1
      38e924b9
    • Staale Smedseng's avatar
      Bug #49223 Change help description for mysqldump · 18761a92
      Staale Smedseng authored
      --extended-insert
      
      Help message changed to the same as in the 5.1 online 
      documentation.
      18761a92
    • Bjorn Munch's avatar
      Bug #49210 Enable MTR timeout configuration through environment variables · b13ed297
      Bjorn Munch authored
        Define env. vars for both timeout settings
        This patch is for 5.0 (mtr v1) and should replaces for 5.1 up
      b13ed297
    • Andrei Elkin's avatar
      bug#47142 · 29cd733f
      Andrei Elkin authored
      improving comments
      29cd733f
    • Magne Mahre's avatar
      WL#5182 Remove more deprecated 4.1/5.0 features · 35c6bb89
      Magne Mahre authored
            
      WL#5182 is a follow-up to WL#5154, deprecating a few more options
      and system variables.
      
      
      client/client_priv.h:
        The warning message has been changed to not include
        a specific version number in the text.
      client/mysql.cc:
        --no-tee is deprecated
      client/mysqldump.c:
        --all is deprecated
        -a now points to create-options
      mysql-test/r/mysqlbinlog.result:
        Warning text changed
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
        Warning text changed
      sql/mysql_priv.h:
        The warning message has been changed to not include
        a specific version number in the text.
      sql/mysqld.cc:
        --use-symbolic-links is deprecated
        -s now points to --symbolic-links
        --warnings is deprecated
        -W now points to --log-warnings
                
        myisam_max_extra_sort_file_size is deprecated
        record_buffer is deprecated
                
        --log-update is deprecated
        --sql-bin-update-same is deprecated
        --skip-locking is deprecated
        --skip-symlink is deprecated
        --enable-locking is deprecated
        --delay-key-write-for-all-tables is deprecated
      35c6bb89
    • Staale Smedseng's avatar
      Merging from 5.0-bugteam · 22be2783
      Staale Smedseng authored
      22be2783
    • Staale Smedseng's avatar
      Bug#50409 Solaris 8 compatibility broken by assumption about · 694d50c7
      Staale Smedseng authored
      printstack() being present
      
      When Bug#47391 was fixed, no assumption was made that support
      for Solaris 8 was needed. Solaris 8 lacks printstack(), and 
      the build breaks because of this.
      
      This patch adds a test for the presence of printstack() to
      configure.in for 5.0, and uses HAVE_PRINTSTACK to make
      decisions rather than the __sun define.
      694d50c7
    • unknown's avatar
      Bug #49191 rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed · c12c9780
      unknown authored
      The 'rpl_get_master_version_and_clock' test verifies if the slave I/O
      thread tries to reconnect to master when it tries to get the values of
      the UNIX_TIMESTAMP, SERVER_ID from master under network disconnection.
      So the master server is restarted for making the transient network
      disconnection, during the period the COM_REGISTER_SLAVE failures are
      produced in server log file when the slave I/O thread tries to
      register on master.
      
      To fix the problem, suppress COM_REGISTER_SLAVE failures in server log
      file by mtr suppression, because they are expected.
      
      
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result:
        Removed mtr.add_suppression("Get master clock failed with error: ")
        and mtr.add_suppression("Get master SERVER_ID failed with error: ").
        Because they are suppressed globally.
      c12c9780
  8. 26 Jan, 2010 3 commits
  9. 25 Jan, 2010 2 commits
    • Andrei Elkin's avatar
      Bug #47142 "slave start until" stops 1 event too late in 4.1 to 5.0 replication · cfa7e83d
      Andrei Elkin authored
      When replicating from 4.1 master to 5.0 slave START SLAVE UNTIL can stop too late.
      The necessary in calculating of the beginning of an event the event's length
      did not correspond to the master's genuine information at the event's execution time.
      That piece of info was changed at the event's relay-logging due to binlog_version<4 event
      conversion by IO thread.
      
      Fixed with storing the master genuine Query_log_event size into a new status
      variable at relay-logging of the event. The stored info is extacted at the event
      execution and participate further to caclulate the correct start position of the event
      in the until-pos stopping routine.
      The new status variable's algorithm will be only active when the event comes
      from the master of version < 5.0 (binlog_version < 4).
      
      
      mysql-test/r/rpl_until.result:
        results changed.
      mysql-test/std_data/bug47142_master-bin.000001:
        a binlog from 4.1 master to replace one of the running 5.x master is added as 
        part of Bug #47142 regression test.
      mysql-test/t/rpl_until.test:
        Regression test for Bug #47142 is added.
      sql/log_event.cc:
        Storing and extracting the master's genuine size of the event from the status
        var of the event packet header.
        The binlog_version<4 query-log-event is 
        a. converted into the modern binlog_version==4 to store the original size of the event
           into a new status var; the converted representation goes into the relay log.
        b. the converted event is read out and the stored size is engaged in the start pos calculation.
        
        The new status is active only for events that IO thread instantiates for the sake of the conversion.
      sql/log_event.h:
        Incrementing the max szie of MAX_SIZE_LOG_EVENT_STATUS because of the new status var;
        Defining the new status variable to hold the master's genuine event size;
        Augmenting the Query_log_event with a new member to hold a value to store/extact from the status
        var of the event packet header.
      cfa7e83d
    • unknown's avatar
      Manual merge with Conflicts: · dad4291b
      unknown authored
      sql_udf.cc
      dad4291b
  10. 24 Jan, 2010 1 commit
  11. 22 Jan, 2010 12 commits
    • Sergey Vojtovich's avatar
      16471fec
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#49396. · d93550cb
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6471 | calvin | 2010-01-16 01:43:27 +0200 (Sat, 16 Jan 2010) | 4 lines
      branches/5.1: fix bug#49396: main.innodb test fails in embedded mode
      
      Change replace_result by using $MYSQLD_DATADIR. Tested in both embedded
      mode and normal server mode.
      d93550cb
    • Sergey Glukhov's avatar
      Bug#49501 Inefficient information_schema check (system collation), addon · 4a10f7b4
      Sergey Glukhov authored
      removed wrongly introduced strlen calls
      
      
      sql/events.cc:
        removed wrongly introduced strlen calls
      sql/mysql_priv.h:
        removed wrongly introduced strlen calls
      sql/repl_failsafe.cc:
        removed wrongly introduced strlen calls
      sql/sql_db.cc:
        removed wrongly introduced strlen calls
      sql/sql_parse.cc:
        removed wrongly introduced strlen calls
      sql/sql_show.cc:
        removed wrongly introduced strlen calls
      4a10f7b4
    • Sergey Vojtovich's avatar
      f996e36d
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · b6a739f6
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6492 | sunny | 2010-01-21 09:38:35 +0200 (Thu, 21 Jan 2010) | 1 line
      branches/5.1: Add reference to bug#47621 in the comment.
      b6a739f6
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · dab7c82f
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6489 | sunny | 2010-01-21 02:57:50 +0200 (Thu, 21 Jan 2010) | 2 lines
      branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test
      into a separate test/result files.
      dab7c82f
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 407e6e30
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6488 | sunny | 2010-01-21 02:55:08 +0200 (Thu, 21 Jan 2010) | 2 lines
      branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test
      into a separate test/result files.
      407e6e30
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#46193. · 12665e79
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6424 | marko | 2010-01-12 12:22:19 +0200 (Tue, 12 Jan 2010) | 16 lines
      branches/5.1: In innobase_initialize_autoinc(), do not attempt to read
      the maximum auto-increment value from the table if
      innodb_force_recovery is set to at least 4, so that writes are
      disabled. (Bug #46193)
      
      innobase_get_int_col_max_value(): Move the function definition before
      ha_innobase::innobase_initialize_autoinc(), because that function now
      calls this function.
      
      ha_innobase::innobase_initialize_autoinc(): Change the return type to
      void.  Do not attempt to read the maximum auto-increment value from
      the table if innodb_force_recovery is set to at least 4.  Issue
      ER_AUTOINC_READ_FAILED to the client when the auto-increment value
      cannot be read.
      
      rb://144 by Sunny, revised by Marko
      12665e79
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 9aaa3cc4
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6422 | marko | 2010-01-12 11:34:27 +0200 (Tue, 12 Jan 2010) | 3 lines
      branches/5.1: Non-functional change:
      Make innobase_get_int_col_max_value() a static function.
      It does not access any fields of class ha_innobase.
      9aaa3cc4
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#49238. · f65b3f78
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6421 | jyang | 2010-01-12 07:59:16 +0200 (Tue, 12 Jan 2010) | 8 lines
      branches/5.1: Fix bug #49238: Creating/Dropping a temporary table
      while at 1023 transactions will cause assert. Handle possible
      DB_TOO_MANY_CONCURRENT_TRXS when deleting metadata in
      row_drop_table_for_mysql().
      
      rb://220, approved by Marko
      f65b3f78
    • unknown's avatar
      Bug #49132 Replication failure on temporary table + DDL · 3cae7d11
      unknown authored
      In RBR, DDL statement will change binlog format to non row-based
      format before it is binlogged, but the binlog format was not be
      restored, and then manipulating a temporary table can not reset binlog
      format to row-based format rightly. So that the manipulated statement
      is binlogged with statement-based format.
      
      To fix the problem, restore the state of binlog format after the DDL
      statement is binlogged.
      
      mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test:
        Added the test file to verify if executing DDL statement before
        trying to manipulate a temporary table causes row-based replication
        to break with error 'table does not exist'.
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Correct the test result, all the above binlog event
        should be row-based after the bug49132 is fixed IN RBR.
      mysql-test/suite/ndb/r/ndb_tmp_table_and_DDL.result:
        Test result for bug#49132 base on ndb engine.
      mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test:
        Added the test file to verify if executing DDL statement before
        trying to manipulate a temporary table causes row-based replication
        to break with error 'table does not exist' base on ndb engine.
      mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result:
        Test result for bug#49132 base on myisam engine.
      mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test:
        Added the test file to verify if executing DDL statement before
        trying to manipulate a temporary table causes row-based replication
        to break with error 'table does not exist' base on myisam engine.
      sql/event_db_repository.cc:
        Added code to restore the state of binlog format after the DDL
        statement is binlogged.
      sql/events.cc:
        Added code to restore the state of binlog format after the DDL
        statement is binlogged.
      sql/sp.cc:
        Added code to restore the state of binlog format after the DDL
        statement is binlogged.
      sql/sql_acl.cc:
        Added code to restore the state of binlog format after the DDL
        statement is binlogged.
      sql/sql_udf.cc:
        Added code to restore the state of binlog format after the DDL
        statement is binlogged.
      3cae7d11
    • Magne Mahre's avatar
      Post-commit fix of two tests · f42a200e
      Magne Mahre authored
      The WL#5154 commit added a couple of warning messages that
      was not fixed in the result files for two RPL tests.
      f42a200e