1. 06 May, 2006 1 commit
  2. 04 May, 2006 2 commits
  3. 03 May, 2006 23 commits
  4. 02 May, 2006 14 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c12a5975
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
      
      
      BitKeeper/etc/config:
        Auto merged
      VC++Files/mysql.sln:
        Auto merged
      VC++Files/mysys/mysys.vcproj:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/timezone2.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/tztime.h:
        Auto merged
      tests/Makefile.am:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      c12a5975
    • unknown's avatar
      pekka:get - push push push · 435f3396
      unknown authored
      
      BitKeeper/etc/config:
        pekka:get
      435f3396
    • unknown's avatar
      Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 · 1e592ac0
      unknown authored
      into  mysql.com:/home/dlenev/mysql-5.1-merges
      
      
      VC++Files/mysql.sln:
        Auto merged
      VC++Files/mysys/mysys.vcproj:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/timezone2.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/tztime.h:
        Auto merged
      tests/Makefile.am:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      1e592ac0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4e3dd4cc
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
      
      4e3dd4cc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1061384b
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
      
      1061384b
    • unknown's avatar
      WL#3148: Modifying sizes of i_s.processlist columns ('time', 'info'). · 6635909e
      unknown authored
      
      mysql-test/r/information_schema.result:
        Fixing test case result (after modifying the size of the
         i_s.processlist.info column).
      sql/mysql_priv.h:
        Defined new constant used as the size of the
         i_s.processlist.info column.
      sql/sql_show.cc:
        Modifying sizes of i_s.processlist columns ('time', 'info').
      6635909e
    • unknown's avatar
      More merging assistence. · 7b5575bf
      unknown authored
      Logging behavior changed in early 5.1.  (The filename was never right, but
      the "opt" file is unnecessary in 5.0 anyway.)
      
      
      mysql-test/t/mysql_client_test-master.opt:
        Logging behavior changed in early 5.1.
      7b5575bf
    • unknown's avatar
      WL#3201 post-review fixups · d89e5f5f
      unknown authored
      
      config/ac-macros/plugins.m4:
        WL#3201
          fixup dynamic-only plugin support.
      sql/log.cc:
        fixup static initializers
      d89e5f5f
    • unknown's avatar
      Manually merged · 63dbb53d
      unknown authored
      63dbb53d
    • unknown's avatar
      Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667 · 479fe386
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
      
      
      include/my_sys.h:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      tests/Makefile.am:
        Auto merged
      479fe386
    • unknown's avatar
      An update to as-yet unused new feature of snprintf, which was added to bring · 8106f47f
      unknown authored
      our sprintf()-alike in sync with our fprintf()-alike features.
      
      
      strings/my_vsnprintf.c:
        Advance the destination pointer properly.
        
        Also, pay attention to the "n" in snprintf() -- never write too much.
      8106f47f
    • unknown's avatar
      Fix spelling in comments as requested by Osku · fa993423
      unknown authored
      This will make charset code easier to understand
      
      
      include/m_ctype.h:
        Fix spelling in comments
      mysql-test/t/cast.test:
        Fix spelling in comments
      mysql-test/t/query_cache.test:
        Fix spelling in comments
      sql/sql_string.cc:
        Fix spelling in comments
      strings/CHARSET_INFO.txt:
        Fix spelling in comments
      fa993423
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e4aa059f
      unknown authored
      into  mysql.com:/home/dlenev/mysql-5.0-bg11081
      
      e4aa059f
    • unknown's avatar
      WL#2257 REFERENTIAL_CONSTRAINTS view · b8f321d6
      unknown authored
      added I_S.REFARENTIAL_CONSTRAINTS table
      
      
      mysql-test/r/information_schema.result:
        WL#2257 REFERENTIAL_CONSTRAINTS view
         result fix
      mysql-test/r/information_schema_db.result:
        WL#2257 REFERENTIAL_CONSTRAINTS view
         result fix
      mysql-test/r/information_schema_inno.result:
        WL#2257 REFERENTIAL_CONSTRAINTS view
         test case
      mysql-test/t/information_schema_inno.test:
        WL#2257 REFERENTIAL_CONSTRAINTS view
         test case
      sql/ha_innodb.cc:
        WL#2257 REFERENTIAL_CONSTRAINTS view
      b8f321d6