1. 13 Apr, 2006 1 commit
    • unknown's avatar
      BUG#17917 - SELECT from compressed MyISAM table crashes MySQL server · d316b8b1
      unknown authored
      Retrieving data from compressed MyISAM table which is bigger than 4G on 32-bit box
      with mmap() support results in server crash.
      
      mmap() accepts length of bytes to be mapped in second param, which is 32-bit
      size_t. But we pass data_file_length, which is 64-bit my_off_t. As a result only
      first data_file_length % 4G were mapped.
      
      This fix adds additional condition for mmap() usage, that is use mmap() for
      compressed table which size is no more than 4G on 32-bit platform.
      
      
      myisam/mi_packrec.c:
        Use mmap() for compressed table which size is no more than 4G on 32-bit platform.
      d316b8b1
  2. 10 Apr, 2006 2 commits
  3. 08 Apr, 2006 2 commits
  4. 07 Apr, 2006 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f37d6101
      unknown authored
      into  mysql.com:/opt/local/work/mysql-4.1-16365
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/r/ps.result:
        Manual merge
      mysql-test/t/ps.test:
        Manual merge
      f37d6101
    • unknown's avatar
      A fix and a test case for Bug#16365 "Prepared Statements: DoS with · 5b5530da
      unknown authored
      too many open statements". The patch adds a new global variable
      @@max_prepared_stmt_count. This variable limits the total number
      of prepared statements in the server. The default value of
      @@max_prepared_stmt_count is 16382. 16382 small statements
      (a select against 3 tables with GROUP, ORDER and LIMIT) consume 
      100MB of RAM. Once this limit has been reached, the server will 
      refuse to prepare a new statement and return ER_UNKNOWN_ERROR 
      (unfortunately, we can't add new errors to 4.1 without breaking 5.0). The limit is changeable after startup
      and can accept any value from 0 to 1 million. In case
      the new value of the limit is less than the current
      statement count, no new statements can be added, while the old
      still can be used. Additionally, the current count of prepared 
      statements is now available through a global read-only variable 
      @@prepared_stmt_count.
      
      
      mysql-test/r/ps.result:
        Test results fixed (a test case for Bug#16365)
      mysql-test/t/ps.test:
        A test case for Bug#16365 "Prepared Statements: DoS with too many 
        open statements". Also fix statement leaks in other tests.
      sql/mysql_priv.h:
        Add declarations for new global variables.
      sql/mysqld.cc:
        Add definitions of max_prepared_stmt_count, prepared_stmt_count.
      sql/set_var.cc:
        Implement support for @@prepared_stmt_count and 
        @@max_prepared_stmt_count. Currently these variables are queried
        without acquiring LOCK_prepared_stmt_count due to limitations of
        the set_var/sys_var class design. Updates are, however, protected 
        with a lock.
      sql/set_var.h:
        New declarations to add support for @@max_prepared_stmt_count.
        Implement a new class, where the lock to be used when updating
        a variable is a parameter.
      sql/sql_class.cc:
        Add accounting of the total number of prepared statements in the
        server to the methods of Statement_map.
      sql/sql_class.h:
        Add accounting of the total number of prepared statements in the
        server to the methods of Statement_map.
      sql/sql_prepare.cc:
        Statement_map::insert will now send a message in case of an
        error.
      5b5530da
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · e4e37ae5
      unknown authored
      into mysql.com:/M41/mtr-4.1
      
      
      e4e37ae5
    • unknown's avatar
      A fix and a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?)) · 9b6e83f4
      unknown authored
      gives wrong results". Implement previously missing 
      Item_row::cleanup. The bug is not repeatable in 5.0, probably 
      due to a coincidence: the problem is present in 5.0 as well.
      
      
      mysql-test/r/ps.result:
        Update the result file (Bug#16248)
      mysql-test/t/ps.test:
        Add a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?)) gives 
        wrong results"
      sql/item_row.cc:
        Implement Item_row::cleanup(): we should reset used_tables_cache
        before reexecution of a prepared statement. In case ROW
        arguments contain a placeholder, used_tables_cache has PARAM_TABLE
        bit set in statement prepare. As a result, when executing a statement,
        the condition push down algorithm (make_cond_for_table) would think
        that the WHERE clause belongs to the non-existent PARAM_TABLE and
        wouldn't attach the WHERE clause to any of the real tables, 
        effectively optimizing the clause away.
      sql/item_row.h:
        Remove a never used member 'array_holder'. Add declaration for
        Item_row::cleanup.
      9b6e83f4
    • unknown's avatar
      Manual merge. · a024fd69
      unknown authored
      a024fd69
    • unknown's avatar
      mysql-test/mysql-test-run.sh : Provide info about the options used. · 747f81c2
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Provide info about the options used for this run to any evaluation tool.
      747f81c2
    • unknown's avatar
      mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored). · 7bb18828
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Add option "with-ndbcluster-only" (ignored) for compatibility with newer "Do-compile".
      7bb18828
    • unknown's avatar
      Perl test script: Avoid some aborts, which made the whole build/test process terminate. · 8fc0c48d
      unknown authored
      
      mysql-test/lib/mtr_process.pl:
        Change from "mtr_error()" to "mtr_warning()" on some problems,
        because "error" makes the whole suite abort which then makes "Do-compile" terminate,
        so none of the following steps (including other etst suites) will be done.
      8fc0c48d
    • unknown's avatar
      mysql-test/mysql-test-run.sh : Add option "--with-ndbcluster-only" (backport from 5.1) · 6206e7c2
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Manual merge from 4.0 (which was a 5.1 backport):
        "--with-ndbcluster" is already present,
        "--with-ndbcluster-only" is really usable here.
      6206e7c2
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 6caa2495
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/41-work
      
      
      6caa2495
  5. 06 Apr, 2006 5 commits
    • unknown's avatar
      Backport of 5.1 test options "--with-ndbcluster" and "--with-ndbcluster-only" as dummies (ignored). · ff85ba77
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Make "mysql-test-run.sh" accept (and ignore) the options "--with-ndbcluster" 
        and "--with-ndbcluster-only".
        This is necessary because newer build tools will issue them, and the test 
        script should tolerate that.
        Backport from 5.1 (Tomas Ulin, 2006-01-17)
      ff85ba77
    • unknown's avatar
      ndb - bug#18612 - post review fixes · b96e8d7a
      unknown authored
        1) make sure that check_multi_node_shutdown does not proceed (in stop case)
        2) Fix printout
      
      
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        make sure that check_multi_node_shutdown does not proceed (in stop case)
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        make sure that check_multi_node_shutdown does not proceed (in stop case)
      b96e8d7a
    • unknown's avatar
      libmysql.c: · 00cfd1a7
      unknown authored
        Bug#18830: incompatibility new libraries with old server
        Don't execute SET NAMES with pre-4.1 server.
      
      
      libmysql/libmysql.c:
        Bug#18830: incompatibility new libraries with old server
        Don't execute SET NAMES with pre-4.1 server.
      00cfd1a7
    • unknown's avatar
      This problem has already been fixed by one of the previous changes. · 5475703b
      unknown authored
      Adding test case to cover queries which worked incorrectly earlier:
      Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
      
      
      mysql-test/r/ctype_latin1.result:
        Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
      mysql-test/t/ctype_latin1.test:
        Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
      5475703b
    • unknown's avatar
      conf_to_src.c: · fafa4c5a
      unknown authored
        Backporting a 5.0 change:
        MAX_BUF was too small for Index.xml
        Changeing MAX_BUF and adding assert to easier
        catch the same problem in the future.
      ctype-extra.c:
        Regenerating ctype-extra.c with the fixed conf_to_src.
      
      
      strings/ctype-extra.c:
        Regenerating ctype-extra.c with the fixed conf_to_src.
      strings/conf_to_src.c:
        Backporting a 5.0 change:
        MAX_BUF was too small for Index.xml
        Changeing MAX_BUF and adding assert to easier
        catch the same problem in the future.
      fafa4c5a
  6. 03 Apr, 2006 8 commits
    • unknown's avatar
      ndb - · e15ff618
      unknown authored
        fix testprogam if only 1 node group
      
      
      ndb/test/ndbapi/testNodeRestart.cpp:
        fix testprogam if only 1 node group
      e15ff618
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · a47bba1f
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.12076
      
      
      a47bba1f
    • unknown's avatar
      ndb - · 4ffa1acc
      unknown authored
        Fix compile error...when compiling debug
      
      
      ndb/include/kernel/signaldata/FailRep.hpp:
        Fix compile error...when compiling debug
      4ffa1acc
    • unknown's avatar
      ndb - bug#18612 - partitioned startup · 063a0027
      unknown authored
        add testprg for SR case aswell
      
      
      ndb/test/ndbapi/testNodeRestart.cpp:
        Test also partitioned start during SR
      ndb/test/run-test/daily-basic-tests.txt:
        Test also partitioned start during SR
      063a0027
    • unknown's avatar
      ndb - bug#18612 · 3f5bfe4f
      unknown authored
        post weeked fixes :-)
        change impl. to use READ_NODESREQ to query state of other qmgr(partition)
          this as it has no (current) side effects, so that it's possible only to kill
          starting cluster (if one started and one starting)
      
      
      ndb/include/kernel/signaldata/FailRep.hpp:
        Add paritioned FAIL_REP
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
      ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
        Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
      ndb/test/ndbapi/testNodeRestart.cpp:
        Require that only starting cluster dies
      3f5bfe4f
    • unknown's avatar
      Makefile.am: · 2574445e
      unknown authored
        Distribute mysql-test-run.pl
      
      
      mysql-test/Makefile.am:
        Distribute mysql-test-run.pl
      2574445e
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · d2744ebc
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
      
      
      scripts/mysql_install_db.sh:
        Auto merged
      d2744ebc
    • unknown's avatar
      mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c: · e2b19a59
      unknown authored
        Changed web address order.mysql.com to shop.mysql.com
      
      
      netware/mysql_install_db.c:
        Changed web address order.mysql.com to shop.mysql.com
      Docs/MySQLEULA.txt:
        Changed web address order.mysql.com to shop.mysql.com
      scripts/mysql_install_db.sh:
        Changed web address order.mysql.com to shop.mysql.com
      e2b19a59
  7. 02 Apr, 2006 1 commit
    • unknown's avatar
      Makefile.am: · 6de1d9d3
      unknown authored
        Install Perl mysql-test-run into test directory
      
      
      mysql-test/Makefile.am:
        Install Perl mysql-test-run into test directory
      6de1d9d3
  8. 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
  9. 31 Mar, 2006 4 commits
    • unknown's avatar
      ndb - autotest · 9319c2c7
      unknown authored
        add new testpgrom for bug#18612 to autotest
      
      
      ndb/test/run-test/daily-basic-tests.txt:
        Add new testprogram to autotest
      9319c2c7
    • unknown's avatar
      ndb - bug#18612 (detection of partitioned cluster) · c961fefd
      unknown authored
        this also impl. gcp safe multi node shutdown
        1) block gcp
        2) wait for ongoing gcp
        3) inform all stopping QMGR's (so that they don't start with error handler)
        4) wait for all QMGR's to reply
        5) broadcast failrep for stopping nodes
        6) (if !master died) unblock gcp
      
        
      
      
      ndb/include/kernel/signaldata/DumpStateOrd.hpp:
        Impl. GCP safe multi node shutdown in order to test bug#18612
      ndb/include/kernel/signaldata/FailRep.hpp:
        Impl. GCP safe multi node shutdown in order to test bug#18612
      ndb/include/kernel/signaldata/StopReq.hpp:
        Impl. GCP safe multi node shutdown in order to test bug#18612
      ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
        Impl. GCP safe multi node shutdown in order to test bug#18612
      ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
        Impl. GCP safe multi node shutdown in order to test bug#18612
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Impl. GCP safe multi node shutdown in order to test bug#18612
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Impl. GCP safe multi node shutdown in order to test bug#18612
      ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
        Impl. GCP safe multi node shutdown in order to test bug#18612
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Impl. GCP safe multi node shutdown in order to test bug#18612
      ndb/test/ndbapi/testNodeRestart.cpp:
        test program for bug#18612
      c961fefd
    • unknown's avatar
      ndb - add support for blocking/unblocking GCP using WAIT_GCP_REQ · 7efbf0af
      unknown authored
      
      ndb/include/kernel/signaldata/WaitGCP.hpp:
        Add supprt for block/unblocking GCP
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Add supprt for block/unblocking GCP
      7efbf0af
    • unknown's avatar
      ndb - bug#16447 · e2b6987a
      unknown authored
        correct return value in check_cm_cmregreq
      
      
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Fix bug in bug#16447
      ndb/test/src/NdbRestarts.cpp:
        Fix bug in test program
      e2b6987a
  10. 30 Mar, 2006 2 commits
    • unknown's avatar
      ndb - bug#15695 bug#16447 bug#18612 · 5a25026d
      unknown authored
        For various reasone have a partitioned cluster been created
        This patch makes sure that when they connect
        1) it's detected
        2) shutdown is forced
      
      
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        New dump/error insert for simulating network failure
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        1) Activly detect paritioned cluster(s)
        2) add some documentation
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        1) Activly detect paritioned cluster(s)
        2) add some documentation
      5a25026d
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ff4de905
      unknown authored
      into sunlight.local:/local_work/15560-bug-4.1-mysql
      
      
      sql/sql_table.cc:
        Auto merged
      ff4de905