1. 01 Aug, 2006 2 commits
  2. 31 Jul, 2006 1 commit
  3. 29 Jul, 2006 2 commits
  4. 28 Jul, 2006 4 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · 04d60b38
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      configure.in:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/mysql.spec.sh:
        SCCS merged
      04d60b38
    • unknown's avatar
      Makefile.am, configure.in: · d1fde0f7
      unknown authored
        Man page for mysqld command move to section 8 (bug#21220)
      
      
      configure.in:
        Man page for mysqld command move to section 8 (bug#21220)
      man/Makefile.am:
        Man page for mysqld command move to section 8 (bug#21220)
      d1fde0f7
    • unknown's avatar
      make_binary_distribution.sh: · 6f65bffe
      unknown authored
        Man page for "mysqld" command move to section 8 (bug#21220)
      
      
      scripts/make_binary_distribution.sh:
        Man page for "mysqld" command move to section 8 (bug#21220)
      6f65bffe
    • unknown's avatar
      mysql.spec.sh: · a811cc0a
      unknown authored
        Man page for "mysqld" command move to section 8 (bug#21220)
      
      
      support-files/mysql.spec.sh:
        Man page for "mysqld" command move to section 8 (bug#21220)
      a811cc0a
  5. 26 Jul, 2006 2 commits
    • unknown's avatar
      BUG#21206: memory corruption when too many cursors are opened at once · 35945019
      unknown authored
      Too many cursors (more than 1024) could lead to memory corruption.
      This affects both, stored routines and C API cursors, and the
      threshold is per-server, not per-connection.  Similarly, the
      corruption could happen when the server was under heavy load
      (executing more than 1024 simultaneous complex queries), and this is
      the reason why this bug is fixed in 4.1, which doesn't support
      cursors.
      
      The corruption was caused by a bug in the temporary tables code, when
      an attempt to create a table could lead to a write beyond allocated
      space.  Note, that only internal tables were affected (the tables
      created internally by the server to resolve the query), not tables
      created with CREATE TEMPORARY TABLE.  Another pre-condition for the
      bug is TRUE value of --temp-pool startup option, which, however, is a
      default.
      
      The cause of a bug was that random memory was overwritten in
      bitmap_set_next() due to out-of-bound memory access.
      
      
      mysys/my_bitmap.c:
        Local 'bitmap_size' is measured in bytes, no need to multiply it by 8.
      sql/sql_select.cc:
        Clear the temp_pool_slot bit only if we have set it previously.
      35945019
    • unknown's avatar
      Applied innodb-4.1-ss32 snapshot. · 03637f49
      unknown authored
      
      innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-4.1-ss32 snapshot.
         ibuf_fixed_addr_page(): Add parameter space. As the insert
         buffer B-tree is only located in the system tablespace
         (space 0), IBUF_TREE_ROOT_PAGE_NO is only special in space 0.
      03637f49
  6. 24 Jul, 2006 5 commits
  7. 23 Jul, 2006 1 commit
  8. 20 Jul, 2006 1 commit
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · c988ef94
      unknown authored
      into  mysql.com:/home/hf/work/mysql-4.1.19983
      
      
      libmysqld/lib_sql.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      c988ef94
  9. 19 Jul, 2006 2 commits
    • unknown's avatar
      Bug #21135 Crash in test "func_time" · d7c0c667
      unknown authored
       - backport patch from 5.0
       - "table" can be NULL in temporary fields used for type conversion
      
      
      sql/field.cc:
        table can be NULL in temporary fields used for type conversion.
        Store value in field as if db_low_byte_first was set.
      sql/field.h:
        table can be NULL in temporary fields used for type conversion.
        Store value in field as if db_low_byte_first was set.
      d7c0c667
    • unknown's avatar
      mysql.spec.sh: · b53e47a1
      unknown authored
        Added new "mysql_explain_log" man page
        Added missing install of "myisam_ftdump" man page
        Added missing install of "mysqlman" man page
      
      
      support-files/mysql.spec.sh:
        Added new "mysql_explain_log" man page
        Added missing install of "myisam_ftdump" man page
        Added missing install of "mysqlman" man page
      b53e47a1
  10. 18 Jul, 2006 3 commits
    • unknown's avatar
      Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1 · 6abe1c71
      unknown authored
      into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
      
      
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      6abe1c71
    • unknown's avatar
      Merge moonbone.local:/work/mysql-4.1 · 5a77e566
      unknown authored
      into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
      
      
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      5a77e566
    • unknown's avatar
      Backporting Kostja's changes made for 5.0 into 4.1. · d39e8532
      unknown authored
      Please use "ul" when merging this changeset to 5.0.
      
      
      sql/item_timefunc.cc:
        Fix a valgrind warning in type_date test.
      sql/sql_locale.cc:
        Fix a Windows build failure:  "false" -> FALSE
      d39e8532
  11. 17 Jul, 2006 2 commits
    • unknown's avatar
      Changes to make "sql/sql_locale.cc" compile + link on Windows: · 73328544
      unknown authored
      1) When initializing a boolean variable, do not use string representations '"false"' and '"true"' 
          but rather the boolean values 'false' and 'true'.
      2) Add the module to the various Windows description files.
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/libmysqld/libmysqld.vcproj:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/libmysqld/libmysqld_ia64.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/mysqldemb/mysqldemb.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/mysqldemb/mysqldemb.vcproj:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/mysqldemb/mysqldemb_ia64.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqld.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqld.vcproj:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqld_ia64.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqldmax.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqldmax_ia64.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      sql/sql_locale.cc:
        When initializing a boolean variable, do not use stringrepresentations '"false"' and '"true"' 
        but rather the boolean values 'false' and 'true'.
      73328544
    • unknown's avatar
      strings/strtod.c : Ensure the definition of "EOVERFLOW" is available. · e732d352
      unknown authored
      In 5.0, this is already solved, so that is a null-merge ("ul").
      
      
      strings/strtod.c:
        This file needs the definition of "EOVERFLOW",
        which is on some platforms (Windows, OpenBSD) provided only by "my_base.h".
        As this in turn includes "my_global.h", the include file name can be changed.
      e732d352
  12. 15 Jul, 2006 1 commit
  13. 14 Jul, 2006 5 commits
  14. 13 Jul, 2006 6 commits
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · ae3d1248
      unknown authored
      into  mysql.com:/home/hf/work/mysql-4.1.16017
      
      
      ae3d1248
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · d9992cc7
      unknown authored
      into  mysql.com:/home/hf/work/mysql-4.1.16017
      
      
      include/sql_common.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      libmysqld/libmysqld.c:
        merging
      d9992cc7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3c2bdb59
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
      
      
      3c2bdb59
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 5392be95
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
      
      
      5392be95
    • unknown's avatar
      Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 4bdc4251
      unknown authored
      into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-15977
      
      
      4bdc4251
    • unknown's avatar
      Bug#20432: mysql client interprets commands in comments · 76215977
      unknown authored
      do not look for client-specific commands while inside a multi-line comment.
      we will allow multi-comments pretty much anywhere within SQL-statements,
      but client-specific commands (help, use, print, ...) must be the first token
      in the input.
      
      
      client/mysql.cc:
        Bug#20432: mysql client interprets commands in comments
      mysql-test/r/mysql_client.result:
        Bug#20432: mysql client interprets commands in comments
        test client-side parsing of comments and client-specific commands
      mysql-test/t/mysql_client.test:
        Bug#20432: mysql client interprets commands in comments
        test client-side parsing of comments and client-specific commands
      76215977
  15. 12 Jul, 2006 3 commits
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-4.1 · 17870724
      unknown authored
      into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-4.1-rpl
      
      
      17870724
    • unknown's avatar
      Bug #17212 results not sorted correctly by ORDER BY when using index · 41445430
      unknown authored
        * don't use join cache when the incoming data set is already ordered
          for ORDER BY
          This choice must be made because join cache will effectively
          reverse the join order and the results will be sorted by the index
          of the table that uses join cache.
      
      
      mysql-test/r/innodb_mysql.result:
        Bug #17212 results not sorted correctly by ORDER BY when using index
          * Test suite for the bug
      mysql-test/t/innodb_mysql.test:
        Bug #17212 results not sorted correctly by ORDER BY when using index
          * Test suite for the bug
      sql/sql_select.cc:
        Bug #17212 results not sorted correctly by ORDER BY when using index
          * don't use join cache when the incoming data set is already sorted
      41445430
    • unknown's avatar
      Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0f7258e0
      unknown authored
      into  maint1.mysql.com:/data/localhome/cmiller/mysql-4.1
      
      
      0f7258e0