1. 18 Jan, 2006 1 commit
  2. 13 Jan, 2006 11 commits
  3. 12 Jan, 2006 28 commits
    • unknown's avatar
      ndb - mysql-5.1-wl2325-v7 quick fix · 03f1dbc0
      unknown authored
      
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        separate events as default + typos
      03f1dbc0
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · aa28cde3
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      aa28cde3
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e4ea03b2
      unknown authored
      into  zim.tangent.org:/home/brian/mysql/slap-5.1
      
      e4ea03b2
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 814a0d02
      unknown authored
      into  zim.tangent.org:/home/brian/mysql/slap-5.1
      
      814a0d02
    • unknown's avatar
      Fixed bug #16167 · f6c00fd4
      unknown authored
      Added --use-threads option for porting to Windows. 
      
      
      client/mysqlslap.c:
        Addinng thread option for porting to windows (second piece of code)
        Also added flush call to fix one bug
      mysql-test/r/mysqlslap.result:
        New results
      mysql-test/t/disabled.def:
        Bug 16167 should not be fixed
      mysql-test/t/mysqlslap.test:
        Added test for new use-threads option
      f6c00fd4
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.1 · efd454ed
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.1-wl1563
      
      efd454ed
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5f381457
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      5f381457
    • unknown's avatar
      WL #1034 (Internal CRON) post-push fix · f9825830
      unknown authored
      fix problem that gcc4 does not like at all
      
      
      sql/event.h:
        fix problem that gcc4 does not like at all
      f9825830
    • unknown's avatar
      wl2325 wl2324 · 551f74f0
      unknown authored
      
      mysql-test/include/have_ndb_extra.inc:
        New BitKeeper file ``mysql-test/include/have_ndb_extra.inc''
      mysql-test/include/not_ndb.inc:
        New BitKeeper file ``mysql-test/include/not_ndb.inc''
      mysql-test/r/have_ndb_extra.require:
        New BitKeeper file ``mysql-test/r/have_ndb_extra.require''
      mysql-test/r/ndb_alter_table_row.result:
        New BitKeeper file ``mysql-test/r/ndb_alter_table_row.result''
      mysql-test/r/ndb_alter_table_stm.result:
        New BitKeeper file ``mysql-test/r/ndb_alter_table_stm.result''
      mysql-test/r/ndb_binlog_basic.result:
        New BitKeeper file ``mysql-test/r/ndb_binlog_basic.result''
      mysql-test/r/ndb_binlog_multi.result:
        New BitKeeper file ``mysql-test/r/ndb_binlog_multi.result''
      mysql-test/r/ndb_multi_row.result:
        New BitKeeper file ``mysql-test/r/ndb_multi_row.result''
      mysql-test/r/not_ndb.require:
        New BitKeeper file ``mysql-test/r/not_ndb.require''
      mysql-test/r/rpl_ndb_bank.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_bank.result''
      mysql-test/r/rpl_ndb_basic.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_basic.result''
      mysql-test/r/rpl_ndb_disk.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_disk.result''
      mysql-test/r/rpl_ndb_idempotent.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_idempotent.result''
      mysql-test/r/rpl_ndb_load.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_load.result''
      mysql-test/r/rpl_ndb_multi.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_multi.result''
      mysql-test/r/rpl_ndb_sync.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_sync.result''
      mysql-test/r/rpl_row_basic_7ndb.result:
        New BitKeeper file ``mysql-test/r/rpl_row_basic_7ndb.result''
      mysql-test/t/ndb_alter_table_row.test:
        New BitKeeper file ``mysql-test/t/ndb_alter_table_row.test''
      mysql-test/t/ndb_alter_table_stm.test:
        New BitKeeper file ``mysql-test/t/ndb_alter_table_stm.test''
      mysql-test/t/ndb_binlog_basic.test:
        New BitKeeper file ``mysql-test/t/ndb_binlog_basic.test''
      mysql-test/t/ndb_binlog_multi.test:
        New BitKeeper file ``mysql-test/t/ndb_binlog_multi.test''
      mysql-test/t/ndb_multi_row.test:
        New BitKeeper file ``mysql-test/t/ndb_multi_row.test''
      mysql-test/t/rpl_ndb_bank.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_bank.test''
      mysql-test/t/rpl_ndb_basic.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_basic.test''
      mysql-test/t/rpl_ndb_disk.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_disk.test''
      mysql-test/t/rpl_ndb_idempotent.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_idempotent.test''
      mysql-test/t/rpl_ndb_load.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_load.test''
      mysql-test/t/rpl_ndb_multi.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_multi.test''
      mysql-test/t/rpl_ndb_sync.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_sync.test''
      mysql-test/t/rpl_row_basic_7ndb.test:
        New BitKeeper file ``mysql-test/t/rpl_row_basic_7ndb.test''
      sql/ha_ndbcluster_binlog.cc:
        New BitKeeper file ``sql/ha_ndbcluster_binlog.cc''
      sql/ha_ndbcluster_binlog.h:
        New BitKeeper file ``sql/ha_ndbcluster_binlog.h''
      sql/ha_ndbcluster_tables.h:
        New BitKeeper file ``sql/ha_ndbcluster_tables.h''
      sql/rpl_injector.cc:
        New BitKeeper file ``sql/rpl_injector.cc''
      sql/rpl_injector.h:
        New BitKeeper file ``sql/rpl_injector.h''
      storage/ndb/include/kernel/signaldata/DihFragCount.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/DihFragCount.hpp''
      551f74f0
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 39367cba
      unknown authored
      into  zim.tangent.org:/home/brian/mysql/slap-5.1
      
      39367cba
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3a9db7b2
      unknown authored
      into  zim.tangent.org:/home/brian/mysql/slap-5.1
      
      3a9db7b2
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · fffe3e77
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      fffe3e77
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup · e3c1de87
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      e3c1de87
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup · 8a1b63eb
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
      
      
      mysql-test/t/mysqltest.test:
        Auto merged
      8a1b63eb
    • unknown's avatar
      8e889525
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.1 · 116c1864
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.1-wl1563
      
      116c1864
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d22592f5
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      d22592f5
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.1 · 41cf9fd4
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.1-wl1563
      
      41cf9fd4
    • unknown's avatar
      rpl_sp.test, disabled.def, rpl_stm_mystery22.test: · 25ea466d
      unknown authored
        Test cleanip per lars
      .del-rpl_row_sp000.result~2b24650b123e20a9:
        Delete: mysql-test/r/rpl_row_sp000.result
      .del-rpl_row_sp000.test~645e2807516682b6:
        Delete: mysql-test/t/rpl_row_sp000.test
      .del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
        Delete: mysql-test/t/rpl_row_sp000-slave.opt
      .del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
        Delete: mysql-test/t/rpl_row_sp000-master.opt
      rpl_sp.result:
        Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
      rpl_sp-master.opt:
        Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
      rpl_sp-slave.opt:
        Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
      rpl_sp.test:
        Rename: mysql-test/t/rpl_stm_sp.test -> mysql-test/t/rpl_sp.test
      
      
      mysql-test/t/rpl_sp-slave.opt:
        Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
      mysql-test/t/rpl_sp-master.opt:
        Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
      mysql-test/r/rpl_sp.result:
        Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
      BitKeeper/deleted/.del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
        Delete: mysql-test/t/rpl_row_sp000-master.opt
      BitKeeper/deleted/.del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
        Delete: mysql-test/t/rpl_row_sp000-slave.opt
      BitKeeper/deleted/.del-rpl_row_sp000.test~645e2807516682b6:
        Delete: mysql-test/t/rpl_row_sp000.test
      BitKeeper/deleted/.del-rpl_row_sp000.result~2b24650b123e20a9:
        Delete: mysql-test/r/rpl_row_sp000.result
      mysql-test/t/rpl_stm_mystery22.test:
        Test cleanip per lars
      mysql-test/t/disabled.def:
        Test cleanip per lars
      mysql-test/t/rpl_sp.test:
        Test cleanip per lars
      25ea466d
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 500c656b
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      500c656b
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 010cff1f
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      010cff1f
    • unknown's avatar
      WL #1034 (Internal CRON) post-push update · 4ceb5e6c
      unknown authored
      - fix compile failure on QNX and FreeBSD
      
      
      sql/event_executor.cc:
        time_t and my_time_t seem have the same length so cast
        in tztime.cc it's already done this way.
        Precautionary check at runtime about the sizes of my_time_t and time_t
      sql/event_timed.cc:
        do time_t* cast to satisfy compilers on various platforms
        (QNX, FreeBSD)
      4ceb5e6c
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d8dd1677
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      d8dd1677
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · d6c73fd1
      unknown authored
      into  mysql.com:/usr/local/mysql/tmpbuild-5.1
      
      d6c73fd1
    • unknown's avatar
      ndb - wl#2972 tiny bugfix · c6a5f7d9
      unknown authored
      
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        bugfix
      storage/ndb/test/ndbapi/test_event_merge.cpp:
        continue
      c6a5f7d9
    • unknown's avatar
      Merge mysql.com:/space/pekka/ndb/version/my51 · 40cf6393
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51-rbr
      
      40cf6393
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b54cc19f
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      b54cc19f
    • unknown's avatar
      Sun compiler fixes. · 01a21f8a
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
        Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
        are the same function.
      storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
        Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
        are the same function.
      storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
        Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
        are the same function.
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
        are the same function.
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
        are the same function.
      storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
        Add missing return value, otherwise Sun compiler complains.
      01a21f8a