1. 01 Apr, 2006 5 commits
    • unknown's avatar
      Makefile.am: · 2a4e2e8d
      unknown authored
        Let "make install" install mysql-test-run.pl
      mysql.spec.sh:
        Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
      
      
      support-files/mysql.spec.sh:
        Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
      mysql-test/Makefile.am:
        Let "make install" install mysql-test-run.pl
      2a4e2e8d
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · 3eb7f2a2
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
      
      
      README:
        Auto merged
      3eb7f2a2
    • unknown's avatar
      README: · c19a6fc5
      unknown authored
        Typo (bug#17167)
      
      
      README:
        Typo (bug#17167)
      c19a6fc5
    • unknown's avatar
      acinclude.m4: · 1f762dab
      unknown authored
        Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
        and search the given include directory first (bug#18369)
      
      
      acinclude.m4:
        Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
        and search the given include directory first (bug#18369)
      1f762dab
    • unknown's avatar
      vcproj files: · 0ad405f9
      unknown authored
        Set MYSQL_SERVER_SUFFIX from build scripts, not hard
        code it into Visual Studio project files, bug#15974
      
      
      VC++Files/bdb/bdb.vcproj:
        Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
      VC++Files/innobase/innobase.vcproj:
        Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
      VC++Files/libmysqld/libmysqld.vcproj:
        Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
      VC++Files/mysqldemb/mysqldemb.vcproj:
        Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
      VC++Files/mysys/mysys.vcproj:
        Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
      VC++Files/sql/mysqld.vcproj:
        Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
      0ad405f9
  2. 30 Mar, 2006 3 commits
  3. 29 Mar, 2006 11 commits
    • unknown's avatar
      Fix error in prefix compression of keys in MyISAM when key length changed from 254 -> 255 · 2d6a51b4
      unknown authored
      Bug #17705 "FT Index corruption occurs with UTF8 data..."
      (Actually, the bug had nothing to do with FT index but with general key compression)
      
      
      
      myisam/mi_search.c:
        Fix error in prefix compression of keys in MyISAM when key length changed from 254 -> 255
      mysql-test/r/ctype_utf8.result:
        Test of fix for key compression bug
      mysql-test/t/ctype_utf8.test:
        Test of fix for key compression bug
      2d6a51b4
    • unknown's avatar
      mysql-test-run.pl: · 3479ec37
      unknown authored
        Check that port range is valid, bug#16807
      
      
      mysql-test/mysql-test-run.pl:
        Check that port range is valid, bug#16807
      3479ec37
    • unknown's avatar
      mysqld_safe.sh: · 2d8acd2f
      unknown authored
        Added --help option, bug#16392
      acinclude.m4:
        Use "$shrext_cmds" when testing if shared library exists, bug#16332
      
      
      acinclude.m4:
        Use "$shrext_cmds" when testing if shared library exists, bug#16332
      scripts/mysqld_safe.sh:
        Added --help option, bug#16392
      2d8acd2f
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 92df85b4
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
      
      
      92df85b4
    • unknown's avatar
      Makefile.am: · 113efc00
      unknown authored
        Use "dist_bin_SCRIPTS" to get a script distributed
      
      
      ndb/tools/Makefile.am:
        Use "dist_bin_SCRIPTS" to get a script distributed
      113efc00
    • unknown's avatar
      Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries · b2531546
      unknown authored
      The GROUP_CONCAT uses its own temporary table. When ROLLUP is present
      it creates the second copy of Item_func_group_concat. This copy receives the
      same list of arguments that original group_concat does. When the copy is
      set up the result_fields of functions from the argument list are reset to the
      temporary table of this copy.
      As a result of this action data from functions flow directly to the ROLLUP copy
      and the original group_concat functions shows wrong result.
      Since queries with COUNT(DISTINCT ...) use temporary tables to store
      the results the COUNT function they are also affected by this bug.
      
      The idea of the fix is to copy content of the result_field for the function
      under GROUP_CONCAT/COUNT from  the first temporary table to the second one,
      rather than setting result_field to point to the second temporary table.
      To achieve this goal force_copy_fields flag is added to Item_func_group_concat
      and Item_sum_count_distinct classes. This flag is initialized to 0 and set to 1
      into the make_unique() member function of both classes.
      To the TMP_TABLE_PARAM structure is modified to include the similar flag as
      well.
      The create_tmp_table() function passes that flag to create_tmp_field().
      When the flag is set the create_tmp_field() function will set result_field
      as a source field and will not reset that result field to newly created 
      field for Item_func_result_field and its descendants. Due to this there
      will be created copy func to copy data from old result_field to newly 
      created field.
      
      
      mysql-test/t/func_gconcat.test:
        Added test for bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
      mysql-test/r/func_gconcat.result:
        Added test for bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
      sql/sql_table.cc:
        Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
        Added 0 as a last parameter to create_tmp_field()  to force old behaviour.
      sql/sql_select.cc:
        Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
        
        Added the flag 'make_copy_field' to create_tmp_field(), so that for Item_result_field descendants create_tmp_field() sets the item's result field as a source field and deny resetting that result field to a new value.
      sql/sql_class.h:
        Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
        Added the flag 'force_copy_fields' to the structure TMP_TABLE_PARAM in order to make create_tmp_field() force the creation of 'copy_field' objects.
      sql/mysql_priv.h:
        Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
        Added the bool parameter 'make_copy_field' to create_tmp_field().
      sql/item_sum.cc:
        Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
        Added initialization of the force_copy_fields flag and passing it to create_tmp_table() through TMP_TBLE_PARAM in the Item_func_group_concat and Item_sum_count_distinct member functions.
      sql/item_sum.h:
        Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
        Added the flag 'force_copy_fields' to the Item_func_group_concat and Item_sum_count_distinct classes.
      b2531546
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · c819b62b
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/4.1
      
      
      c819b62b
    • unknown's avatar
      Fix for bug#15316 SET value having comma not correctly handled · 4af4e1e7
      unknown authored
       disallow the use of comma in SET members
      
      
      mysql-test/r/create.result:
        Fix for bug#15316 SET value having comma not correctly handled
         test case
      mysql-test/t/create.test:
        Fix for bug#15316 SET value having comma not correctly handled
         test case
      4af4e1e7
    • unknown's avatar
      mysql_config.sh: · 0fb36d1b
      unknown authored
        If installed, search built in lib path first, bug#13158
      
      
      scripts/mysql_config.sh:
        If installed, search built in lib path first, bug#13158
      0fb36d1b
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 42750573
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
      
      
      42750573
    • unknown's avatar
      Makefile.am: · d800af4b
      unknown authored
        Install "ndb_size.pl" script and template, bug#18421
      
      
      ndb/tools/Makefile.am:
        Install "ndb_size.pl" script and template, bug#18421
      d800af4b
  4. 28 Mar, 2006 1 commit
  5. 27 Mar, 2006 4 commits
    • unknown's avatar
      mysql_config.sh: · 7130316d
      unknown authored
        Remove Solaris -xc99=none C option as C++ compiler can't handle it
      
      
      scripts/mysql_config.sh:
        Remove Solaris -xc99=none C option as C++ compiler can't handle it
      7130316d
    • unknown's avatar
      mysql_config.sh: · 53aadad6
      unknown authored
        We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
      
      
      scripts/mysql_config.sh:
        We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
      53aadad6
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · da1a6f58
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
      
      
      da1a6f58
    • unknown's avatar
      ndb - autotest · 2a00c516
      unknown authored
        Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
          Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
      
      
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
          Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
      ndb/test/ndbapi/testNodeRestart.cpp:
        Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
          Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
      ndb/test/src/NdbBackup.cpp:
        Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
          Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
      ndb/test/src/NdbRestarts.cpp:
        Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
          Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
      2a00c516
  6. 23 Mar, 2006 5 commits
    • unknown's avatar
      config-win.h: · 5aa14b98
      unknown authored
        If CYBOZU defined, set character sets etc
      
      
      include/config-win.h:
        If CYBOZU defined, set character sets etc
      5aa14b98
    • unknown's avatar
      ndb - · deb4d310
      unknown authored
        remove bug#18385 from autotest as it only works on 2 node clusters
      
      
      ndb/test/run-test/daily-basic-tests.txt:
        remove bug#18385 as it only works on 2 node clusters
      deb4d310
    • unknown's avatar
      ndb - · fde02a80
      unknown authored
        minor fixes in test programs
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        Fix conflicting error codes
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Fix conflicting error codes
      ndb/test/ndbapi/testNodeRestart.cpp:
        Fix test program
      fde02a80
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 278b83a8
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b15376
      
      
      include/m_ctype.h:
        Auto merged
      strings/ctype-bin.c:
        Auto merged
      strings/ctype-euc_kr.c:
        Auto merged
      strings/ctype-gb2312.c:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      278b83a8
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49d2b4f0
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b17374
      
      
      49d2b4f0
  7. 22 Mar, 2006 5 commits
    • unknown's avatar
      ndb - · 2279f08a
      unknown authored
        Add per partition info (optionally to ndb_desc)
      
      
      ndb/tools/desc.cpp:
        Add per partition info (optionally to ndb_desc)
      2279f08a
    • unknown's avatar
      ndb - autotest · e74b313c
      unknown authored
        Update makefile for removed files
      
      
      ndb/test/run-test/Makefile.am:
        Update makefile for removed files
      e74b313c
    • unknown's avatar
      ndb - · 4fb98ee6
      unknown authored
        some more ndb-autotest updates (previously uncommitted...but in use)
      
      
      ndb/test/run-test/ndb-autotest.sh:
        More autotest updates
      4fb98ee6
    • unknown's avatar
      ndb - · ad911e85
      unknown authored
        minor update to ndb-autotest.sh and config files
      
      
      ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
        Add SendBufferMemory to remove rare overruns
      ndb/test/run-test/conf-dl145a.txt:
        Add SendBufferMemory to remove rare overruns
      ndb/test/run-test/conf-ndbmaster.txt:
        Add SendBufferMemory to remove rare overruns
      ndb/test/run-test/conf-shark.txt:
        Add SendBufferMemory to remove rare overruns
      ndb/test/run-test/ndb-autotest.sh:
        Add support for conf per host
      ad911e85
    • unknown's avatar
      ndb - bug#18414 · 19340f22
      unknown authored
        Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        New error code
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        remove dumping of LCP info during NF
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding
      ndb/test/ndbapi/testNodeRestart.cpp:
        Add testcase for bug18414
      ndb/test/ndbapi/testTimeout.cpp:
        Fix error code checking
      ndb/test/run-test/daily-basic-tests.txt:
        Add testcase for bug18414
      19340f22
  8. 21 Mar, 2006 2 commits
    • unknown's avatar
      ndb - bug#18118 · 058019f6
      unknown authored
        timeslice DUMP(7015)
      
      
      ndb/include/kernel/signaldata/DumpStateOrd.hpp:
        doc...
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        timeslice DUMP(7015)
      058019f6
    • unknown's avatar
      ndb - bug#18385 · 8ed36cb6
      unknown authored
        Partial system restart, can not try to start with higher GCI that own
        even if knowing about a higher number
      
      
      ndb/include/kernel/signaldata/DumpStateOrd.hpp:
        Add new dump for setting time between gcp
      ndb/include/kernel/signaldata/StartPerm.hpp:
        Move error codes into StartPerm + Add new error code
      ndb/src/kernel/blocks/ERROR_codes.txt:
        Add new error insert
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Move error codes into StartPerm + Add new error code
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Fix so that we don't try to restart to a too new GCI when doing a partial start
        Add new error code when this node later tries to join
      ndb/test/include/NdbRestarter.hpp:
        Add new method for selecting random node
      ndb/test/ndbapi/testSystemRestart.cpp:
        Add new testcase for bug#18385
      ndb/test/run-test/daily-basic-tests.txt:
        Run test in daily-basic
      ndb/test/src/NdbRestarter.cpp:
        Add new method for selecting random node
      8ed36cb6
  9. 20 Mar, 2006 4 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-wl2610 · 591aedaa
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/41-work
      
      
      591aedaa
    • unknown's avatar
      ndb - bug#18352 · ad6dcfb1
      unknown authored
        remove debug prinout
      
      
      ad6dcfb1
    • unknown's avatar
      ndb - wl2610, bug#18352 · d230d0e1
      unknown authored
        Remove useless and tricky state fiddleing in TC
          to syncronize NF_CompleteRep as code is already present in DIH aswell
        Keep broadcast of TAKEOVER_TCCONF for online upgrade
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Add clever dump for showing active operations
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Remove useless and tricky state fiddleing in TC
          to syncronize NF_CompleteRep as code is already present in DIH aswell
          Keep broadcast of TAKEOVER_TCCONF for online upgrade
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Remove useless and tricky state fiddleing in TC
          to syncronize NF_CompleteRep as code is already present in DIH aswell
          Keep broadcast of TAKEOVER_TCCONF for online upgrade
      d230d0e1
    • unknown's avatar
      ndb - bug#18352 · 51a093f1
      unknown authored
        Use variable waitfor_response_timeout (depending on TransactionDeadLockTimeout)
        When getting 4012, set NeedAbort and ReleaseOnClose
      
      
      ndb/src/ndbapi/NdbConnection.cpp:
        Use variable for WAITFOR_RESPONSE_TIMEOUT
      ndb/src/ndbapi/Ndbif.cpp:
        Use variable timeout for waitfor, 
          when receiving 4012, set NeedAbort and ReleaseOnClose
      ndb/src/ndbapi/TransporterFacade.cpp:
        Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
      ndb/src/ndbapi/TransporterFacade.hpp:
        Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
      ndb/test/ndbapi/testTimeout.cpp:
        Add testcase for 4012
      ndb/test/run-test/daily-basic-tests.txt:
        Add testcase for 4012
      51a093f1