1. 04 May, 2004 1 commit
    • unknown's avatar
      Merge NDB patches into 4.1-clone, below is list of changesets · 5f02d41c
      unknown authored
      # --------------------------------------------
      # 04/04/13      joreland@mysql.com      1.1858.1.1
      # Removal of NDBT_Table
      # --------------------------------------------
      # 04/04/13      joreland@mysql.com      1.1858.1.2
      # Removal of NDBT_Table
      # --------------------------------------------
      # 04/04/13      joreland@mysql.com      1.1858.1.3
      # Fix for crashing AT
      # --------------------------------------------
      # 04/04/13      joreland@mysql.com      1.1858.1.4
      # Bug fixes in testIndex
      # --------------------------------------------
      # 04/04/13      joreland@mysql.com      1.1866.1.5
      # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
      # into mysql.com:/home/jonas/src/tmp
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1858.1.5
      # Fix for takeover when accessing indexes.
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1866.1.6
      # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
      # into mysql.com:/home/jonas/src/tmp
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1858.2.1
      # Fixed error handling of fire_trigger_ord + lqhkeyref w.r.t indexes
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1858.2.2
      # Simple retry mechanism in UTIL
      # Helps testIndex -n BuildDuring _a lot_
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1858.2.3
      # Misc fixes to test prg.
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1858.2.4
      # Allow more retires on application errors
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1858.2.5
      # Pass no of rows fetched in SUB_SYNC_CONTINUE_REQ
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1869
      # wl1714
      # Improve parallellism
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1870
      # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
      # into mysql.com:/home/jonas/src/wl1714
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1866.1.7
      # Merge
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1871
      # Merge mysql.com:/home/jonas/src/wl1714
      # into mysql.com:/home/jonas/src/mysql-4.1-ndb
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1872
      # Fix for testScan -n ScanReadError5030
      # --------------------------------------------
      # 04/04/14      joreland@mysql.com      1.1873
      # fix testDict -n FragmentType*
      # --------------------------------------------
      # 04/04/14      johan@stingray.(none)   1.1866.2.1
      # small fixes
      # --------------------------------------------
      # 04/04/14      johan@stingray.(none)   1.1874
      # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
      # into stingray.(none):/space/bk/rep/mysql-4.1-ndb
      # --------------------------------------------
      # 04/04/14      johan@stingray.(none)   1.1875
      # handle rep node as an api node
      # --------------------------------------------
      # 04/04/14      pekka@mysql.com 1.1873.1.1
      # Fix for NDBT_Table removal
      # --------------------------------------------
      # 04/04/15      joreland@mysql.com      1.1873.1.2
      # Uninitialized var.
      # --------------------------------------------
      # 04/04/15      johan@stingray.(none)   1.1876
      # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
      # into stingray.(none):/space/bk/rep/mysql-4.1-ndb
      # --------------------------------------------
      # 04/04/15      joreland@mysql.com      1.1873.1.3
      # Write pid before changing user
      # (as runas user probably doesn't have permissions on pid-dir)
      # --------------------------------------------
      # --------------------------------------------
      # 04/04/15      ndb@mc03.ndb.mysql.com  1.1862.1.3
      # Fix printout of varchars
      # --------------------------------------------
      # 04/04/15      ndb@mc03.ndb.mysql.com  1.1877
      # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
      # into mc03.ndb.mysql.com:/space/ndb/tmp
      # --------------------------------------------
      # 04/04/15      ndb@mc03.ndb.mysql.com  1.1862.1.4
      # Hmm.. don't print attr as many times as length of array
      # --------------------------------------------
      # 04/04/15      ndb@mc03.ndb.mysql.com  1.1878
      # Merge mc03.ndb.mysql.com:/space/ndb/mysql-4.1-ndb
      # into mc03.ndb.mysql.com:/space/ndb/tmp
      # --------------------------------------------
      # 04/04/15      joreland@mysql.com      1.1876.1.1
      # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
      # into mysql.com:/home/jonas/src/mysql-4.1-ndb
      # --------------------------------------------
      # 04/04/15      joreland@mysql.com      1.1877.1.1
      # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
      # into mysql.com:/home/jonas/src/mysql-4.1-ndb
      # --------------------------------------------
      # 04/04/15      ndb@mc03.ndb.mysql.com  1.1879
      # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
      # into mc03.ndb.mysql.com:/space/ndb/tmp
      # --------------------------------------------
      # 04/04/17      joreland@mysql.com      1.1880
      # LCP bug when restarting ops take's longer than DIH sending a new lcp ord
      # Solution:
      # Send LCP_FRAG_REP after restarting all ops
      # --------------------------------------------
      # 04/04/18      joreland@mysql.com      1.1881
      # Missspelled ERROR_INSERT
      # --------------------------------------------
      # 04/04/18      joreland@mysql.com      1.1882
      # Added possibility to log only distributed signals
      # --------------------------------------------
      # 04/04/22      joreland@mysql.com      1.1883
      # Removed dependancy to libstdc++
      # * pure virtual functions "__cxa_pure_virtual" is defined in libstd++ ->
      #   remove all pure virtual functions
      # --------------------------------------------
      # 04/04/23      joreland@mysql.com      1.1884
      # Various minor bug fixes for problems found while compiling
      # with icc
      # --------------------------------------------
      # --------------------------------------------
      # 04/04/25      joreland@mysql.com      1.1885
      # Removed debug code (joreland:1.1875)
      # --------------------------------------------
      # 04/04/26      ejonore@mc03.ndb.mysql.com      1.1862.1.5
      # Lock pages in memory _after_ daemon-mode (exec/fork)
      # --------------------------------------------
      # 04/04/27      ejonore@mc03.ndb.mysql.com      1.1862.1.6
      # 1) Trap abort()
      # 2) StopStart/StopAborted events
      # 3) warning if memlock fails
      # 4) use g_logger more often (instead of ndbout)
      # 
      # --------------------------------------------
      # 04/04/27      joreland@mysql.com      1.1886
      # bug fix for a bug in wl1714 + software upgrade
      # --------------------------------------------
      # 04/04/27      joreland@mysql.com      1.1887
      # Cset exclude: joreland@mysql.com|ChangeSet|20040422160720|05374
      # --------------------------------------------
      # 04/04/27      joreland@mysql.com      1.1888
      # removed libstc++ second try...
      # --------------------------------------------
      # 04/04/28      ejonore@mc03.ndb.mysql.com      1.1862.1.7
      # 1) Don't lock FUTURE pages but only current
      # 2) Do this when SIZEALT has completed
      # --------------------------------------------
      # 04/04/30      joreland@mysql.com      1.1889
      # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x
      # into mysql.com:/home/jonas/src/mysql-4.1-ndb
      # --------------------------------------------
      # 04/05/03      ndb@mc03.ndb.mysql.com  1.1862.1.8
      # Version update
      # --------------------------------------------
      # 04/05/03      joreland@mysql.com      1.1862.3.1
      # Changed restart behavior.
      # Use "angel" process which monitor "real" process
      # --------------------------------------------
      # 04/05/03      joreland@mysql.com      1.1862.1.9
      # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x
      # into mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x
      # --------------------------------------------
      # 04/05/03      joreland@mysql.com      1.1890
      # Merge B2 fixes
      # --------------------------------------------
      # --------------------------------------------
      # 04/05/03      joreland@mysql.com      1.1862.1.10
      # Better handling of children terminations
      # --------------------------------------------
      # 04/05/03      joreland@mysql.com      1.1862.1.11
      # Fixes for angel-restarting
      # --------------------------------------------
      # 04/05/03      joreland@mysql.com      1.1891
      # Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x
      # into mysql.com:/home/jonas/src/mysql-4.1-ndb
      # --------------------------------------------
      #
      
      
      ndb/config/Defs.LINUX.x86.GCC.mk:
        Merge ndb fixes
      ndb/examples/ndbapi_async_example/Makefile:
        Merge ndb fixes
      ndb/examples/ndbapi_async_example/ndbapi_async.cpp:
        Merge ndb fixes
      ndb/examples/ndbapi_scan_example/Makefile:
        Merge ndb fixes
      ndb/include/debugger/SignalLoggerManager.hpp:
        Merge ndb fixes
      ndb/include/kernel/signaldata/ScanFrag.hpp:
        Merge ndb fixes
      ndb/include/ndb_version.h:
        Merge ndb fixes
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Merge ndb fixes
      ndb/include/util/SocketServer.hpp:
        Merge ndb fixes
      ndb/src/common/debugger/SignalLoggerManager.cpp:
        Merge ndb fixes
      ndb/src/common/logger/ConsoleLogHandler.cpp:
        Merge ndb fixes
      ndb/src/common/portlib/unix/NdbMem.c:
        Merge ndb fixes
      ndb/src/common/util/Makefile:
        Merge ndb fixes
      ndb/src/common/util/version.c:
        Merge ndb fixes
      ndb/src/cw/cpcd/Process.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/ERROR_codes.txt:
        Merge ndb fixes
      ndb/src/kernel/blocks/backup/restore/Restore.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/backup/restore/Restore.hpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/backup/restore/main.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/ndbfs/Filename.cpp:
        Merge ndb fixes
      ndb/src/kernel/blocks/suma/Suma.cpp:
        Merge ndb fixes
      ndb/src/kernel/error/Error.hpp:
        Merge ndb fixes
      ndb/src/kernel/ndb-main/Main.cpp:
        Merge ndb fixes
      ndb/src/kernel/vm/Configuration.cpp:
        Merge ndb fixes
      ndb/src/kernel/vm/Configuration.hpp:
        Merge ndb fixes
      ndb/src/kernel/vm/DLFifoList.hpp:
        Merge ndb fixes
      ndb/src/kernel/vm/Emulator.cpp:
        Merge ndb fixes
      ndb/src/kernel/vm/SignalCounter.hpp:
        Merge ndb fixes
      ndb/src/kernel/vm/SimulatedBlock.cpp:
        Merge ndb fixes
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Merge ndb fixes
      ndb/src/mgmsrv/NodeLogLevel.cpp:
        Merge ndb fixes
      ndb/src/ndbapi/ClusterMgr.cpp:
        Merge ndb fixes
      ndb/src/ndbapi/Ndberror.cpp:
        Merge ndb fixes
      ndb/src/rep/rep_version.hpp:
        Merge ndb fixes
      ndb/test/ndbapi/testDict/testDict.cpp:
        Merge ndb fixes
      ndb/test/ndbapi/testIndex/testIndex.cpp:
        Merge ndb fixes
      ndb/test/ndbapi/testMgm/testMgm.cpp:
        Merge ndb fixes
      ndb/test/ndbapi/testScan/testScan.cpp:
        Merge ndb fixes
      ndb/test/src/HugoTransactions.cpp:
        Merge ndb fixes
      ndb/test/src/NDBT_Tables.cpp:
        Merge ndb fixes
      ndb/test/src/NDBT_Test.cpp:
        Merge ndb fixes
      ndb/test/src/UtilTransactions.cpp:
        Merge ndb fixes
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      5f02d41c
  2. 03 May, 2004 6 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 4841aa28
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      4841aa28
    • unknown's avatar
      per special request from Ingo :) · 4ab48908
      unknown authored
      4ab48908
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · eaeefcea
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-wl1700-diff
      
      
      sql/mysqld.cc:
        Auto merged
      eaeefcea
    • unknown's avatar
      WL#1700 - Properly count key_blocks_used and key_blocks_current. · b482283c
      unknown authored
      Introduced a new free blocks list. Free blocks are now re-used before
      new blocks are allocated from the pool. There is a new status variable 
      which can be queried by "show status like key_blocks_unused".
      
      
      include/keycache.h:
        WL#1700 - Properly count key_blocks_used and key_blocks_current.
        free_block_list is the new free blocks list. It is implemented like a stack (LIFO).
        blocks_unused holds the number of never used blocks plus the number of blocks in the free list.
        Removed the variable global_blocks_used, as it was always the same as blocks_used.
      mysql-test/r/key_cache.result:
        WL#1700 - Properly count key_blocks_used and key_blocks_current.
        Inserted some commands which show how key_blocks_used and key_blocks_unused work.
      mysql-test/t/key_cache.test:
        WL#1700 - Properly count key_blocks_used and key_blocks_current.
        Inserted some commands which show how key_blocks_used and key_blocks_unused work.
      mysys/mf_keycache.c:
        WL#1700 - Properly count key_blocks_used and key_blocks_current.
        Introduced a new free blocks list. The introductory comment says it all (I hope).
        Removed the variable global_blocks_used, as it was always the same as blocks_used.
      sql/mysqld.cc:
        WL#1700 - Properly count key_blocks_used and key_blocks_current.
        The blocks_unused count can be queried by "show status like key_blocks_unused".
        Removed the variable global_blocks_used, as it was always the same as blocks_used.
        Introduced SHOW_KEY_CACHE_CONST_LONG for status variables that
        must not be modified (i.e. flushed to zero).
      sql/sql_show.cc:
        WL#1700 - Properly count key_blocks_used and key_blocks_current.
        Introduced SHOW_KEY_CACHE_CONST_LONG for status variables that
        must not be modified (i.e. flushed to zero).
      sql/sql_test.cc:
        WL#1700 - Properly count key_blocks_used and key_blocks_current.
        Removed the variable global_blocks_used, as it was always the same as blocks_used.
      sql/structs.h:
        WL#1700 - Properly count key_blocks_used and key_blocks_current.
        Introduced SHOW_KEY_CACHE_CONST_LONG for status variables that
        must not be modified (i.e. flushed to zero).
      b482283c
    • unknown's avatar
      - enabled compiling with NDB cluster in compile-pentium-debug-max · 4bde9b83
      unknown authored
      
      BUILD/compile-pentium-debug-max:
         - enable compiling with NDB cluster
      4bde9b83
    • unknown's avatar
      mysql-test-run: -start-from added, cleanup · 1a34c83c
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        -start-from added
        cleanup
      1a34c83c
  3. 01 May, 2004 3 commits
  4. 30 Apr, 2004 12 commits
  5. 29 Apr, 2004 12 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · be5d750a
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-u2
      
      
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      tests/client_test.c:
        Auto merged
      be5d750a
    • unknown's avatar
      Fix for Bug#3035 "Prepared statement integer inserts": now unsigned · d5237fd0
      unknown authored
      flag is sent to server with placeholder types.
      There were no need to extend the protocol as one additional byte
      was reserved for placeholder code, when placeholder code is in range 0-255.
      So this byte is now used for flags. Post-review fixes added.
      
      
      include/config-win.h:
        added floaststore implementation
      include/my_global.h:
        added floatstore implementation
      include/mysql.h:
        Bug#3035:
        added 'is_unsigned' member
        binary_data wasn't used, removed
        null_field wasn't necessary, removed
      include/mysql_com.h:
        Unused defines were removed.
      libmysql/libmysql.c:
        Function store_param_type was removed - too much for a function, especially
        with bug in it.
        New implementation is inline and takes into account signedness of 
        placeholder.
        Fixed store functions to not perform double network-host order conversion
        on high-byte-first systems (should also fix Bug#3578 "Prepared statement 
        integer conversions work wrong in 64-bit Power Mac G5 CPUs").
        null_field removed.
      sql/sql_prepare.cc:
        Placeholder sign is taken into account when reading data from network.
      tests/client_test.c:
        Test for BUG#3035 added: insert and retrieve minimum and maximum of all
        integer types.
      d5237fd0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 258a3d16
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      
      258a3d16
    • unknown's avatar
      Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set · e73e26f3
      unknown authored
      requested by Monty for Bug#1647 (No way to determine what size 
      blob/clob is being returned into bound buffer)
      
      
      include/mysql.h:
        Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set 
        requested by Monty for Bug#1647.
      libmysql/libmysql.c:
        Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set 
        requested by Monty for Bug#1647.
      libmysql/libmysql.def:
        Windows .defs added for new API calls
      e73e26f3
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f9038942
      unknown authored
      into mc05.(none):/space/tomas/mysql-4.1-make
      
      
      f9038942
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 242fe78d
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-my-ps-bugs
      
      
      tests/client_test.c:
        Auto merged
      242fe78d
    • unknown's avatar
      SrcDist.sh, Epilogue.mk: · 6de9b596
      unknown authored
        improved distdir
      
      
      ndb/Epilogue.mk:
        improved distdir
      ndb/SrcDist.sh:
        improved distdir
      6de9b596
    • unknown's avatar
      configure.in: · 9d3d017c
      unknown authored
        added configure options PACKAGE and VERSION for ndb
      GuessConfig.sh:
        added options for PACKAGE and VERSION
      Epilogue.mk:
        Added target distdir
      
      
      ndb/Epilogue.mk:
        Added target distdir
      ndb/config/GuessConfig.sh:
        added options for PACKAGE and VERSION
      configure.in:
        added configure options PACKAGE and VERSION for ndb
      9d3d017c
    • unknown's avatar
      SrcDist.sh: · a8dfb78d
      unknown authored
        new file
      
      
      a8dfb78d
    • unknown's avatar
      - added option for building/packaging the NDB cluster to Do-compile · e3a6ef83
      unknown authored
      
      Build-tools/Do-compile:
         - added option for building/packaging the NDB cluster
      e3a6ef83
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · c5daed7c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      c5daed7c
    • unknown's avatar
      postreview fixes · 709a4a9f
      unknown authored
      709a4a9f
  6. 28 Apr, 2004 2 commits
    • unknown's avatar
      Allow one to send empty strings with mysql_stmt_send_long_data() · ae629fff
      unknown authored
      mysql_stmt_reset() now resets param->long_data_used
      Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
      Fixed problem with symlink test (bug in 4.1.2)
      
      
      libmysql/libmysql.c:
        Allow one to send empty strings with mysql_stmt_send_long_data()
        mysql_stmt_reset() now resets param->long_data_used
      mysys/default.c:
        Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
      sql/unireg.cc:
        Fixed problem with symlink test:  .frm table was not properly deleted if handler create failed
      ae629fff
    • unknown's avatar
      removed ndb odbc from compile and release · 5605374b
      unknown authored
      5605374b
  7. 27 Apr, 2004 4 commits