1. 08 Nov, 2004 20 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6fd2435d
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      6fd2435d
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 415221f3
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      415221f3
    • unknown's avatar
      added ndb test platform test · a3503c75
      unknown authored
      a3503c75
    • unknown's avatar
      compile fix for ndbapi test program on irix (variable scope) · 2f182b3e
      unknown authored
      
      ndb/test/include/NDBT_Test.hpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/ScanFunctions.hpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testDataBuffers.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testDeadlock.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testDict.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testIndex.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testLcp.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testNdbApi.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testOIBasic.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testReadPerf.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testRestartGci.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testScanPerf.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testSystemRestart.cpp:
        compile fix for ndbapi test program on irix
      2f182b3e
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 70663052
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      70663052
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 87c1f0f2
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      87c1f0f2
    • unknown's avatar
      Makefile.am: · 369845a4
      unknown authored
        fix to make make -jN work
      
      
      ndb/src/mgmclient/Makefile.am:
        fix to make make -jN work
      369845a4
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1490901e
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      1490901e
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5b8fca74
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      5b8fca74
    • unknown's avatar
      Makefile.am: · 2ab265d0
      unknown authored
        added so that it is possible to make mysql_test_run_new
        but not done for target all do:
         make mysql_test_run_new
      
      
      mysql-test/Makefile.am:
        added so that it is possible to make mysql_test_run_new
        but not done for target all do:
         make mysql_test_run_new
      2ab265d0
    • unknown's avatar
      Makefile.am: · 61838e4c
      unknown authored
        remove mysql_test_run_new for now, it breaks the make
      
      
      mysql-test/Makefile.am:
        remove mysql_test_run_new for now, it breaks the make
      61838e4c
    • unknown's avatar
      Makefile.am: · d03f2330
      unknown authored
        changed make order
      .del-Makefile_old~dde91b00b37d2a06:
        Delete: ndb/tools/Makefile_old
      .del-Makefile_old~70d769657921a760:
        Delete: ndb/test/tools/Makefile_old
      .del-Makefile_old~58f0559822147dd9:
        Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
      .del-Makefile_old~4fdb3c92ebd2eb29:
        Delete: ndb/test/run-test/Makefile_old
      .del-Makefile_old~1497f81a0c2125e:
        Delete: ndb/test/src/Makefile_old
      .del-Makefile_old~fbd3934fabdfe550:
        Delete: ndb/test/ndbapi/Makefile_old
      .del-Makefile_old~ec8e48326d4aa09:
        Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
      .del-Makefile_old~1046c9ce93ef1fb8:
        Delete: ndb/test/ndbapi/bank/Makefile_old
      .del-Makefile_old~7c98d8f1d275983f:
        Delete: ndb/src/ndbapi/Makefile_old
      .del-Makefile_old~4463cf06fc2fceb9:
        Delete: ndb/src/mgmapi/Makefile_old
      .del-Makefile_old~274925c960801993:
        Delete: ndb/src/mgmsrv/Makefile_old
      .del-Makefile_old~b3d33fdde8bc12c0:
        Delete: ndb/src/kernel/Makefile_old
      .del-Makefile_old~6dbe2defc7237d4d:
        Delete: ndb/src/kernel/vm/Makefile_old
      .del-Makefile_old~cf05571c99011360:
        Delete: ndb/src/kernel/error/Makefile_old
      .del-Makefile_old~29a955a7e17d650e:
        Delete: ndb/src/kernel/blocks/Makefile_old
      .del-Makefile_old~f8b2a47eb434d43:
        Delete: ndb/src/kernel/blocks/suma/Makefile_old
      .del-Makefile_old~f0c05bb23d5c23ca:
        Delete: ndb/src/kernel/blocks/grep/Makefile_old
      .del-Makefile_old~a6fd2e579249f6e0:
        Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
      .del-Makefile_old~7e8d8b4e2b1fa8f7:
        Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
      .del-Makefile_old~73c174fc712803c5:
        Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
      .del-Makefile_old~16de31311951fc04:
        Delete: ndb/src/kernel/blocks/trix/Makefile_old
      .del-Makefile_old~788c80e5e758ac7:
        Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
      .del-Makefile_old~5ebf2b4f85ab09cf:
        Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
      .del-Makefile_old~530f9e0bc038a62:
        Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
      .del-Makefile_old~315b927180484020:
        Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
      .del-Makefile_old~d013a228cad86ba0:
        Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
      .del-Makefile_old~c2e33f043b8aa45e:
        Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
      .del-Makefile_old~bdf406f5fb4696cb:
        Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
      .del-Makefile_old~38a24016d2ad8aa7:
        Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
      .del-Makefile_old~2804044250a6fd91:
        Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
      .del-Makefile_old~e58eec87cd8dc79e:
        Delete: ndb/src/cw/Makefile_old
      .del-Makefile_old~b50c85b8eb69aacb:
        Delete: ndb/src/kernel/blocks/backup/Makefile_old
      .del-Makefile_old~16e186623106985e:
        Delete: ndb/src/cw/cpcd/Makefile_old
      .del-Makefile_old~f03f74238d640d5:
        Delete: ndb/src/common/mgmcommon/Makefile_old
      .del-Makefile_old~a8e9765b520b7c68:
        Delete: ndb/src/common/util/Makefile_old
      .del-Makefile_old~9f275aed83c8652b:
        Delete: ndb/src/common/transporter/Makefile_old
      .del-Makefile_old~8d901a664eca1ec:
        Delete: ndb/src/common/portlib/Makefile_old
      .del-Makefile_old~19643559613c75c7:
        Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
      .del-Makefile_old~a3f6fc0e1411bb28:
        Delete: ndb/src/common/logger/Makefile_old
      .del-Makefile_old~754f27fab7d4da3b:
        Delete: ndb/src/common/debugger/signaldata/Makefile_old
      .del-Makefile_old~54ca8df95719e59f:
        Delete: ndb/src/common/debugger/Makefile_old
      
      
      BitKeeper/deleted/.del-Makefile_old~54ca8df95719e59f:
        Delete: ndb/src/common/debugger/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~754f27fab7d4da3b:
        Delete: ndb/src/common/debugger/signaldata/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~a3f6fc0e1411bb28:
        Delete: ndb/src/common/logger/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~19643559613c75c7:
        Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~8d901a664eca1ec:
        Delete: ndb/src/common/portlib/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~9f275aed83c8652b:
        Delete: ndb/src/common/transporter/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~a8e9765b520b7c68:
        Delete: ndb/src/common/util/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~f03f74238d640d5:
        Delete: ndb/src/common/mgmcommon/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~16e186623106985e:
        Delete: ndb/src/cw/cpcd/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~b50c85b8eb69aacb:
        Delete: ndb/src/kernel/blocks/backup/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~e58eec87cd8dc79e:
        Delete: ndb/src/cw/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~2804044250a6fd91:
        Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~38a24016d2ad8aa7:
        Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~bdf406f5fb4696cb:
        Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~c2e33f043b8aa45e:
        Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~d013a228cad86ba0:
        Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~315b927180484020:
        Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~530f9e0bc038a62:
        Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~5ebf2b4f85ab09cf:
        Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~788c80e5e758ac7:
        Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~16de31311951fc04:
        Delete: ndb/src/kernel/blocks/trix/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~73c174fc712803c5:
        Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~7e8d8b4e2b1fa8f7:
        Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~a6fd2e579249f6e0:
        Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~f0c05bb23d5c23ca:
        Delete: ndb/src/kernel/blocks/grep/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~f8b2a47eb434d43:
        Delete: ndb/src/kernel/blocks/suma/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~29a955a7e17d650e:
        Delete: ndb/src/kernel/blocks/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~cf05571c99011360:
        Delete: ndb/src/kernel/error/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~6dbe2defc7237d4d:
        Delete: ndb/src/kernel/vm/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~b3d33fdde8bc12c0:
        Delete: ndb/src/kernel/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~274925c960801993:
        Delete: ndb/src/mgmsrv/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~4463cf06fc2fceb9:
        Delete: ndb/src/mgmapi/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~7c98d8f1d275983f:
        Delete: ndb/src/ndbapi/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~1046c9ce93ef1fb8:
        Delete: ndb/test/ndbapi/bank/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~ec8e48326d4aa09:
        Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~fbd3934fabdfe550:
        Delete: ndb/test/ndbapi/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~1497f81a0c2125e:
        Delete: ndb/test/src/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~4fdb3c92ebd2eb29:
        Delete: ndb/test/run-test/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~58f0559822147dd9:
        Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~70d769657921a760:
        Delete: ndb/test/tools/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~dde91b00b37d2a06:
        Delete: ndb/tools/Makefile_old
      ndb/src/mgmclient/Makefile.am:
        changed make order
      d03f2330
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0c9f8376
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      0c9f8376
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/new-fix · 1489c417
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/ndbapi/NdbOperationExec.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      1489c417
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/kalle · 85ce9919
      unknown authored
      into mysql.com:/home/jonas/src/new-fix
      
      
      ndb/src/ndbapi/NdbDictionary.cpp:
        Auto merged
      85ce9919
    • unknown's avatar
      alter_table.result, alter_table.test, field_conv.cc: · 06cf873d
      unknown authored
        Bug #6479  ALTER TABLE ... changing charset fails for TEXT columns
        Fix: use do_conv_blob rather than do_copy_blob
        if the column's character sets are different.
      
      
      sql/field_conv.cc:
        Bug #6479  ALTER TABLE ... changing charset fails for TEXT columns
        Fix: use do_conv_blob rather than do_copy_blob
        if the column's character sets are different.
      mysql-test/t/alter_table.test:
        Bug #6479  ALTER TABLE ... changing charset fails for TEXT columns
        Fix: use do_conv_blob rather than do_copy_blob
        if the column's character sets are different.
      mysql-test/r/alter_table.result:
        Bug #6479  ALTER TABLE ... changing charset fails for TEXT columns
        Fix: use do_conv_blob rather than do_copy_blob
        if the column's character sets are different.
      06cf873d
    • unknown's avatar
      removed editline and replaced with mysql readline · 5fb792ec
      unknown authored
          created new facade object for CommandInterpreter
          removed CPC #if 0 code
          removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
      
      
      BitKeeper/deleted/.del-MANIFEST~e8c948c4a4413f8d:
        Delete: ndb/src/common/editline/MANIFEST
      BitKeeper/deleted/.del-Makefile.am~dfbe493d6e2d25f4:
        Delete: ndb/src/common/editline/Makefile.am
      BitKeeper/deleted/.del-Makefile_old~90ac19a1668ecdd5:
        Delete: ndb/src/common/editline/Makefile_old
      BitKeeper/deleted/.del-README~3f39f9b8294466e8:
        Delete: ndb/src/common/editline/README
      BitKeeper/deleted/.del-complete.c~a1bc3055fd90e27f:
        Delete: ndb/src/common/editline/complete.c
      BitKeeper/deleted/.del-editline.3~1f9bb4274cf4381:
        Delete: ndb/src/common/editline/editline.3
      BitKeeper/deleted/.del-editline.c~5b759f3e5fd3c196:
        Delete: ndb/src/common/editline/editline.c
      BitKeeper/deleted/.del-editline_internal.h~96ca8d53fb758586:
        Delete: ndb/src/common/editline/editline_internal.h
      BitKeeper/deleted/.del-editline_win32.c~45b257bec279826e:
        Delete: ndb/src/common/editline/editline_win32.c
      BitKeeper/deleted/.del-sysunix.c~8e7a6901783efd17:
        Delete: ndb/src/common/editline/sysunix.c
      BitKeeper/deleted/.del-unix.h~1c244c1d4ba6c6fb:
        Delete: ndb/src/common/editline/unix.h
      BitKeeper/deleted/.del-Makefile~46cecfa6cd1a4e6b:
        Delete: ndb/src/common/editline/test/Makefile
      BitKeeper/deleted/.del-testit.c~82837111b1876e44:
        Delete: ndb/src/common/editline/test/testit.c
      BitKeeper/deleted/.del-Makefile_old~59409aa4debaeb90:
        Delete: ndb/src/common/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~92af3f5a7f24caf:
        Delete: ndb/src/mgmclient/Makefile_old
      ndb/test/src/CpcClient.cpp:
        Rename: ndb/src/mgmclient/CpcClient.cpp -> ndb/test/src/CpcClient.cpp
      ndb/test/include/CpcClient.hpp:
        Rename: ndb/src/mgmclient/CpcClient.hpp -> ndb/test/include/CpcClient.hpp
      configure.in:
        removed editline
      ndb/src/common/Makefile.am:
        removed editline
      ndb/src/mgmclient/CommandInterpreter.cpp:
        removed editline and replaced with mysql readline
        created new facade object for CommandInterpreter
        removed CPC #if 0 code
      ndb/src/mgmclient/Makefile.am:
        removed editline and replaced with mysql readline
        created new facade object for CommandInterpreter
        removed CPC #if 0 code
      ndb/src/mgmclient/main.cpp:
        removed editline and replaced with mysql readline
        created new facade object for CommandInterpreter
        removed CPC #if 0 code
      ndb/src/mgmclient/ndb_mgmclient.hpp:
        new facade object for CommandInterpreter
      ndb/src/mgmsrv/CommandInterpreter.hpp:
        removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
      ndb/src/mgmsrv/Makefile.am:
        removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
      ndb/test/run-test/Makefile.am:
        moved cpc code to test
      ndb/test/src/Makefile.am:
        moved cpc code to test
      ndb/test/tools/Makefile.am:
        moved cpc code to test
      5fb792ec
    • unknown's avatar
      ndb: bug#6435 · 7240a4d3
      unknown authored
      fix null handling in ha_ndbcluster when using ordered index
      
      
      mysql-test/r/ndb_index_ordered.result:
        bug#6435
      mysql-test/t/ndb_index_ordered.test:
        bug#6435
      sql/ha_ndbcluster.cc:
        Fix null handling in ordered index code
      7240a4d3
    • unknown's avatar
      ndb: bug#6451 · 3b38a854
      unknown authored
      1) fix so that missing blob tables don't prevent table from being
          dropped
      2) decrease size of blob part if record length exceeds max length
      3) add test case for table wo/ corresponding blob table
      4) init scan counters when sending scan_tabreq
      
      
      mysql-test/r/ndb_autodiscover.result:
        testcase for table wo/ corresponding blob tables
      mysql-test/r/ndb_autodiscover2.result:
        testcase for table wo/ corresponding blob tables
      mysql-test/t/ndb_autodiscover.test:
        testcase for table wo/ corresponding blob tables
      mysql-test/t/ndb_autodiscover2.test:
        testcase for table wo/ corresponding blob tables
      ndb/include/ndbapi/NdbDictionary.hpp:
        Add non-const get column
      ndb/src/ndbapi/NdbDictionary.cpp:
        Add non-const get column
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Allow "partially" getTable, which enables dropping of tables
           that fails to create blob tables
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Init counter when sending SCAN_TABREQ
      sql/ha_ndbcluster.cc:
        Make sure that blob don't have to big part size
      3b38a854
    • unknown's avatar
      ctype_ujis.result, ctype_ujis.test, field.cc: · bf14010d
      unknown authored
        Bug#6345 Unexpected behaviour with partial indices
      
      
      sql/field.cc:
        Bug#6345 Unexpected behaviour with partial indices
      mysql-test/t/ctype_ujis.test:
        Bug#6345 Unexpected behaviour with partial indices
      mysql-test/r/ctype_ujis.result:
        Bug#6345 Unexpected behaviour with partial indices
      bf14010d
  2. 07 Nov, 2004 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 8793e219
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      tests/client_test.c:
        Auto merged
      8793e219
    • unknown's avatar
      Simpler arena swapping code · 435b20aa
      unknown authored
      Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root.
      This gives us the following benefits:
      - Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases)
      - Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT)
      - We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root
      
      
      
      client/mysqltest.c:
        Remove some not needed defines
        (Things like this should be done in config-win.h)
      include/config-win.h:
        Added popen() and pclose() compatibility macros
      mysql-test/t/rpl_failed_optimize-master.opt:
        Portability fix
      sql/ha_berkeley.cc:
        New thd->memroot handling
      sql/item_cmpfunc.cc:
        Simpler arena swapping code
      sql/item_func.cc:
        Simpler arena swapping code
      sql/item_subselect.cc:
        Simpler arena swapping code
        New thd->mem_root handling
      sql/item_sum.cc:
        New thd->mem_root handling
      sql/item_timefunc.cc:
        Fixed not-initalized usage errors found by valgrind
      sql/log_event.cc:
        New thd->mem_root handling
      sql/mysql_priv.h:
        New thd->mem_root handling
      sql/mysqld.cc:
        New thd->mem_root handling
      sql/opt_range.cc:
        New thd->mem_root handling
      sql/repl_failsafe.cc:
        New thd->mem_root handling
      sql/set_var.cc:
        New thd->mem_root handling
      sql/sql_acl.cc:
        New thd->mem_root handling
      sql/sql_base.cc:
        Simpler arena swapping code
        New thd->mem_root handling
      sql/sql_class.cc:
        New thd->mem_root handling
      sql/sql_class.h:
        Simpler arena swapping code
        New thd->mem_root handling
      sql/sql_db.cc:
        New thd->mem_root handling
      sql/sql_error.cc:
        New thd->mem_root handling
      sql/sql_help.cc:
        New thd->mem_root handling
      sql/sql_insert.cc:
        New thd->mem_root handling
      sql/sql_parse.cc:
        New thd->mem_root handling
        Added some extra checking of return value of new
      sql/sql_prepare.cc:
        New thd->mem_root handling
      sql/sql_select.cc:
        New thd->mem_root handling
      sql/sql_select.h:
        New thd->mem_root handling
      sql/sql_union.cc:
        Simpler arena swapping code
      sql/sql_yacc.yy:
        New thd->mem_root handling
      sql/table.cc:
        New thd->mem_root handling
      sql/thr_malloc.cc:
        New thd->mem_root handling
      tests/client_test.c:
        Added drop table to some tests
        Changed some table names to 't1'
      435b20aa
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d93ff572
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      d93ff572
    • unknown's avatar
      wrong copyright · 28986c7f
      unknown authored
      28986c7f
  3. 06 Nov, 2004 2 commits
    • unknown's avatar
      mysql_test_run_new.c: · 7c927251
      unknown authored
        Included header fnmatch.h on Unix
        Changed C++ comments to C comments
        Corrected indentation of code written on Windows
        Split up lines to fit into 80 columns
        Initiated some variables to avoid warnings
        Added __attribute__((unused)) to unused function parameters
        Replace tab characters with space
        Put space after 'for', 'while' etc
        Added value to 'return' from non void function removef()
        On Unix strlwr() was incorrectly declared and a no op,
        replaced it with a macro that does nothing
        Split several statements on the same line
        Other minor changes to conform to coding standard
      
      
      mysql-test/mysql_test_run_new.c:
        Included header fnmatch.h on Unix
        Changed C++ comments to C comments
        Corrected indentation of code written on Windows
        Split up lines to fit into 80 columns
        Initiated some variables to avoid warnings
        Added __attribute__((unused)) to unused function parameters
        Replace tab characters with space
        Put space after 'for', 'while' etc
        Added value to 'return' from non void function removef()
        On Unix strlwr() was incorrectly declared and a no op,
        replaced it with a macro that does nothing
        Split several statements on the same line
        Other minor changes to conform to coding standard
      7c927251
    • unknown's avatar
      join_outer.result, join_outer.test: · 9bd7def3
      unknown authored
        Added cases for bugs #6307 and #6460.
      sql_select.cc:
        Fixed the problem of bug reports #6307 and #6460.
        The reported wrong result sets were due to the fact that
        the added call of the fix_fields method for the built
        AND condition that joined WHERE and ON conditions
        broke ON expression, as it removed extra AND levels
        in the built condition. 
        It looks like that no attributes of the built condition
        are needed, so we don't have to call fix_fields here.
      
      
      sql/sql_select.cc:
        Fixed the problem of bug report #6307 and #6460.
        The reported wrong result sets were due to the fact that
        the added call of the fix_fields method for the built
        AND condition that joined WHERE and ON conditions
        broke ON expression. 
        It looks like that no attributes of the built condition
        are needed, so we don't have to call fix_fields here.
      mysql-test/t/join_outer.test:
        Added cases for bugs #6307 and #6460.
      mysql-test/r/join_outer.result:
        Added cases for bugs #6307 and #6460.
      9bd7def3
  4. 05 Nov, 2004 14 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · cf9e3745
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      cf9e3745
    • unknown's avatar
      removed a bunch of "dead" files from the ndb src tree · e5b02acd
      unknown authored
      
      BitKeeper/deleted/.del-Makefile_mysql~13fd89716a05b953:
        Delete: ndb/test/odbc/tpcb/Makefile_mysql
      BitKeeper/deleted/.del-Makefile_ndb~6c74a0c6f8a79774:
        Delete: ndb/test/odbc/tpcb/Makefile_ndb
      BitKeeper/deleted/.del-Makefile~c02da49a787c2f6e:
        Delete: ndb/test/odbc/tpcb/Makefile
      BitKeeper/deleted/.del-readme.txt~3549c08b7818c64:
        Delete: ndb/test/odbc/tpcb/readme.txt
      BitKeeper/deleted/.del-timesten.h~24e85d9b33938c67:
        Delete: ndb/test/odbc/tpcb/timesten.h
      BitKeeper/deleted/.del-tpcb.cpp~7b670d738e1890ae:
        Delete: ndb/test/odbc/tpcb/tpcb.cpp
      BitKeeper/deleted/.del-ttTime.c~94f84fefd7be03f3:
        Delete: ndb/test/odbc/tpcb/ttTime.c
      BitKeeper/deleted/.del-ttTime.h~52ca967b5dfc48bc:
        Delete: ndb/test/odbc/tpcb/ttTime.h
      BitKeeper/deleted/.del-list.h~1329477d9fb820be:
        Delete: ndb/src/external/LINUX.x86/sci/include/list.h
      BitKeeper/deleted/.del-rmlib.h~1889009d4b47c498:
        Delete: ndb/src/external/LINUX.x86/sci/include/rmlib.h
      BitKeeper/deleted/.del-sci_errno.h~a1da22da939f627:
        Delete: ndb/src/external/LINUX.x86/sci/include/sci_errno.h
      BitKeeper/deleted/.del-sci_types.h~64136c0e5ac2ac5f:
        Delete: ndb/src/external/LINUX.x86/sci/include/sci_types.h
      BitKeeper/deleted/.del-sisci_api.h~67839b64a1235d51:
        Delete: ndb/src/external/LINUX.x86/sci/include/sisci_api.h
      BitKeeper/deleted/.del-sisci_demolib.h~ea5d3afd60121d20:
        Delete: ndb/src/external/LINUX.x86/sci/include/sisci_demolib.h
      BitKeeper/deleted/.del-sisci_error.h~c6771e123aa79c71:
        Delete: ndb/src/external/LINUX.x86/sci/include/sisci_error.h
      BitKeeper/deleted/.del-sisci_types.h~67a1a116970eb17f:
        Delete: ndb/src/external/LINUX.x86/sci/include/sisci_types.h
      BitKeeper/deleted/.del-sisci_version.h~d542bfa4c7633fc:
        Delete: ndb/src/external/LINUX.x86/sci/include/sisci_version.h
      BitKeeper/deleted/.del-version.h~b022e3a29d6d96ad:
        Delete: ndb/src/external/LINUX.x86/sci/include/version.h
      BitKeeper/deleted/.del-inttypes.h~c9dfa7f6273df1b1:
        Delete: ndb/src/external/LINUX.x86/sci/include/os/inttypes.h
      BitKeeper/deleted/.del-rmlib.h~61359201e51879bc:
        Delete: ndb/src/external/WIN32.x86/sci/include/rmlib.h
      BitKeeper/deleted/.del-sisci_api.h~3b78e2453819b68d:
        Delete: ndb/src/external/SOLARIS.SPARC/sci/include/sisci_api.h
      BitKeeper/deleted/.del-sisci_error.h~f48df70a324479a2:
        Delete: ndb/src/external/SOLARIS.SPARC/sci/include/sisci_error.h
      BitKeeper/deleted/.del-sisci_types.h~f97cdce73b27052d:
        Delete: ndb/src/external/SOLARIS.SPARC/sci/include/sisci_types.h
      BitKeeper/deleted/.del-sisci_version.h~fa5e2e6069bad028:
        Delete: ndb/src/external/SOLARIS.SPARC/sci/include/sisci_version.h
      BitKeeper/deleted/.del-scilib.h~144397858368aafd:
        Delete: ndb/src/external/WIN32.x86/sci/include/scilib.h
      BitKeeper/deleted/.del-sisci_api.h~23d9bf22685196be:
        Delete: ndb/src/external/WIN32.x86/sci/include/sisci_api.h
      BitKeeper/deleted/.del-sisci_demolib.h~c149b88ed12e698e:
        Delete: ndb/src/external/WIN32.x86/sci/include/sisci_demolib.h
      BitKeeper/deleted/.del-sisci_error.h~3118f4dbedb2eee0:
        Delete: ndb/src/external/WIN32.x86/sci/include/sisci_error.h
      BitKeeper/deleted/.del-sisci_types.h~3cf6f68a4de25d19:
        Delete: ndb/src/external/WIN32.x86/sci/include/sisci_types.h
      BitKeeper/deleted/.del-md5-rfc1321.txt~61f874f9cd434768:
        Delete: ndb/src/common/util/md5-rfc1321.txt
      BitKeeper/deleted/.del-getarg.3~3d3256e9714fadf1:
        Delete: ndb/src/common/util/getarg.3
      BitKeeper/deleted/.del-getarg.3.ps~bfb45b011e1164ae:
        Delete: ndb/src/common/util/getarg.3.ps
      BitKeeper/deleted/.del-cvschk~c63d92daa21ed311:
        Delete: ndb/home/bin/cvschk
      BitKeeper/deleted/.del-AssemblyInfo.cs~7632ee81b277625:
        Delete: ndb/src/cw/cpcc-win32/csharp/AssemblyInfo.cs
      BitKeeper/deleted/.del-frmSplash.frm~40b5877abca91856:
        Delete: ndb/src/cw/cpcc-win32/vb6/frmSplash.frm
      e5b02acd
    • unknown's avatar
      A fix and test case for the bug reported by Reggie: if character set · b3d84df1
      unknown authored
      of client equals to character set of connection, possibly required
      conversion to character set of column is not performed
      (prepared statements, data is supplied using placeholders).
      
      
      sql/item.cc:
        Fix for the bug reported by Reggie: if character_set_connection
        is equal to character_set_client, placeholder's value is not converted
        furhter to character set of column when it's different.
        This is because the original implementation left placeholder's character
        set intact (binary) if there were no need for client->connection conversion.
      tests/client_test.c:
        A test case for the conversion bug.
      b3d84df1
    • unknown's avatar
      mysqldump.c: · 7bcd40bd
      unknown authored
        in 4.1: Dump only VARBINARY() in hex,
        while VARCHAR() COLLATE xxx_bin as a string.
      
      
      client/mysqldump.c:
        in 4.1: Dump only VARBINARY() in hex,
        while VARCHAR() COLLATE xxx_bin as a string.
      7bcd40bd
    • unknown's avatar
      Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the source tar-ball. · 00d05c1e
      unknown authored
      
      BitKeeper/etc/ignore:
        Added mysql-test/mysql_test_run_new to the ignore list
      mysql-test/Makefile.am:
        All source files must be contained in their respective macros in order to be contained
        in the DISTFILES macro so that they get included in the source file tar-ball.
        "my_manage.h" was missing.
      00d05c1e
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 43c6c27c
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      43c6c27c
    • unknown's avatar
      user_var.result, user_var.test: · 6608e22d
      unknown authored
        My previous change that "set @A=NULL" doesn't change charset
        fixed 'Bug #6321' as well. Prove with a new test that
        FIELD(<uservariable content NULL>, ...) now works fine too.
      
      
      mysql-test/t/user_var.test:
        My previous change that "set @A=NULL" doesn't change charset
        fixed 'Bug #6321' as well. Prove with a new test that
        FIELD(<uservariable content NULL>, ...) now works fine too.
      mysql-test/r/user_var.result:
        My previous change that "set @A=NULL" doesn't change charset
        fixed 'Bug #6321' as well. Prove with a new test that
        FIELD(<uservariable content NULL>, ...) now works fine too.
      6608e22d
    • unknown's avatar
      The new "Bootstrap" pushed in 4.0 with changeset "joerg:1.2057" is used for building · ac391280
      unknown authored
      _all_ versions. It tries to remove "Docs/Images/Makefile*" as part of the actions to
      correct bug number 6350. If the source tree does not contain a dummy file matching
      that pattern, this "rm" will fail, and so "Bootstrap" will fail.
      The "Makefile.am" introduced with this changeset is identical to the one that will
      arrive here when "joerg:1.2057" is propagated from 4.0,
      so this separate introduction here is just to allow "Bootstraps" in the meantime.
      
      
      ac391280
    • unknown's avatar
      As it is wrong and confusing to associate any · aee1e78a
      unknown authored
      character set with NULL, @A should be latin2
      after this query sequence:
      
         SET @A=_latin2'string';
         SET @A=NULL;
      
      I.e. the second query should not change the charset
      to the current default value, but should keep the
      original value assigned during the first query.
      In order to do it, we don't copy charset
      from the argument if the argument is NULL
      and the variable has previously been initialized.
      
      
      mysql-test/r/ps_6bdb.result:
        t
      mysql-test/r/ps_5merge.result:
        t
      mysql-test/r/ps_3innodb.result:
        t
      mysql-test/r/ps_7ndb.result:
        t
      mysql-test/r/ps_4heap.result:
        t
      mysql-test/r/ps_2myisam.result:
        t
      sql/item_func.cc:
        t
      aee1e78a
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · d4973341
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
      
      
      d4973341
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · b38510ec
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      b38510ec
    • unknown's avatar
      ps.result, ctype_ucs.result, ctype_ucs.test, ps.test: · 8264d83d
      unknown authored
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      
      
      mysql-test/t/ps.test:
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      mysql-test/t/ctype_ucs.test:
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      mysql-test/r/ctype_ucs.result:
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      mysql-test/r/ps.result:
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      8264d83d
    • unknown's avatar
      mysqldump.c: · 85941cf5
      unknown authored
        - 'mysqldump --help' comment that --xeh-blob
          doesn't work with --extended-inserts was removed.
          It does work now. Thanks to Lachlan
          who noticed this wrong help message.
        - Switched to use the recently introduced
          mysql_hex_string() instead of slow sprintf().
          Thanks to Sinisa for the idea.
        - 'mysqldump --hex-blob' dumps in HEX not only
          BLOBs but also BINARY(x) columns. 
          Thanks to Paul.
      
      
      client/mysqldump.c:
        - comment that --xeh-blob doesn't work with --extended-inserts was removed. It does work now.
        - Switched to use recently introduced mysql_hex_string()
          instead of sprintf()
        - BINARY(x) are dumped in HEX too
      85941cf5
    • unknown's avatar
      libmysql.def, libmysql.c: · 0a4984a4
      unknown authored
        Minor clean-ups
      
      
      libmysql/libmysql.c:
        Minor clean-ups
      libmysql/libmysql.def:
        bk commit
      0a4984a4