1. 28 Feb, 2005 6 commits
    • unknown's avatar
      Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause · 749a27c5
      unknown authored
      the error to be sent to the client.
      
      
      mysql-test/r/select_safe.result:
        Testcase for BUG#8726
      mysql-test/t/select_safe.test:
        Testcase for BUG#8726
      sql/sql_select.cc:
        Fix for BUG#8726: On ER_TOO_BIG_SELECT set JOIN::error to -1 to cause the error to be sent to the client.
      749a27c5
    • unknown's avatar
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 · f32ff06f
      unknown authored
      into mysql.com:/home/psergey/mysql-4.0-look
      
      f32ff06f
    • unknown's avatar
      Merge · 28e5e596
      unknown authored
      28e5e596
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3feab771
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      BitKeeper/etc/ignore:
        added support-files/ndb-config-2-node.ini
      3feab771
    • unknown's avatar
      Fixed wrong memory references found by purify · d2ce2d2e
      unknown authored
      (No really critical errors found, but a few possible wrong results)
      
      
      innobase/dict/dict0dict.c:
        Replace memcmp with comparison of characters to avoid warnings from purify when 'sptr' points to a very short string
      mysql-test/r/select_found.result:
        Add missing drop table
      mysql-test/r/type_set.result:
        More tests
      mysql-test/t/select_found.test:
        Add missing drop table
      mysql-test/t/type_set.test:
        More tests
      mysys/my_init.c:
        Avoid warning from purify (purify doesn't handle getrusage() properly)
      sql/field.h:
        enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
      sql/filesort.cc:
        enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
      sql/item_cmpfunc.cc:
        Fixed warning from purify. (Not critical as the arguments are passed to a function but not used)
        Allocate Arg_comparator() with 'new' instead of sql_alloc() to ensure proper initialization
      sql/mysqld.cc:
        Wait for signal handler to stop when running --bootstrap
        (Fixes warning from purify)
      sql/sql_insert.cc:
        Initialize slot used by innodb.cc (not critical)
      sql/sql_lex.h:
        Better comments
      sql/sql_repl.cc:
        memcmp -> bcmp() to avoid warning from purify
      sql/sql_select.cc:
        Fix for out-of-bound memory reference when doing DISTINCT on const expressions
      strings/ctype-simple.c:
        Fixes to not access uninitialized memory
        (Not critical)
      d2ce2d2e
  2. 26 Feb, 2005 1 commit
    • unknown's avatar
      Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary... · 492816d9
      unknown authored
      Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary collation. max_sort_char is needed by
      my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.
      
      
      mysql-test/r/ctype_cp1251.result:
        Test for BUG#8560
      mysql-test/t/ctype_cp1251.test:
        Test for BUG#8560
      492816d9
  3. 25 Feb, 2005 11 commits
    • unknown's avatar
      fil0fil.c: · deffd89f
      unknown authored
        Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message
      
      
      innobase/fil/fil0fil.c:
        Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message
      deffd89f
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4ac695f4
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      4ac695f4
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 43e566e6
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1-again
      
      43e566e6
    • unknown's avatar
      mysqldump.c: · 5530a80f
      unknown authored
        Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client
      
      
      client/mysqldump.c:
        Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client
      5530a80f
    • unknown's avatar
      merge · 3c199995
      unknown authored
      3c199995
    • unknown's avatar
      merge · bd3d749a
      unknown authored
      bd3d749a
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a01df9c1
      unknown authored
      into mysql.com:/usr/home/ram/work/4.1.b4802
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysql.cc:
        Auto merged
      a01df9c1
    • unknown's avatar
      add auto generated ndb dsp-files (for msvc++ 6.0) to ignore file · e852cc67
      unknown authored
      
      BitKeeper/etc/ignore:
        added ndb/src/common/debugger/signaldata/libsignaldataprint.dsp ndb/src/common/debugger/libtrace.dsp ndb/src/common/logger/liblogger.dsp ndb/src/common/mgmcommon/libmgmsrvcommon.dsp ndb/src/common/portlib/libportlib.dsp ndb/src/common/transporter/libtransporter.dsp ndb/src/common/util/libgeneral.dsp ndb/src/kernel/blocks/backup/libbackup.dsp ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp ndb/src/kernel/blocks/dbacc/libdbacc.dsp ndb/src/kernel/blocks/dbdict/libdbdict.dsp ndb/src/kernel/blocks/dbdih/libdbdih.dsp ndb/src/kernel/blocks/dblqh/libdblqh.dsp ndb/src/kernel/blocks/dbtc/libdbtc.dsp ndb/src/kernel/blocks/dbtup/libdbtup.dsp ndb/src/kernel/blocks/dbtux/libdbtux.dsp ndb/src/kernel/blocks/dbutil/libdbutil.dsp ndb/src/kernel/blocks/grep/libgrep.dsp ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp ndb/src/kernel/blocks/ndbfs/libndbfs.dsp ndb/src/kernel/blocks/qmgr/libqmgr.dsp ndb/src/kernel/blocks/suma/libsuma.dsp ndb/src/kernel/blocks/trix/libtrix.dsp ndb/src/kernel/error/liberror.dsp ndb/src/kernel/vm/libkernel.d
        sp ndb/src/kernel/ndbd.dsp ndb/src/mgmapi/libmgmapi.dsp ndb/src/mgmclient/ndb_mgm.dsp ndb/src/mgmclient/libndbmgmclient.dsp ndb/src/mgmsrv/ndb_mgmd.dsp ndb/src/ndbapi/libndbapi.dsp ndb/src/libndbclient.dsp ndb/test/ndbapi/flexBench.dsp ndb/test/ndbapi/testBasic.dsp ndb/test/ndbapi/testBlobs.dsp ndb/test/ndbapi/testScan.dsp ndb/test/src/libNDBT.dsp ndb/tools/ndb_waiter.dsp ndb/tools/ndb_drop_table.dsp ndb/tools/ndb_delete_all.dsp ndb/tools/ndb_desc.dsp ndb/tools/ndb_drop_index.dsp ndb/tools/ndb_show_tables.dsp ndb/tools/ndb_select_all.dsp ndb/tools/ndb_select_count.dsp
      e852cc67
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 63eb7c28
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      63eb7c28
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/fix · e30e1689
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      e30e1689
    • unknown's avatar
      BUG#8786 - ndb_autodiscover, post review · 2cf4eb82
      unknown authored
        More explicit naming of variables
      
      
      ndb/include/kernel/signaldata/AlterIndx.hpp:
        Add union to indicate where master node is passed in ref
      ndb/include/kernel/signaldata/BuildIndx.hpp:
        Add union to indicate where master node is passed in ref
      ndb/include/kernel/signaldata/CreateIndx.hpp:
        Add union to indicate where master node is passed in ref
      ndb/include/kernel/signaldata/CreateTrig.hpp:
        Add union to indicate where master node is passed in ref
      ndb/include/kernel/signaldata/DropIndx.hpp:
        Add union to indicate where master node is passed in ref
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Set error/master node also on BuildIndxRef
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Use masterNodeId instead of errornode
      2cf4eb82
  4. 24 Feb, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/fix · 6afb6b93
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      6afb6b93
    • unknown's avatar
      bug#8786 - ndb autodiscover, sometimes fails · 18df4f33
      unknown authored
        remove dict forwarding
        add api retries on NotMaster
        
      
      
      ndb/include/kernel/signaldata/AlterIndx.hpp:
        Add NotMaster error code
      ndb/include/kernel/signaldata/BuildIndx.hpp:
        Add NotMaster error code
      ndb/include/kernel/signaldata/CreateIndx.hpp:
        Add NotMaster error code
      ndb/include/kernel/signaldata/CreateTrig.hpp:
        Add NotMaster error code
      ndb/include/kernel/signaldata/DropIndx.hpp:
        Add NotMaster error code
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Never forward requests,
          instead REF to API who will retry towards correct node
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        1) Set error code for timeout
        2) Handle NotMaster with retry in all DICT requests
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Fix so that input values is in seconds and not 100ms's
      sql/ha_ndbcluster.cc:
        Wait 3 sec for all nodes to connect...
      18df4f33
    • unknown's avatar
      Fix of an incorrect merge · 812fcb05
      unknown authored
      812fcb05
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c45ede4c
      unknown authored
      into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
      
      c45ede4c
    • unknown's avatar
      Bootstrap: · fc72dac1
      unknown authored
        Add new manual.texi include files
      
      
      Build-tools/Bootstrap:
        Add new manual.texi include files
      fc72dac1
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1083e571
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      1083e571
  5. 23 Feb, 2005 10 commits
  6. 22 Feb, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-7989 · 846944a2
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/sql_acl.cc:
        Auto merged
      846944a2
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 8fc31f71
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      8fc31f71
    • unknown's avatar
      row0sel.c: · 2b95e43a
      unknown authored
        Fix bug #8677: if one used LOCK TABLES, created an InnoDB temp table, and did a multi-table update where a MyISAM table was the update table and the temp table was a read table, then InnoDB aserted in row0sel.c because n_mysql_tables_in_use was 0. Also, we remove the assertion altogether and just print an error to the .err log if this important consistency check fails. Then it is up to the user to read the .err log and notice the problem if there still are errors in MySQL's table locking.
      
      
      innobase/row/row0sel.c:
        Fix bug #8677: if one used LOCK TABLES, created an InnoDB temp table, and did a multi-table update where a MyISAM table was the update table and the temp table was a read table, then InnoDB aserted in row0sel.c because n_mysql_tables_in_use was 0. Also, we remove the assertion altogether and just print an error to the .err log if this important consistency check fails. Then it is up to the user to read the .err log and notice the problem if there still are errors in MySQL's table locking.
      2b95e43a
    • unknown's avatar
    • unknown's avatar
      Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9d84434d
      unknown authored
      into mysql.com:/home/bkroot/mysql-4.1
      
      9d84434d
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 · 8dddd058
      unknown authored
      
      sql/log_event.cc:
        Auto merged
      8dddd058