1. 07 Jun, 2005 13 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 01a5d650
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      01a5d650
    • unknown's avatar
      Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites · 3dba83b9
      unknown authored
      Fix instead wrong call to ha_key_cmp
      This is related to bug #10741 Inserting double value into utf8 column crashes server
      
      
      myisam/mi_key.c:
        Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
      myisam/mi_rnext_same.c:
        Fixed wrong arguments to ha_key_cmp()
        This caused a compare to fail if we first found a key with end space and then same key without end space
      mysql-test/r/ctype_utf8.result:
        Additional test
      mysql-test/t/ctype_utf8.test:
        Additional test
      3dba83b9
    • unknown's avatar
      item_buff.cc: · 8b15aba8
      unknown authored
        Removed an extra space char.
      
      
      sql/item_buff.cc:
        Removed an extra space char.
      8b15aba8
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 571cf5db
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      571cf5db
    • unknown's avatar
      sql_select.cc, item_buff.cc, item.h: · 4da133ca
      unknown authored
        Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
        + COUNT(DISTINCT...) due to an attempt to allocate a too large
        buffer for the BLOB field.
        Now the size of the buffer is limited by max_sort_length.
      group_by.test, group_by.result:
        Added a test case for bug #11088.
      
      
      mysql-test/r/group_by.result:
        Added a test case for bug #11088.
      mysql-test/t/group_by.test:
        Added a test case for bug #11088.
      sql/item.h:
        Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
        + COUNT(DISTINCT...) due to an attempt to allocate a too large
        buffer for the BLOB fields.
        Now the size of the buffer is limited by max_sort_length.
      sql/item_buff.cc:
        Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
        + COUNT(DISTINCT...) due to an attempt to allocate a too large
        buffer for the BLOB fields.
        Now the size of the buffer is limited by max_sort_length.
      sql/sql_select.cc:
        Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
        + COUNT(DISTINCT...) due to an attempt to allocate a too large
        buffer for the BLOB fields.
        Now the size of the buffer is limited by max_sort_length.
      4da133ca
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9f161063
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      9f161063
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 · 6356c580
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-4.1
      
      
      6356c580
    • unknown's avatar
      Accepted openlogging · 295a5542
      unknown authored
      295a5542
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · f51f9ce8
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      f51f9ce8
    • unknown's avatar
      Bug#10253: compound index length and utf8 char set · c9914ac6
      unknown authored
      produces invalid query results
      
      mi_key.c:
        well_formed_length should be executed before space trimming, not after.
      ctype_utf8.test:
      ctype_utf8.result:
        adding test.
      
      
      myisam/mi_key.c:
        Bug#10253: ompound index length and utf8 char set produces invalid query results
        well_formed_length should be executed before space trimming, not after.
      mysql-test/r/ctype_utf8.result:
        adding test.
        adding test.
      mysql-test/t/ctype_utf8.test:
        adding test.
      c9914ac6
    • unknown's avatar
      - BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_distribution" · af72f54b
      unknown authored
        when doing "make install" (they are not needed/useful) outside the build tree. Added
        "mysql_client_test" to the "MySQL-bench" RPM.
      - some small RPM spec file improvements (more variables than hard-coded values, cleanups)
      
      
      scripts/Makefile.am:
        - no need to install "make_win_src_distribution" and "make_win_binary_distribution"
          in "make install" (BUG#10676)
      support-files/mysql.spec.sh:
        - added mysql_client_test to the "bench" subpackage (BUG 10676)
        - use "mysqldatadir" variable instead of hard-coding the path multiple times
        - use the "mysqld_user" variable on all occasions a user name is referenced
        - removed (incomplete) Brazilian translations
        - removed redundant release tags from the subpackage descriptions
      af72f54b
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · e3dc3db6
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      e3dc3db6
    • unknown's avatar
      BUG#7967 Fix mysqlhotcopy --record-log-position · d09d8156
      unknown authored
      
      BitKeeper/etc/ignore:
        Added scripts/mysqlhotcopy.sh.rej to the ignore list
      scripts/mysqlhotcopy.sh:
        BUG#7967 Use fetchrow_hashref() when parsing SHOW SLAVE STATUS so
        that --record-log-pos option will work with all versions from 3.23
        forward and will not break again in the future if additional columns
        are added.
      d09d8156
  2. 06 Jun, 2005 3 commits
  3. 05 Jun, 2005 2 commits
    • unknown's avatar
      mtr_misc.pl, mtr_report.pl: · bfac8534
      unknown authored
        Try kill all children to the mysql-test-run process when exiting
      mtr_process.pl:
        Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting
      mysql-test-run.pl:
        Try kill all children to the mysql-test-run process when exiting
        New --vardir caused problems on Windows
        Changed faulty calls to error() to mtr_error()
      
      
      mysql-test/mysql-test-run.pl:
        Try kill all children to the mysql-test-run process when exiting
        New --vardir caused problems on Windows
        Changed faulty calls to error() to mtr_error()
      mysql-test/lib/mtr_report.pl:
        Try kill all children to the mysql-test-run process when exiting
      mysql-test/lib/mtr_process.pl:
        Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting
      mysql-test/lib/mtr_misc.pl:
        Try kill all children to the mysql-test-run process when exiting
      bfac8534
    • unknown's avatar
      a compiler must see '#pragma implementation' *before* · 062a1b8b
      unknown authored
      '#pragma interface' (that comes with the #include'd header file)
      
      
      062a1b8b
  4. 04 Jun, 2005 4 commits
    • unknown's avatar
      Fix show warnings limit 0 and show warnings limit 0, 0. · d6e0883b
      unknown authored
      Add test coverage for SHOW WARNINGS LIMIT a, b;
      
      
      mysql-test/r/warnings.result:
        Add test coverage for SHOW WARNINGS LIMIT a,b
      mysql-test/t/warnings.test:
        Add test coverage for SHOW WARNINGS LIMIT a,b
      sql/sql_error.cc:
        Fix show warnings limit 0 and show warnings limit 0, 0
      d6e0883b
    • unknown's avatar
      BUG#10948 NDB Replication: Race condition with ALTER/DROP table · 0602da4d
      unknown authored
      BUG#9826  Server crash on schema change ("drop table", "alter table") with NDB
      
      See note on 10948 for detailed explanation.
      
      struct a { void* a; long long b[1]; };
      
      on PPC32 (and 32bit pa risc): 16
      on x86: 12
      
      so a malloc(sizeof(void*)+extra_bits) is wrong.
      
      Assuming that the long long is 64 bit aligned as non-aligned 64bit accesses
      are rather expensive on ppc.
      
      Thanks to paulus for doing the PPC port of valgrind.
      Without which I would no doubt still be trying to find this.
      
      
      ndb/src/ndbapi/DictCache.cpp:
        Fix allocation size for Ndb_local_table_info for architectures such as PPC and PA-RISC (32bit)
        where
        struct a { void* a; long long b;};
        is 64 bit aligned (i.e. sizeof(struct a)==16)
      ndb/src/ndbapi/DictCache.hpp:
        Add warning about having to be the last member in the structure
      0602da4d
    • unknown's avatar
      mergemerged · a681af90
      unknown authored
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      a681af90
    • unknown's avatar
      after mergemerge · 61c12aa2
      unknown authored
      61c12aa2
  5. 03 Jun, 2005 12 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 15eb5a1f
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      15eb5a1f
    • unknown's avatar
      Move USE_PRAGMA_IMPLEMENTATION to proper place · 72dd44b9
      unknown authored
      Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
      Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
      Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
      
      
      mysql-test/r/func_gconcat.result:
        Move innodb specific test to innodb.test
        Changed table name r2 -> t2
        More test to see how ROLLUP was optimized
      mysql-test/r/innodb.result:
        Moved test here form func_gconcat
      mysql-test/r/olap.result:
        New test results after optimization
      mysql-test/t/func_gconcat.test:
        Move innodb specific test to innodb.test
        Changed table name r2 -> t2
        More test to see how ROLLUP was optimized
      mysql-test/t/innodb.test:
        Moved test here form func_gconcat
      sql/field.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/ha_berkeley.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/ha_blackhole.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/ha_heap.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/ha_innodb.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/ha_isam.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/ha_isammrg.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/ha_myisam.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/ha_myisammrg.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/ha_ndbcluster.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/handler.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/hash_filo.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/item.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/item_cmpfunc.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/item_func.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
        Ensure that 'null_value' is not accessed before val() is called
      sql/item_geofunc.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/item_strfunc.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/item_subselect.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/item_sum.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/item_timefunc.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/item_uniq.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/log_event.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/mysql_priv.h:
        Change key_map_full to not be const as we are giving it a proper value on startup
      sql/mysqld.cc:
        Move key_map variables here and initialize key_map_full properly
      sql/opt_range.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/opt_range.h:
        Fix that test_quick_select() works with any ammount of keys
      sql/procedure.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/protocol.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/protocol_cursor.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/set_var.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/sql_analyse.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/sql_class.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/sql_crypt.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/sql_insert.cc:
        Fixed that max_rows is ulong
      sql/sql_list.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/sql_map.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/sql_olap.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/sql_select.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
        Fixed that ROLLUP don't have to always create a temporary table
        Added new argument to remove_const() to make above possible
        Fixed some errors that creapt up when we don't always do a temporary table for ROLLUP
      sql/sql_string.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/sql_table.cc:
        Simple optimizations
        Fixed wrong checking of build_table_path() in undef-ed code
      sql/sql_udf.cc:
        Move USE_PRAGMA_IMPLEMENTATION to proper place
      sql/sql_yacc.yy:
        removed extra {}
      72dd44b9
    • unknown's avatar
      mergemerged · 33022c52
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      33022c52
    • unknown's avatar
      after merge fixes · 7509b500
      unknown authored
      7509b500
    • unknown's avatar
      merged · 70442e0a
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/create.result:
        merged, need fixing
      sql/sql_parse.cc:
        merged (perhaps wrong)
      70442e0a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · ef30cc61
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      ef30cc61
    • unknown's avatar
      *don't* mess with kernel defines, boy. · 78fc4172
      unknown authored
      and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure
      
      
      78fc4172
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0298ebb5
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      0298ebb5
    • unknown's avatar
      check-cpu fixes/improvements (Bug #11065) · fcb3be9f
      unknown authored
          
          - support additional platforms (OpenBSD, Darwin)
          - make use of /proc/cpuinfo CPU flag information
            (needed to distinguish EMT64 Xeons from normal ones)
          - chose the right CPU related options depending on 
            GCC version and target architecture
          - check if the chosen CPU type is actually supported
            by the GCC version , fallback to CPUs predecessor
            until test compile succeeds
      
      
      fcb3be9f
    • unknown's avatar
      sql_repl.cc: · 74dd6421
      unknown authored
        Bug #11064  	some read error not detected in replication on 64-bit platform
      
      
      sql/sql_repl.cc:
        Bug #11064  	some read error not detected in replication on 64-bit platform
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      74dd6421
    • unknown's avatar
      bundle the check-cpu helper script with source packages. · 9979feb3
      unknown authored
      BUG#10696
      
      
      9979feb3
    • unknown's avatar
      ctype_utf8.result, ctype_utf8.test: · 52b70cef
      unknown authored
        adding test
      field.cc:
        bug#10714 Inserting double value into utf8 column crashes server:
        sprintf was executed with too big length, which caused
        crash on some Windows platforms.
      
      
      sql/field.cc:
        bug#10714 Inserting double value into utf8 column crashes server
        sprintf was executed with too long length, which cau
        crashe on Windows.
      mysql-test/t/ctype_utf8.test:
        adding test
      mysql-test/r/ctype_utf8.result:
        adding test
      52b70cef
  6. 02 Jun, 2005 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 74f3014c
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      74f3014c
    • unknown's avatar
      Removed duplicated and wrong merged code · 1b999482
      unknown authored
      
      sql/sql_base.cc:
        Fixed wrong comment
      1b999482
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 336d32b1
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/tmp
      
      
      336d32b1
    • unknown's avatar
      CommandInterpreter.cpp: · 28a467c6
      unknown authored
        Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
      28a467c6
    • unknown's avatar
      fixed compile problem by replacing W_OK with F_OK · dd3225b2
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      dd3225b2
    • unknown's avatar
      item_func.cc: · 17678a7b
      unknown authored
      set_var.cc:
      variables.result
      variables.test
      
        Bug #10904 Illegal mix of collations between a system variable and a constant
        Changing coercibility of system variables to SYSCONST,
        to be the same with USER(), DATABASE(), etc.
      
      
      sql/item_func.cc:
        Bug #10904 Illegal mix of collations between a system variable and a constant
        Changing coercibility of system variables to SYSCONST
        To be the same with USER(), DATABASE(), etc.
      17678a7b