1. 09 May, 2005 12 commits
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-5.0.clean · b3d194f2
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.emb
      
      
      b3d194f2
    • unknown's avatar
      Fix for bug #9632 (strict.test fails in -embedded-server mode) · 59f6cf25
      unknown authored
      
      libmysqld/libmysqld.c:
        we need this code before we create thd instance
      sql/sql_parse.cc:
        dispatch_command is the more appropriate place for this code
      59f6cf25
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d6f7a337
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      d6f7a337
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 24dcd86d
      unknown authored
      into mysql.com:/home/ram/work/5.0
      
      
      24dcd86d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 17297898
      unknown authored
      into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-5.0
      
      
      17297898
    • unknown's avatar
      make_binary_distribution.sh: · 1ccfed7d
      unknown authored
        - Print the platform name for the build logs.
      
      
      scripts/make_binary_distribution.sh:
        - Print the platform name for the build logs.
      1ccfed7d
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug10241 · 81c53446
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      include/my_global.h:
        Auto merged
      81c53446
    • unknown's avatar
      After review fixes · 4be881f2
      unknown authored
      
      include/my_global.h:
        Add "&& defined(__GNUC__)"
      4be881f2
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug10241 · d406a647
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      include/my_global.h:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_berkeley.h:
        Auto merged
      sql/ha_heap.h:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.h:
        Auto merged
      sql/ha_myisammrg.h:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_geofunc.h:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/item_sum.h:
        Auto merged
      BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
        Auto merged
      BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
        Auto merged
      sql/examples/ha_archive.h:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/procedure.h:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_string.h:
        Auto merged
      sql/sql_udf.h:
        Auto merged
      sql/tztime.h:
        Auto merged
      d406a647
    • unknown's avatar
      Brian's mysqldump test modifications made on Ramil's laptop. · e7c27b6f
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Brian's modifications made on Ramil's laptop.
      mysql-test/t/mysqldump.test:
        Brian's modifications made on Ramil's laptop.
      e7c27b6f
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 312942b9
      unknown authored
      into mysql.com:/home/ram/work/5.0
      
      
      312942b9
    • unknown's avatar
      Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs(). · 51e86278
      unknown authored
      
      sql/opt_range.cc:
        Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs().
        Disable mix/max group by optimization for queries with rollup for now.
        Note: the actual bug was hidden; if this optimization works with rollup
        queries we will have to change some code:
        
        the problem is that we call the join->make_sum_func_list() function against 
        changed thd->mem_root (see SQL_SELECT::test_quick_select()) which creates some
        items for rollup, then we free that mem_root, then we try to reuse (free) those
        items.
      51e86278
  2. 08 May, 2005 16 commits
    • unknown's avatar
      Merge · 291a628e
      unknown authored
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      client/client_priv.h:
        c
        e
        ?
        h
      mysql-test/t/mysqldump.test:
        Resolved conflict.
      291a628e
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 848611b5
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      848611b5
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · d808b76d
      unknown authored
      into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
      
      
      d808b76d
    • unknown's avatar
      make_binary_distribution.sh: · 67312e3d
      unknown authored
        - Remove vendor tag from package names.
        - Map standard OS names to user-friendly versions.
      
      
      scripts/make_binary_distribution.sh:
        - Remove vendor tag from package names.
        - Map standard OS names to user-friendly versions.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      67312e3d
    • unknown's avatar
      Merge · b40842f2
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
        Auto merged
      configure.in:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/ha_blackhole.cc:
        Auto merged
      sql/share/Makefile.am:
        Auto merged
      b40842f2
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 69231460
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      69231460
    • unknown's avatar
      Removed call to cond_push for empty cond · facce925
      unknown authored
      facce925
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · c0f4ae6b
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      c0f4ae6b
    • unknown's avatar
      Fixes to compile with icc · 8b31c677
      unknown authored
      8b31c677
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 1923ddea
      unknown authored
      into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      1923ddea
    • unknown's avatar
      errmsg.txt: · 1a4fd96b
      unknown authored
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      
      
      sql/share/czech/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/danish/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/dutch/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/english/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/estonian/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/french/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/german/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/greek/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/hungarian/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/italian/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/japanese/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/japanese-sjis/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/korean/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/norwegian/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/norwegian-ny/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/polish/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/portuguese/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/romanian/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/russian/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/serbian/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/slovak/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/spanish/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/swedish/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      sql/share/ukrainian/errmsg.txt:
        Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      1a4fd96b
    • unknown's avatar
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · e7849122
      unknown authored
      into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      e7849122
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 · bee950bd
      unknown authored
      into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      bee950bd
    • unknown's avatar
      Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1 · fcf18772
      unknown authored
      into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      fcf18772
    • unknown's avatar
      FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model. · 9a8e31a4
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      9a8e31a4
  3. 07 May, 2005 12 commits
    • unknown's avatar
      Bug#6925 · 40eb77b7
      unknown authored
        Comment/*COMMENT*/is not a separator
        Ensure that whitespace is inserted after C-style comment if required.
      
      
      client/mysql.cc:
        Ensure that whitespace is inserted after C-style comment if required.
      40eb77b7
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1e871729
      unknown authored
      into ltantony.mysql.com:/usr/home/antony/work2/megapatch-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      1e871729
    • unknown's avatar
      Merge · c6ac6aa5
      unknown authored
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      ndb/src/ndbapi/Ndb.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        SCCS merged
      c6ac6aa5
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3ecd3187
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      3ecd3187
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 63b89d81
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      63b89d81
    • unknown's avatar
      Removed double cond_push · 0410766f
      unknown authored
      0410766f
    • unknown's avatar
      bug#9813: Post review fixes · 7aa73081
      unknown authored
      7aa73081
    • unknown's avatar
      - Windows compile fix for ha_blackhole.cc - use #include "mysql_priv.h" instead of · 8222d259
      unknown authored
        #include <mysql_priv.h>
      
      
      sql/ha_blackhole.cc:
        - Windows compile fix - use #include "mysql_priv.h" instead of #include <mysql_priv.h>
      8222d259
    • unknown's avatar
      Patch for --insert-ignore · a508af3c
      unknown authored
      
      client/client_priv.h:
        Additional option for insert-ignore
      client/mysqldump.c:
        Additional insert-ignore, change of delayed variable to insert_option
      mysql-test/r/mysqldump.result:
        Test results for --ignore-insert option.
      mysql-test/t/mysqldump.test:
        New additions to the test.
      a508af3c
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · af38185d
      unknown authored
      into trift-lap.fambruehe:/MySQL/M50/mysql-5.0
      
      
      af38185d
    • unknown's avatar
      Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB). · 81a895f7
      unknown authored
      
      mysql-test/r/sp.result:
        Correct the result file for the changed test.
      mysql-test/t/sp.test:
        1) Correct the "fib" stored procedure and its initial data to be mathematical correct: fib(0) = 0
        2) Do a small run of "fib" first, that is not likely to hit a memory limit (see entry 9937 in the bug DB).
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      81a895f7
    • unknown's avatar
      Merge · 49892746
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/insert_update.result:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_yacc.yy:
        SCCS merged
      49892746