1. 10 Nov, 2004 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 977fef31
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      977fef31
    • unknown's avatar
      Adding new function prototype · 81880bab
      unknown authored
      81880bab
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 63ad234b
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      63ad234b
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4b3a345b
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      4b3a345b
    • unknown's avatar
      Merge mysql.com:/home/wax/mysql/mysql-4.1 · 53d6ae93
      unknown authored
      into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
      
      
      53d6ae93
    • unknown's avatar
      1. When mixing NULL to a character string, · c5e6941e
      unknown authored
      the result takes its charset/collation
      attributes from the character string,
      e.g.  SELECT func(NULL, _latin2'string')
      now returns a latin2 result. This is
      done by introducing a new derivation
      (aka coercibility) level DERIVATION_IGNORABLE,
      which is used with Item_null.
      2. 'Pure' NULL is now BINARY(0), not CHAR(0).
      I.e. NULL is now more typeless.
      
      
      mysql-test/r/metadata.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/null.result:
        Testing mixing NULL with a character string with a number of functions.
      mysql-test/r/ps_2myisam.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_3innodb.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_4heap.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_5merge.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_6bdb.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_7ndb.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/t/null.test:
        Testing mixing NULL with a character string with a number of functions.
      sql/item.cc:
        New derivation level.
      sql/item.h:
        New derivation level.
      c5e6941e
    • unknown's avatar
      replaced init_db.sql · 297abcb8
      unknown authored
      
      mysql-test/init_db.sql:
        replaced old init_db.sql on new one
      297abcb8
    • unknown's avatar
      bug#6538 · 7d09ee39
      unknown authored
      ndb: Fix return value in index_last wo/ rows
      
      
      sql/ha_ndbcluster.cc:
        Return correct when not finding any row from index_last
      7d09ee39
  2. 09 Nov, 2004 9 commits
  3. 08 Nov, 2004 21 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 mysql.com:/home/bkroot/mysql-4.1 · 24b0fab9
      unknown authored
      into mysql.com:/home/bk/b6239-4.1-v2-pending
      
      
      24b0fab9
    • 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
  4. 07 Nov, 2004 2 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