1. 01 Feb, 2007 2 commits
  2. 31 Jan, 2007 1 commit
  3. 30 Jan, 2007 10 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 7c9da59b
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      storage/ndb/include/ndbapi/NdbOperation.hpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbTransaction.hpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbIndexStat.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbOperationExec.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      storage/ndb/test/include/HugoOperations.hpp:
        Auto merged
      storage/ndb/test/ndbapi/testNdbApi.cpp:
        Auto merged
      storage/ndb/test/src/HugoOperations.cpp:
        Auto merged
      7c9da59b
    • unknown's avatar
      ndb - interface change of handling of abort option · 16c58c11
      unknown authored
      1) move AbortOption from NdbTransaction to NdbOperation
      
      2) let each operation have a "default" abort option dependant on
         operation type
      
         - read - AO_IgnoreError
         - dml - AbortOnError
         - scan take over - AbortOnError
      
      3) Changed default value to execute() from AbortOnError to DefaultAbortOption, which does not change the operations abort-option.
      
         Another value to execute(AO) is equivalent to setting AO on each operation before calling execute
      
      4) execute() does _only_ return -1 if transaction has been aborted
         otherwise, you need to check each operation for error code
      
      
      sql/ha_ndbcluster.cc:
        adopt to changes in aption option handling
      storage/ndb/include/ndbapi/NdbOperation.hpp:
        Move "ownership" of AbortOption to operation from transaction
      storage/ndb/include/ndbapi/NdbTransaction.hpp:
        Move "ownership" of AbortOption to operation from transaction
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        Move "ownership" of AbortOption to operation from transaction
      storage/ndb/src/ndbapi/NdbIndexStat.cpp:
        Move "ownership" of AbortOption to operation from transaction
      storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
        Put default value on abortoption dependant on operation type
      storage/ndb/src/ndbapi/NdbOperationExec.cpp:
        Move "ownership" of AbortOption to operation from transaction
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Move "ownership" of AbortOption to operation from transaction
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Move "ownership" of AbortOption to operation from transaction
      storage/ndb/test/include/HugoOperations.hpp:
        Move "ownership" of AbortOption to operation from transaction
      storage/ndb/test/ndbapi/testNdbApi.cpp:
        Move "ownership" of AbortOption to operation from transaction
      storage/ndb/test/src/HugoOperations.cpp:
        Move "ownership" of AbortOption to operation from transaction
      16c58c11
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · cb2d1c06
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      cb2d1c06
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · a3fafb90
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/Ndb.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      a3fafb90
    • unknown's avatar
      ndb - · faac0f1d
      unknown authored
        remove copy/paste method in NdbIndexOperation
      
      
      storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
        remove reduntant method
      storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
        remove redundant method
      faac0f1d
    • unknown's avatar
      ndb - minor style fixes · 1425684e
      unknown authored
        
      
      
      storage/ndb/src/ndbapi/Ndb.cpp:
        Fix usage of correct types internally to ndbapi
      storage/ndb/test/ndbapi/testBlobs.cpp:
        minor fixes to testBlobs
      1425684e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · ec325167
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      ec325167
    • unknown's avatar
      valgrind leak · 00985ac9
      unknown authored
      - no injected events if operation is not connected
      - remove extra valgrind checks
      
      
      sql/ha_ndbcluster_binlog.cc:
        removed extra valgrind check
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        valgrind leak
        - no injected events if operation is not connected
      00985ac9
    • unknown's avatar
      ndb - added extra valgrind memleak checks to try to track leak · b15f6e2d
      unknown authored
      
      sql/ha_ndbcluster_binlog.cc:
        added extra valgrind memleak checks to try to track leak
      b15f6e2d
    • unknown's avatar
      ndb - · 80db1a21
      unknown authored
        two small fixes for TC
          1) use static syntax
          2) fix attlen handling in unique index
      
      
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        1) use static syntax
        2) fix attlen handling in unique index
      80db1a21
  4. 28 Jan, 2007 2 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 87bc4822
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testBasic.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      87bc4822
    • unknown's avatar
      ndb - Fix so that node version is recomputed at node failure · 52d0dbd7
      unknown authored
      
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Fix so that node version is recomputed at node failure
      52d0dbd7
  5. 26 Jan, 2007 3 commits
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 6db6be5a
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1
      
      
      sql/item.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      6db6be5a
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt · 33b73c20
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      33b73c20
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 92a7c1ed
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      sql/item.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      92a7c1ed
  6. 25 Jan, 2007 13 commits
  7. 24 Jan, 2007 9 commits
    • unknown's avatar
      Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 · a8580967
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a8580967
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 24903ed5
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
      
      
      sql/mysqld.cc:
        Auto merged
      24903ed5
    • unknown's avatar
      BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...): · a3416606
      unknown authored
      Fixed typo problem that surfaced after the merge
      
      
      a3416606
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 247bd923
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/myisam.result:
        Use local.
      mysql-test/t/myisam.test:
        Use local.
      247bd923
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 · 1cf81178
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_packrec.c:
        Auto merged
      mysql-test/r/myisam.result:
        Manually merged.
      mysql-test/t/myisam.test:
        Manually merged.
      1cf81178
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 53491b18
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21029
      
      
      Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      53491b18
    • unknown's avatar
      Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected) · 39cc6d11
      unknown authored
      The build scripts in general, using automake, autoconf, etc, contain several
      special commands and work around all related to the way the bison code in the
      parser is built, for sql/sql_yacc.yy. These work arounds, accumulated over
      time during development, ultimately cause the build scripts to be unstable
      and cause build defects by not enforcing dependencies.
      
      This fix simplifies the build process and aligns it with the automake tooling,
      which provides native support for bison and *.yy files.
      
      In particular, the following problem have been fixed:
      - dependencies with sql_yacc.cc were not honored (Bug 21029), leading to
        corrupted builds,
      - the work around introduced by Bug 24557, to cleanup the generated files
        sql_yacc.h and sql_yacc.cc, has been removed,
      - the generated makefile, in a source distribution, used to destroy the files
        sql_yacc.h and sql_yacc.cc on a 'make clean' target. This has been fixed:
        these files are now removed by make maintainer-clean.
      - The root cause of the problem found with gcc 4.1 (see Bug 24619) has been
        clearly documented, and the "sed" hack has been replaced by a cleaner
        work around, when building the code with bison 1.875.
      - Removed the file sql/sql_yacc.yy.bak, added by WL 3031 by accident.
      - Removed the unnecessary AM_YFLAG= --debug introduced by WL 3432, since
        the compiling option DBUG_OFF takes precedence when setting YYDEBUG.
      
      
      BitKeeper/deleted/.del-sql_yacc.yy.bak:
        Rename: sql/sql_yacc.yy.bak -> BitKeeper/deleted/.del-sql_yacc.yy.bak
      Makefile.am:
        General cleanup of the build process for sql_yacc.yy
      sql/Makefile.am:
        General cleanup of the build process for sql_yacc.yy
      sql/sql_yacc.yy:
        General cleanup of the build process for sql_yacc.yy
      39cc6d11
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · 2ed7eaf5
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      mysql-test/t/myisam.test:
        Auto merged
      2ed7eaf5
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · c26ffedb
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/myisam.result:
        Manually merged.
      mysql-test/t/myisam.test:
        Manually merged.
      c26ffedb