1. 16 Nov, 2006 2 commits
  2. 15 Nov, 2006 5 commits
  3. 14 Nov, 2006 5 commits
  4. 13 Nov, 2006 3 commits
  5. 12 Nov, 2006 3 commits
    • unknown's avatar
      bug#19402 SQL close to the size of the max_allowed_packet fails on the slave · fdaef4e7
      unknown authored
      comments are fixed as was suggested in reviews.
      
      
      sql/log_event.h:
        fixing comments
      sql/slave.cc:
        fixing comments
      sql/sql_repl.cc:
        fixing comments
      fdaef4e7
    • unknown's avatar
      Correcting BUG/WL identifier extraction to allow multiple references to auxilary · 34f12b36
      unknown authored
      bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified
      the first in the comments. The referred bugs wls can be typed in same as the targeted
      clickable format.
      If the the target of the fix is a WL and there are some references to bugs
      then the first found reference is regarded as "co-target" so that the bug's identifier
      comes up on the subject line along with the WL's and commit mail will update
      the bug page. The latter feature can be disarmed (if there is no need to update
      the referred bug's page) with typing the first a pseudo-bug pattern (bug#0).
      
      This paticular cset will generate subject line containing bug#0 (as it was the first
      referred) whereas the old version would put in the subject line the last referred
      pattern (e.g bug#2147483648).
      
      
      BitKeeper/triggers/post-commit:
        fixing greedyness of old extraction
      34f12b36
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2433e766
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      2433e766
  6. 11 Nov, 2006 3 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 31481f02
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      31481f02
    • unknown's avatar
      mysql-test-run.pl: · c60d8fb1
      unknown authored
        Test for base directory when a RPM install corrected
      
      
      mysql-test/mysql-test-run.pl:
        Test for base directory when a RPM install corrected
      c60d8fb1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5ae4c26e
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      configure.in:
        Auto merged
      include/my_time.h:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/rename.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/im_daemon_life_cycle.imtest:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/time.cc:
        Auto merged
      mysql-test/t/rename.test:
        Use local (resolve a conflict)
      5ae4c26e
  7. 10 Nov, 2006 15 commits
  8. 09 Nov, 2006 4 commits
    • unknown's avatar
      mysql-test/install_test_db.sh · df092d70
      unknown authored
          Adapt to the different path of the server program, if installation was by RPM.
          Missing in the first changeset for bug#17194.
      
      
      mysql-test/install_test_db.sh:
        Adapt to the different path of the server program, if installation was by RPM.
        Missing in the first changeset for bug#17194.
      df092d70
    • unknown's avatar
      Bug#21505 Create view - illegal mix of collation for operation 'UNION' · 7856d3fd
      unknown authored
        
        The problem was that any VIEW columns had always implicit derivation.
        Fix: derivation is now copied from the original expression
        given in VIEW definition.
        For example:
        - a VIEW column which comes from a string constant
          in CREATE VIEW definition have now coercible derivation.
        - a VIEW column having COLLATE clause
          in CREATE VIEW definition have now explicit derivation.
      
      
      mysql-test/r/ctype_utf8.result:
        Adding test case
      mysql-test/t/ctype_utf8.test:
        Adding test case
      sql/field.cc:
        Copying derivation from item to field.
      sql/field.h:
        Adding derivation and methods to get/set it into Field.
      sql/item.cc:
        Copying derivation from field to item.
      sql/item.h:
        Moving "enum Derivation" declaration from item.h to mysql_priv.h
      sql/mysql_priv.h:
        Moving "enum Derivation" declaration from item.h to mysql_priv.h
      sql/sql_select.cc:
        Copying derivation from item to field in
        create_tmp_field_from_item() and create_tmp_field().
      7856d3fd
    • unknown's avatar
      Bug#23619 Incorrectly escaped multibyte characters in binary log break replication · 29936a68
      unknown authored
      Problem: when embedding a character string with introducer with charset X
      into a SQL query which is generally in character set Y, the string constants
      were escaped according to their own character set (i.e.X), then after reading
      such a "mixed" query from binlog, the string constants were unescaped
      using character set of the query (i.e. Y), instead of X, which gave wrong
      results or even syntax errors with tricky charsets (e.g. sjis)
      Fix: when embedding a string constant of charset X into a query of charset Y,
      the string constant is now escaped according to character Y, instead of
      its own character set X.
      
      
      mysql-test/r/ctype_cp932_binlog.result:
        Fixing test results.
      sql/log_event.cc:
        Using character set "csinfo" instead of the string character set.
      sql/sp_head.cc:
        - adding "thd" argument to sp_get_item_value()
          to have access to thd->variables.character_set_client
        - using character_set_client for escaping, instead of
          the string character set
      mysql-test/r/rpl_charset_sjis.result:
        Adding test case
      mysql-test/t/rpl_charset_sjis.test:
        Adding test case
      29936a68
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/41 · 8b7282e2
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50
      
      
      innobase/fil/fil0fil.c:
        use local
      8b7282e2