1. 28 Feb, 2006 8 commits
  2. 27 Feb, 2006 19 commits
  3. 26 Feb, 2006 13 commits
    • unknown's avatar
      Trace mysqlcheck to file mysqlcheck.trcae · 3dea6246
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Let mysqlcheck have it's own trace file
      3dea6246
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7d5ac7e4
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      7d5ac7e4
    • unknown's avatar
      var/tmp does not work (same fix as knielsen did for rpl_row_UUID a few days ago) · abb176ff
      unknown authored
      
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        var/tmp does not work if non-default vardir
      abb176ff
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 15bed7c5
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      15bed7c5
    • unknown's avatar
      Look for and "convert" paths that start with $MYSQL_TMP_DIR · 399617ef
      unknown authored
      
      client/mysqltest.c:
        Also look for "$MYSQL_TMP_DIR" when looking for paths to convert
      mysql-test/mysql-test-run.pl:
        Export $MYSQL_TMP_DIR
      mysql-test/mysql-test-run.sh:
        Export $MYSQL_TMP_DIR
      399617ef
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · ac24b2b7
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
      
      
      sql/sql_table.cc:
        Auto merged
      ac24b2b7
    • unknown's avatar
      Fixed test for bug #13525 "Rename table does not keep info of triggers" · 4fb56f15
      unknown authored
      after merging fix for it with main tree.
      
      
      4fb56f15
    • unknown's avatar
      Cleanups · 422a1406
      unknown authored
      Don't run upgrade.test with embedded server as it requires mysqlcheck
      
      
      mysql-test/r/upgrade.result:
        Change database names to start with mysqltest
      mysql-test/t/upgrade.test:
        Change database names to start with mysqltest
        Don't run test with embedded server as it requires mysqlcheck
      sql/ha_ndbcluster.cc:
        Code style cleanups
        more dbugging
      sql/ha_ndbcluster_binlog.cc:
        Free table_share properly in case of errors
        More debugging
      422a1406
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 1c93eeaa
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
      
      
      sql/sql_table.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_trigger.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/trigger.result:
        SCCS merged
      mysql-test/t/trigger.test:
        SCCS merged
      1c93eeaa
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · c59ae65d
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/handler.h:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      c59ae65d
    • unknown's avatar
      After merge fixes · d25c405d
      unknown authored
      
      BitKeeper/etc/ignore:
        added storage/ndb/src/common/util/testBitmask.cpp
      mysql-test/mysql-test-run.sh:
        Add libmysql_r/.libs to path for shared libraries.
        (Needed for mysqlimport)
      mysql-test/r/ctype_cp932_notembedded.result:
        After merge fix
      mysql-test/r/func_system.result:
        Version number on embedded server can be longer than 40
      mysql-test/r/partition_mgm_err.result:
        Move tests that require symlinks to partion_mgm_err2.test
      mysql-test/r/query_cache.result:
        Fix possible errors from previous tests
      mysql-test/t/ctype_cp932_notembedded.test:
        After merge fix
      mysql-test/t/func_system.test:
        Version number on embedded server can be longer than 40
      mysql-test/t/partition_mgm_err.test:
        Move tests that require symlinks to partion_mgm_err2.test
      mysql-test/t/query_cache.test:
        Fix possible errors from previous tests
      mysys/my_symlink2.c:
        More debugging
      sql/event.cc:
        Code cleanup
      sql/event_executor.cc:
        Ensure that event mutexes are properly cleared up
      sql/mysqld.cc:
        Ensure that event mutexes are properly cleared up
      mysql-test/r/partition_mgm_err2.result:
        New BitKeeper file ``mysql-test/r/partition_mgm_err2.result''
      mysql-test/t/partition_mgm_err2.test:
        New BitKeeper file ``mysql-test/t/partition_mgm_err2.test''
      d25c405d
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4eccd2ae
      unknown authored
      into  zim.(none):/home/brian/mysql/dep-5.1
      
      
      4eccd2ae
    • unknown's avatar
      This patch handles compiles with threads, namely if you don't have pthreads it... · dc936364
      unknown authored
      This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break).
      
      
      client/mysqlimport.c:
        Add in flags to support compiles with no thread support.
      client/mysqlslap.c:
        Add support to source code to compile without threads.
      dc936364