1. 17 Nov, 2006 2 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/yassl-win-5.0 · 94d7389b
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      94d7389b
    • unknown's avatar
      Maintain the (old) VC project files, ehere yaSSL is concerned: · 26dee875
      unknown authored
      "mySTL" has become a subdirectory of "taocrypt", was a sibling previously.
      
      
      extra/yassl/taocrypt/benchmark/benchmark.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/taocrypt/taocrypt.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/taocrypt/taocrypt.vcproj:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/taocrypt/test.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/testsuite/testsuite.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/yassl.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/yassl.vcproj:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      26dee875
  2. 16 Nov, 2006 6 commits
  3. 15 Nov, 2006 10 commits
  4. 14 Nov, 2006 9 commits
  5. 13 Nov, 2006 3 commits
  6. 12 Nov, 2006 3 commits
    • unknown's avatar
      bug#19402 SQL close to the size of the max_allowed_packet fails on the slave · 57ba34ff
      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
      57ba34ff
    • unknown's avatar
      Correcting BUG/WL identifier extraction to allow multiple references to auxilary · a403c2f9
      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
      a403c2f9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 383fbde5
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      383fbde5
  7. 11 Nov, 2006 3 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 3af223ed
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      3af223ed
    • unknown's avatar
      mysql-test-run.pl: · c6d31783
      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
      c6d31783
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 75a0878f
      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)
      75a0878f
  8. 10 Nov, 2006 4 commits
    • unknown's avatar
      Merge trift2.:/M50/mysql-5.0 · 2220a3a8
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      2220a3a8
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 40896957
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
      
      
      40896957
    • unknown's avatar
      Merge trift2.:/MySQL/M50/bug24023-5.0 · f4113236
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
        Auto merged
      f4113236
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 56934f9d
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
        Auto merged
      configure.in:
        Auto merged
      include/my_time.h:
        Auto merged
      mysql-test/install_test_db.sh:
        Auto merged
      mysql-test/mysql-test-run.sh:
        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/rename.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/time.cc:
        Auto merged
      myisam/sort.c:
        Manual merge: "use local" (= 5.0 version).
      mysql-test/mysql-test-run.pl:
        Manual merge, part of the fix for bug#17194.
      56934f9d