1. 12 Jan, 2006 30 commits
    • unknown's avatar
      ndb - mysql-5.1-wl2325-v7 quick fix · 9764d012
      unknown authored
      
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        separate events as default + typos
      9764d012
    • unknown's avatar
      wl2325 wl2324 · 4c798b42
      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''
      4c798b42
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5872e5ae
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      5872e5ae
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 53462e3b
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      53462e3b
    • unknown's avatar
      WL #1034 (Internal CRON) post-push update · eb201203
      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)
      eb201203
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7e1ea97a
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      7e1ea97a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 56842e5e
      unknown authored
      into  mysql.com:/usr/local/mysql/tmpbuild-5.1
      
      
      56842e5e
    • unknown's avatar
      ndb - wl#2972 tiny bugfix · c126958f
      unknown authored
      
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        bugfix
      storage/ndb/test/ndbapi/test_event_merge.cpp:
        continue
      c126958f
    • unknown's avatar
      Merge mysql.com:/space/pekka/ndb/version/my51 · 78711a86
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51-rbr
      
      
      78711a86
    • unknown's avatar
      Sun compiler fixes. · f8d126a0
      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.
      f8d126a0
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c6599bfc
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      
      c6599bfc
    • unknown's avatar
      ndb_dd_ddl.test: · ed2ecea4
      unknown authored
        Added requested changes to test.
      
      
      mysql-test/t/ndb_dd_ddl.test:
        Added requested changes to test.
      ed2ecea4
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a80cfc9e
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      a80cfc9e
    • unknown's avatar
      WL #1034 (Internal CRON) post-push fixes. · 379d7115
      unknown authored
      fix INSERT/REPLACE statements so test suite runs again.
      The question is why we have 2 parallel universes - 2 different
      ways to start the test suite, a shell and perl version. One more case
      where redundancy makes life nightmare.
      
      
      scripts/mysql_create_system_tables.sh:
        fix INSERT/REPLACE statements so test suite runs again.
        The question is why we have 2 parallel universes - 2 different
        ways to start the test suite, a shell and perl version. One more case
        where redundancy makes life nightmare.
      379d7115
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 712442f7
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      
      712442f7
    • unknown's avatar
      WL #1034 (Internal CRON) post-push fix · d8753a82
      unknown authored
      - add Event_priv to db and host tables
      
      
      scripts/mysql_create_system_tables.sh:
        add event_priv to db and host. will fix failing tests too
      d8753a82
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5bff9721
      unknown authored
      into lmy004.:/work/tmp/mysql-5.1-new
      
      
      5bff9721
    • unknown's avatar
      revert change to SETUP.sh which went through with my push of WL#1034 · 4777b9ae
      unknown authored
      
      BUILD/SETUP.sh:
        go back to -01 and reporting usage of uninitialized variables
      4777b9ae
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 45f3e9ec
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-new
      
      
      45f3e9ec
    • unknown's avatar
      ndb_dd_ddl - fix bug · a5ac8675
      unknown authored
      
      BitKeeper/deleted/.del-ndb_error_reporter~48c84ad377571240:
        Delete: ndb/tools/ndb_error_reporter
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Release file from hash
      a5ac8675
    • unknown's avatar
      ndb - · 9c446ead
      unknown authored
        fix Suma get buffer ptr, adopt to new page pool in tup
      
      
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        Fix new page pool usage
          previously it accepted page = base + RNIL, since it didnt use page anyway, sort of a prefetch...
      9c446ead
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 558d0851
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      558d0851
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · b398198b
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-new
      
      
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      b398198b
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 69f4b6a9
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
      
      
      69f4b6a9
    • unknown's avatar
      sql_table.cc: · 4ab53435
      unknown authored
        Typo fix.
        Thanks Serg for noticing this.
      
      
      sql/sql_table.cc:
        Typo fix.
        Thanks Serg for noticing this.
      4ab53435
    • unknown's avatar
      Fixed typo. · 41315876
      unknown authored
      Really dumb typo....
      
      
      sql/ha_archive.h:
        Fix typo
      41315876
    • unknown's avatar
      Added bitfield support and a test for it. · a549befb
      unknown authored
      Archive uses native row format, so honestly this is just the change in a flag. 
      
      
      sql/ha_archive.h:
        Added bit field support (and dropped the ha_not_exact_count since we always have this).
      mysql-test/r/archive_bitfield.result:
        New BitKeeper file ``mysql-test/r/archive_bitfield.result''
      mysql-test/t/archive_bitfield.test:
        New BitKeeper file ``mysql-test/t/archive_bitfield.test''
      a549befb
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · db35f19d
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      db35f19d
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3c5c5c37
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-5.1
      
      
      3c5c5c37
    • unknown's avatar
      delete the stale file and this should fix the build · 4ee6e77f
      unknown authored
      after my push of WL#1034 (Internal CRON) into 5.1
      
      
      BitKeeper/deleted/.del-event.h~2c9fb599ae4e39e7:
        Delete: libmysqld/event.h
      4ee6e77f
  2. 11 Jan, 2006 10 commits
    • unknown's avatar
      Merge mysql.com:/space/pekka/ndb/version/my51 · 264df6d0
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51-rbr
      
      
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      storage/ndb/test/ndbapi/test_event.cpp:
        Auto merged
      264df6d0
    • unknown's avatar
      ndb - wl#2972 (5.1, related) detached trigger fixes for multiops · 35c2846c
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        detached trigger fixes for multiops
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        detached trigger fixes for multiops
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        detached trigger fixes for multiops
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        detached trigger fixes for multiops
      storage/ndb/test/ndbapi/test_event_merge.cpp:
        detached trigger fixes for multiops
      35c2846c
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 09d2e055
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-5.1
      
      
      09d2e055
    • unknown's avatar
      RBR test updates per lars request · 6c2c8482
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_EE_err.test:
        Splitting tests case per Lars review
      mysql-test/t/rpl_EE_err.test:
        Splitting tests case per Lars review
      mysql-test/r/rpl_EE_err.result:
        Splitting tests case per Lars review
      mysql-test/t/rpl_stm_EE_err2.test:
        New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
        New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
      mysql-test/r/rpl_stm_EE_err2.result:
        New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
      BitKeeper/deleted/.del-rpl_row_EE_err.test~b3d8db3eacbb7af5:
        Delete: mysql-test/extra/rpl_tests/rpl_row_EE_err.test
      BitKeeper/deleted/.del-rpl_row_EE_err.test~6cd033708a4535db:
        Delete: mysql-test/t/rpl_row_EE_err.test
      BitKeeper/deleted/.del-rpl_row_EE_err.result~5ad217703f686c4d:
        Delete: mysql-test/r/rpl_row_EE_err.result
      6c2c8482
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9dc0942a
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      9dc0942a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0966a189
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      0966a189
    • unknown's avatar
      bug: replication of table spaces to work · 45a4daa4
      unknown authored
      bug: check if storage engine is enabled to avoif code dump
      
      
      BitKeeper/etc/ignore:
        Added storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate storage/ndb/test/ndbapi/ndbapi_slow_select storage/ndb/test/ndbapi/testBitfield storage/ndb/test/ndbapi/testLcp storage/ndb/test/ndbapi/testPartitioning storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/tools/listen_event to the ignore list
      45a4daa4
    • unknown's avatar
      WL #1034 · af6d4026
      unknown authored
      - add a bit more debug messages
      - disable events.test for now due to a bug
      
      
      mysql-test/r/events.result:
        fix result
      mysql-test/t/disabled.def:
        make it disabled
      mysql-test/t/events.test:
        disable show processlist
      sql/event_executor.cc:
        a bit more debug messages
      af6d4026
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7355e7d5
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      
      7355e7d5
    • unknown's avatar
      Changes done from Jonas's review of pervious commit · bbed1ba9
      unknown authored
      
      mysql-test/t/ndb_dd_basic.test:
        Changed test.t1 back to t1 per Jonas's review
      mysql-test/r/ndb_dd_basic.result:
        Changed test.t1 back to t1 per Jonas's review
      bbed1ba9