1. 19 May, 2005 12 commits
  2. 18 May, 2005 28 commits
    • unknown's avatar
      Fixes to merge from 4.1 · 3e2988d0
      unknown authored
      
      client/mysqldump.c:
        Temporarily disable unused (and broken) code.
      mysql-test/r/group_min_max.result:
        Update results
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/r/subselect.result:
        Update results
      mysql-test/t/group_min_max.test:
        Ignore number of rows in output of most explain results
      sql/sql_insert.cc:
        Fix reference to max_unique_length
      3e2988d0
    • unknown's avatar
      Resolve merge from 4.1 · 2de8a4bc
      unknown authored
      
      mysql-test/r/grant_cache.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/grant_cache.test:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      sql/ha_myisammrg.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/handler.h:
        Resolve merge
      sql/table.cc:
        Resolve merge
      2de8a4bc
    • unknown's avatar
      Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1 · 9e8cad1d
      unknown authored
      into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
      
      
      9e8cad1d
    • unknown's avatar
      merge · 53f0fb08
      unknown authored
      
      sql/mysqld.cc:
        Auto merged
      53f0fb08
    • unknown's avatar
      Fixed bug from last push · 7a71bd4b
      unknown authored
      7a71bd4b
    • unknown's avatar
      Resolve merge from 4.1 · f8a20dbe
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      client/mysqldump.c:
        Resolve merge
      mysql-test/r/myisam.result:
        Resolve merge
      mysql-test/r/mysqldump.result:
        Resolve merge
      mysql-test/r/olap.result:
        Resolve merge
      mysql-test/r/subselect.result:
        Resolve merge
      mysql-test/t/myisam.test:
        Resolve merge
      mysql-test/t/mysqldump.test:
        Resolve merge
      mysql-test/t/olap.test:
        Resolve merge
      mysql-test/t/range.test:
        Resolve merge
      mysql-test/t/subselect.test:
        Resolve merge
      ndb/src/common/util/version.c:
        Resolve merge
      ndb/src/ndbapi/ndberror.c:
        Resolve merge
      sql/item.cc:
        Resolve merge
      sql/item_strfunc.h:
        Resolve merge
      sql/sql_select.cc:
        Resolve merge
      sql/sql_yacc.yy:
        Resolve merge
      f8a20dbe
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 7a223fe8
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      7a223fe8
    • unknown's avatar
      Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE · 0461b482
      unknown authored
      After review version.
      Added a condition for MERGE tables. These do not have unique
      indexes. But every key could be a unique key on the underlying
      MyISAM table. So get the maximum key length for MERGE tables
      instead of the maximum unique key length. This is used for
      buffer allocation in write_record().
      
      
      mysql-test/r/merge.result:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        The test result.
      mysql-test/t/merge.test:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        The test case does not in all cases show the problem
        without the bugfix. The improper memory allocation
        might get through undetected in many cases.
      sql/ha_myisammrg.h:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        Set a table_flag for the MERGE engine telling that any index
        might be unique without being specified as such.
      sql/handler.h:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        Added a new table_flag telling that any index
        might be unique without being specified as such.
      sql/sql_insert.cc:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        Changed the freeing of the memory to be symmetric to its
        allocation (my_safe_alloc -> my_safe_afree).
        This is not directly related to the bug.
      sql/table.cc:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        Added a condition for MERGE tables. These do not have unique
        indexes. But every key could be a unique key on the underlying
        MyISAM table. So get the maximum key length for MERGE tables
        instead of the maximum unique key length. This is used for
        buffer allocation in write_record().
      0461b482
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · d104149c
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      d104149c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6f7bccd1
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-root
      
      
      include/my_dbug.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      6f7bccd1
    • unknown's avatar
      Fix a couple of compilation failures. · 1816b5a4
      unknown authored
      
      include/my_dbug.h:
        Fix conflicting declaration and definition of db_output.
      sql/mysqld.cc:
        Fix a compilation failure.
      1816b5a4
    • unknown's avatar
      New file default_modify.c. Fixed a typo on mysqld.cc · 48ce8aeb
      unknown authored
      Changed name of function my_correct_default_file to
      modify_defaults_file. Improved function and fixed some
      bugs in it.
      
      
      include/my_sys.h:
        Changed function name.
      include/mysql_com.h:
        New function, modify_defaults_file()
      libmysql/Makefile.shared:
        New file, default_modify.lo
      libmysql/libmysql.def:
        New function, modify_defaults_file() and fixed version number.
      libmysqld/libmysqld.def:
        New function, modify_defaults_file()
      mysys/Makefile.am:
        New file, default_modify.c
      mysys/default.c:
        Removed function from default.c. New, corresponding one is in default_modify.c,
        name is modify_defaults_file.
      server-tools/instance-manager/commands.cc:
        Changed function name.
      sql/mysqld.cc:
        Fixed typo.
      48ce8aeb
    • unknown's avatar
      Update mysqldump test and results · 53af474b
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/t/mysqldump.test:
        Fix test to not include version number in results
      53af474b
    • unknown's avatar
      Fix conflicting declaration and definition of db_output (compilation · 40772ccc
      unknown authored
      failure).
      
      
      include/my_dbug.h:
        Fix conflicting declaration and definition of db_output.
      40772ccc
    • unknown's avatar
      Resolve bugfix merge · 0f02da9f
      unknown authored
      
      client/mysqldump.c:
        Merge bug fix
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/t/mysqldump.test:
        Merge bug fix
      0f02da9f
    • unknown's avatar
      Small optimization to bug fix, from Monty. · eff871bd
      unknown authored
      
      client/mysqldump.c:
        Optimize away a call to strend() by using return value of my_snprintf()
      eff871bd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0295b2eb
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-root
      
      
      0295b2eb
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · ada80876
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      ada80876
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-5.0-root · 6f59f4a6
      unknown authored
      into mysql.com:/media/sda1/mysql/mysql-5.0-libtool
      
      
      6f59f4a6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8b1d4fd3
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      8b1d4fd3
    • unknown's avatar
      Fix warnings from icc · d93806ef
      unknown authored
      Added BUILD scripts for icc
      Fixed (one time) memory leak in grant handling
      
      
      config/ac-macros/misc.m4:
        Remove warnings flags from icc when compiling with -Werror
      configure.in:
        Remove warnings flags from icc when compiling with -Werror
      extra/replace.c:
        Fix warnings from icc
      include/my_dbug.h:
        Fix warnings from icc
      sql/gen_lex_hash.cc:
        Fix warnings from icc
      sql/mysql_priv.h:
        Add missing variables
      sql/mysqld.cc:
        Fix warnings from icc:
        - made a lot of variables static
        - Removing some not used variables
        - Fixed wrong printf()
        - removed extern "C" from some functions
      sql/spatial.h:
        Fix warnings from icc
      sql/sql_acl.cc:
        Fixed memory leak
      sql/sql_lex.cc:
        Fix warnings from icc
      sql/sql_lex.h:
        Fix warnings from icc
      d93806ef
    • unknown's avatar
      ndb - allow upgrade 4.1.10->4.1.12 · fed9e191
      unknown authored
      
      ndb/src/common/util/version.c:
        allow upgrade 4.1.10->4.1.12
      fed9e191
    • unknown's avatar
    • unknown's avatar
      make_win_src_distribution.sh: · 6e1e571b
      unknown authored
        Add YASSL to Windows source distribution
        Skip .deps, and remove .o files from source dist
      
      
      scripts/make_win_src_distribution.sh:
        Add YASSL to Windows source distribution
        Skip .deps, and remove .o files from source dist
      6e1e571b
    • unknown's avatar
      Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1 · 57ba8d3e
      unknown authored
      into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
      
      
      57ba8d3e
    • unknown's avatar
      reduced 1 server reloding during test · 8c4e2860
      unknown authored
      
      BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
        Delete: mysql-test/t/grant_cache-master.opt
      mysql-test/r/grant_cache.result:
        query cache management moved inside test
      mysql-test/t/grant_cache.test:
        query cache management moved inside test to privent server reloading during test
      8c4e2860
    • unknown's avatar
      Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 · 880bff92
      unknown authored
      into lmy003.wdf.sap.corp:/home/schwenke/Work/MySQL/bk-internal-tree/mysql-5.0
      
      
      880bff92
    • unknown's avatar
      new build scripts for SAP team · a847042f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      a847042f