1. 28 Mar, 2006 11 commits
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fd1303ea
      unknown authored
      into lmy004.:/work/mysql-5.1-bug14356
      
      
      mysql-test/r/events.result:
        Auto merged
      mysql-test/r/events_bugs.result:
        Auto merged
      mysql-test/t/events.test:
        Auto merged
      mysql-test/t/events_bugs.test:
        Auto merged
      fd1303ea
    • unknown's avatar
      Filed bugs against two tests, and then disabled them. · 16f5ad56
      unknown authored
      
      mysql-test/t/disabled.def:
        Adding two more failing tests to the def file.
      16f5ad56
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 73970add
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.1
      
      
      include/mysql.h:
        Auto merged
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      73970add
    • unknown's avatar
      Merge zim.(none):/home/ian/workspace/mysql-5.0 · effd72a9
      unknown authored
      into  zim.(none):/home/ian/workspace/mysql-5.1-new
      
      Updated bug message in disabled file -Brian
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/mysql.h:
        Auto merged
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/parse_file.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      mysql-test/t/disabled.def:
        Changing message to add in bug numnber
      effd72a9
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 · 6da39a4c
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
      
      
      include/mysql.h:
        Auto merged
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      6da39a4c
    • unknown's avatar
      Fixed bug #18386. · b0654461
      unknown authored
      An invalid assertion in Item_direct_view_ref::eq caused 
      an assertion abort in the debug version.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #18386.
      mysql-test/t/view.test:
        Added a test case for bug #18386.
      sql/item.cc:
        Fixed bug #18386.
        An invalid assertion in Item_direct_view_ref::eq caused 
        an assertion abort in the debug version.
        Changed the assertion.
      b0654461
    • unknown's avatar
      Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4faee665
      unknown authored
      into  zim.(none):/home/ian/workspace/mysql-5.0
      
      
      4faee665
    • unknown's avatar
      Disable udf test · 63605b9f
      unknown authored
      
      BitKeeper/etc/ignore:
        Added mysql-test/r/udf.log to the ignore list
      mysql-test/t/disabled.def:
        Disable the udf test, per bug #18564. Permission by Brian
      63605b9f
    • unknown's avatar
      Removing deleted file (this fixes the pushbuild failure from Reggie's push). · 9c9e0684
      unknown authored
      There still may be issues on the Window's side from what I can see from doing a grep. 
      
      
      sql/Makefile.am:
        Removing deleted file.
      9c9e0684
    • unknown's avatar
      Disabling test for rpl_ndb_sp007 · cd493c5a
      unknown authored
      
      mysql-test/t/disabled.def:
        Adding in disabled test
      cd493c5a
    • unknown's avatar
      Fix for bug #16855 · af64d85a
      unknown authored
      
      BitKeeper/etc/ignore:
        Added mysql-test/r/bdb.log mysql-test/r/im_client_port.log to the ignore list
      client/mysql.cc:
        If --socket is not set, provides --protocol=TCP when --port=
        is specified (and --protocol= is not specified.)
      af64d85a
  2. 27 Mar, 2006 29 commits