1. 08 Feb, 2007 2 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · f40fe807
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.0-rpl-24432
      
      
      f40fe807
    • unknown's avatar
      Fix for BUG#24432 · 914ae41f
      unknown authored
      "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
      When in an INSERT ON DUPLICATE KEY UPDATE, using
      an autoincrement column, we inserted some autogenerated values and
      also updated some rows, some autogenerated values were not used
      (for example, even if 10 was the largest autoinc value in the table
      at the start of the statement, 12 could be the first autogenerated
      value inserted by the statement, instead of 11). One autogenerated
      value was lost per updated row. Led to exhausting the range of the
      autoincrement column faster.
      Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
      This bug breaks replication from a pre-5.0.24 master.
      But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
      behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34]
      master to a fixed (5.0.36) slave! To warn users against this when
      they upgrade their slave, as agreed with the support team, we add
      code for a fixed slave to detect that it is connected to a buggy
      master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
      likely to break replication, in which case it cannot replicate so
      stops and prints a message to the slave's error log and to SHOW SLAVE
      STATUS.
      For 5.0.36->[5.0.24,5.0.34] replication we cannot warn as master
      does not know the slave's version (but we always recommended to users
      to have slave at least as new as master).
      As agreed with support, I'll also ask for an alert to be put into
      the MySQL Network Monitoring and Advisory Service.
      
      
      mysql-test/r/rpl_insert_id.result:
        results to check the bugfix; without the bugfix, you would see, in
        master and slave:
        "3,2" instead of "2,2" for the INSERT VALUES testcase,
        "11,6,..." instead of "6,6,..." for the INSERT SELECT testcase.
      mysql-test/t/rpl_insert_id.test:
        testing that BUG#24432 is fixed
      sql/log_event.cc:
        A trick to force the master to pretend it is old and features BUG#24432.
        To do fast lookups in the list of known bugs by version, we compute
        the 3 X.Y.Z numbers from the master's version string and cache that
        into a new member Format_description_log_event::server_version_split.
        We do this computation in the event's two constructors.
        A simple prevention against buffer overrun when reading the master's
        version from a binlog event (assume the event is corrupted on disk,
        and so the version string on disk is longer than ST_SERVER_VER_LEN
        (50), then we would not get a closing 0 at the end of the class member.
      sql/log_event.h:
        new member to hold the "split server version" (3 numbers X.Y.Z),
        and a method to compute this from the version string.
      sql/slave.cc:
        a function which tells, based on master's version (as found
        in the Format_description event in the relay log being executed),
        if master can have a certain bug. This function uses a list of
        bug_id / first_version_with_bug / first_version_with_fix.
        If the test is positive, a short error message is put into SHOW SLAVE
        STATUS, and a verbose message is put into the slave's error log.
        The caller is expected to stop the slave in this case.
      sql/slave.h:
        new function to test if the replication master has a bug
      sql/sql_insert.cc:
        Fix for BUG#24432:t he reason was a misplaced restore_auto_increment() 
        (misplaced when fixing BUG#20188). Indeed, when updating the row,
        it is clear that the autogenerated auto_increment value will not be
        used for this row (and if by "chance" the autoinc value present
        in the updated row is >= to the not used autogenerated value,
        adjust_next_insert_id_after_explicit_value() will fix next_insert_id).
        We also add code for a fixed slave to detect that it is connected to
        a buggy master (in which case it cannot replicate so stops).
      mysql-test/r/rpl_known_bugs_detection.result:
        see that SHOW SLAVE STATUS prints information that slave found a bug
        in master, and does not execute the dangerous event (table stays
        empty).
      mysql-test/t/rpl_known_bugs_detection-master.opt:
        pass debug symbol to make the master pretend it has BUG#24432
      mysql-test/t/rpl_known_bugs_detection.test:
        new test to see if bug detection by slave works
      914ae41f
  2. 24 Jan, 2007 1 commit
    • unknown's avatar
      Bug#25815 Data truncated for column TEXT · fb33da5f
      unknown authored
      Problem: "Data truncated" warning was incorrectly generated
      when storing a Japanese character encoded in utf8
      into a cp932 column.
      Reason: Incorrect wrong warning condition
      compared the original length of the character in bytes
      (which is 3 in utf8) to the converted length of the
      character in bytes (which is 2 in cp932).
      Fix: use "how many bytes were scanned from input" instead
      of "how many bytes were put to the column" in the condition.
      
      
      mysql-test/r/ctype_cp932.result:
        Adding test case
      mysql-test/t/ctype_cp932.test:
        Adding test case
      sql/field.cc:
        Change warning condition from:
        "if number of bytes written to destination is less than full source length"
        to
        "if number of bytes read from source is less than full source length"
      fb33da5f
  3. 18 Jan, 2007 2 commits
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl · 501bf6de
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_21490
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      501bf6de
    • unknown's avatar
      BUG#21490 - No warning issued for deprecated replication parameters · cf0b194d
      unknown authored
      This patch deprecates the replication startup options in the configuration
      file and on the command line. The options deprecated include:
      
      MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
      MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
      and MASTER_SSL_CIPHER
      
      The code is designed to print the warning message once.
      
      
      sql/mysql_priv.h:
        BUG#21490 - No warning issued for deprecated replication parameters
        This patch modifies the WARN_DEPRECATED macro to permit displaying a deprecated 
        warning to the user at startup when the replication startup options are detected.
        It displays the same messae as the original version of the macro but allows the 
        macro to be called before a thread is created and the ER() macro is defined.
      cf0b194d
  4. 17 Jan, 2007 7 commits
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 9cd17b6c
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      9cd17b6c
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 55fbeec1
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      55fbeec1
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · 158b0603
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      158b0603
    • unknown's avatar
      Disable symlinks under valgrind builds (again), with a comment. · c9078c40
      unknown authored
      
      sql/mysqld.cc:
        Once again, disable symlink.test under valgrind builds. symlink.test
        fails deep in mi_repair - the result of this having been disabled
        for almost 5 years.
      c9078c40
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · eeaf11b2
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
      
      
      sql/sql_parse.cc:
        SCCS merged
      eeaf11b2
    • unknown's avatar
      Fix a failure of lowercase_tables2 test on powermacg5, introduced · f7e41bae
      unknown authored
      by the patch for Bug#4968
      
      
      sql/sql_parse.cc:
        Fix lowercase_tables2 test failure on powermacg5: table_case_name()
        function needed create_info.alias if lowercase_table_names=2, which
        was not set for the stack copy of HA_CREATE_INFO. Move the
        update of create_info.alias from create_table_precheck to 
        mysql_execute_command, so that it is done on the right object.
      f7e41bae
    • unknown's avatar
      Fix a ps.test failure in 5.0-runtime tree. · 06bc6836
      unknown authored
      
      mysql-test/r/ps.result:
        Update result files.
      mysql-test/t/ps.test:
        Disable result ouptut of SHOW CREATE TABLE: DATA DIRECTORY option
        may be present or absent from the output depending on the build
        otpions and the operating system, so the output is not consistent
        across supported platforms.
      sql/mysqld.cc:
        Remove a tricky #ifdef dependency of --use-symbolic-links on PURIFY
        added in 2002: DEBUG options should not influence server functionality.
        This backfired by producing different output of SHOW CREATE TABLE
        depending on the build options (see also Bug#25677 "With 
        --skip-symbolic-links option on, DATA DIRECTORY clause
        is silently ignored".
      06bc6836
  5. 16 Jan, 2007 3 commits
  6. 15 Jan, 2007 11 commits
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · f71b6a84
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-6298
      
      
      f71b6a84
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 095e2527
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      095e2527
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 2ba119c6
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      sql/sql_parse.cc:
        Auto merged
      2ba119c6
    • unknown's avatar
      A post-merge fix. · 15c83425
      unknown authored
      
      sql/sql_parse.cc:
        A post-merge fix (broken alter_table.test): restore Svoj's fix
        for Bug#23404 lost during merge.
      15c83425
    • unknown's avatar
      Raise version number after cloning 5.0.34 · 7118b2c3
      unknown authored
      7118b2c3
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 60348574
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      VC++Files/mysql.dsw:
        Auto merged
      VC++Files/mysqldemb/mysqldemb.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsp:
        Auto merged
      VC++Files/sql/mysqldmax.dsp:
        Auto merged
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/ha/ha0ha.c:
        Auto merged
      innobase/include/hash0hash.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/log/log0recv.c:
        Auto merged
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      60348574
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 96e5be8c
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
      
      
      sql/sql_select.cc:
        Auto merged
      96e5be8c
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push · 30393ec4
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-4968-to-push
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Use local
      30393ec4
    • unknown's avatar
      Manual merge. · 408d7752
      unknown authored
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      408d7752
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime · d470c233
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      d470c233
    • unknown's avatar
      Fix for bug#20390 "SELECT FOR UPDATE does not release locks · 810fc001
      unknown authored
      of untouched rows in full table scans".
      
      SELECT ... FOR UPDATE/LOCK IN SHARE MODE statements as well as
      UPDATE/DELETE statements which were executed using full table
      scan were not releasing locks on rows which didn't satisfy
      WHERE condition.
      This bug surfaced in 5.0 and affected NDB tables. (InnoDB tables
      intentionally don't support such unlocking in default mode).
      
      This problem occured because code implementing join didn't call
      handler::unlock_row() for rows which didn't satisfy part of condition
      attached to this particular table/level of nested loop. So we solve
      the problem adding this call.
      Note that we already had this call in place in 4.1 but it was lost
      (actually not quite correctly placed) when we have introduced nested 
      joins.
      
      Also note that additional QA should be requested once this patch is
      pushed as interaction between handler::unlock_row() and many recent
      MySQL features such as subqueries, unions, views is not tested enough.
      
      
      mysql-test/r/ndb_lock.result:
        Enabled back part of the test that covers bug #20390 "SELECT FOR
        UPDATE does not release locks of untouched rows in full table scans".
        Adjusted test in such way that it now covers both execution paths
        in which we unlock non-matching rows inspected during table scan.
      mysql-test/t/ndb_lock.test:
        Enabled back part of the test that covers bug #20390 "SELECT FOR
        UPDATE does not release locks of untouched rows in full table scans".
        Adjusted test in such way that it now covers both execution paths
        in which we unlock non-matching rows inspected during table scan.
      sql/sql_select.cc:
        evaluate_join_record() should call handler::unlock_row() for records
        which don't satisfy condition which was pushed-down to this table/level
        of nested loop.
        We just put back the thing that we already have in 4.1 and which was lost
        when we have introduced nested joins.
      810fc001
  7. 12 Jan, 2007 11 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 31e01f0a
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      VC++Files/mysql.dsw:
        Auto merged
      VC++Files/mysqldemb/mysqldemb.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsp:
        Auto merged
      VC++Files/sql/mysqldmax.dsp:
        Auto merged
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/ha/ha0ha.c:
        Auto merged
      innobase/include/hash0hash.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/log/log0recv.c:
        Auto merged
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      31e01f0a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · fc681ea7
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      fc681ea7
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 87be629e
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      87be629e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f9a8075
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      
      5f9a8075
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 611299bb
      unknown authored
      into  trift2.:/MySQL/M41/mysql-4.1
      
      
      611299bb
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · ecc3a619
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_locale.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      ecc3a619
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · 6dc02026
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
      
      
      sql/sql_parse.cc:
        Auto merged
      6dc02026
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 7a9892cc
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      7a9892cc
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 36e7e727
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      sql/mysqld.cc:
        Auto merged
      36e7e727
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · 4713caa7
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      4713caa7
    • unknown's avatar
      mysql_explain_log.sh: · 3685d889
      unknown authored
        Patch from Paul DuBois for better help messages
      
      
      scripts/mysql_explain_log.sh:
        Patch from Paul DuBois for better help messages
      3685d889
  8. 11 Jan, 2007 3 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 4a819ce1
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      sql/item_func.cc:
        Auto merged
      4a819ce1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6ab5bdf3
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      heap/hp_block.c:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      server-tools/instance-manager/listener.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      heap/hp_write.c:
        SCCS merged
      6ab5bdf3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · fcbe66a3
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      
      sql/item_func.cc:
        Auto merged
      fcbe66a3