1. 09 May, 2005 15 commits
    • unknown's avatar
      Manual merge of fix for bug #9913 into 5.0 tree. · 43853e19
      unknown authored
      
      mysql-test/t/range.test:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/sql_udf.h:
        Auto merged
      mysql-test/r/mysqldump.result:
        Manual merge.
      mysql-test/t/mysqldump.test:
        Manual merge.
      43853e19
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c4574a62
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      c4574a62
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1bdbbeef
      unknown authored
      into mysql.com:/home/ram/work/5.0
      
      1bdbbeef
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 311af9ed
      unknown authored
      into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-5.0
      
      311af9ed
    • unknown's avatar
      make_binary_distribution.sh: · 602c7aec
      unknown authored
        - Print the platform name for the build logs.
      
      
      scripts/make_binary_distribution.sh:
        - Print the platform name for the build logs.
      602c7aec
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug10241 · 0cf6b6ab
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      include/my_global.h:
        Auto merged
      0cf6b6ab
    • unknown's avatar
      After review fixes · dc18fc64
      unknown authored
      
      include/my_global.h:
        Add "&& defined(__GNUC__)"
      dc18fc64
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug10241 · 837ef272
      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
      837ef272
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b1a8433a
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-bg9913
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      b1a8433a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · e9c97df5
      unknown authored
      into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
      
      e9c97df5
    • unknown's avatar
      - added "--skip-comments" to the "mysqldump" test to avoid printing comments that include · 63e58de4
      unknown authored
        version-dependent information (which causes test failures when running the test with a
        different version string)
      
      
      mysql-test/r/mysqldump.result:
        - fixed the results (removed the version-dependent comments to avoid a test failure)
      mysql-test/t/mysqldump.test:
        - added "--skip-comments" to avoid printing comments that include version-dependent information
          (which causes test failures when running the test with a different version string)
      63e58de4
    • unknown's avatar
      don't use tmp file for such a triviality · b179ddd3
      unknown authored
      b179ddd3
    • unknown's avatar
      Brian's mysqldump test modifications made on Ramil's laptop. · e75405e5
      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.
      e75405e5
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 56064ee9
      unknown authored
      into mysql.com:/home/ram/work/5.0
      
      56064ee9
    • unknown's avatar
      Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs(). · 8a5afca1
      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.
      8a5afca1
  2. 08 May, 2005 20 commits
    • unknown's avatar
      Merge · 4c0748c4
      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.
      4c0748c4
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 747cd3ff
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      747cd3ff
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 3d457f66
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      3d457f66
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · fd50b68e
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      fd50b68e
    • unknown's avatar
      - added cmd-line-utils/libedit/vis.h to the source distribution · 231938dc
      unknown authored
      
      cmd-line-utils/libedit/Makefile.am:
        - added vis.h to the source distribution
      231938dc
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3645b13f
      unknown authored
      into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
      
      3645b13f
    • unknown's avatar
      make_binary_distribution.sh: · 86706cec
      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
      86706cec
    • unknown's avatar
      Merge · 383e3b90
      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
      383e3b90
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · a0e4417a
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      a0e4417a
    • unknown's avatar
      Removed call to cond_push for empty cond · 6a8ccd30
      unknown authored
      6a8ccd30
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · a19943ab
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      a19943ab
    • unknown's avatar
      Fixes to compile with icc · 3b7a807e
      unknown authored
      3b7a807e
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 4cdbb00a
      unknown authored
      into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      4cdbb00a
    • unknown's avatar
      errmsg.txt: · 21ffc1d4
      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
      21ffc1d4
    • unknown's avatar
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · e164f763
      unknown authored
      into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      e164f763
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 · c570dff0
      unknown authored
      into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      c570dff0
    • unknown's avatar
      Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1 · ff7676c3
      unknown authored
      into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      ff7676c3
    • unknown's avatar
      FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model. · cf664e75
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      cf664e75
  3. 07 May, 2005 5 commits