1. 24 Oct, 2007 3 commits
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines · 040139c5
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysys/charset.c:
        Manual merge.
      sql/item_func.cc:
        Manual merge.
      040139c5
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · de14c6ac
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines
      
      de14c6ac
    • unknown's avatar
      BUG#31159 - fulltext search on ucs2 column crashes server · 353ecd9a
      unknown authored
      ucs2 doesn't provide required by fulltext ctype array. Crash
      happens because fulltext attempts to use unitialized ctype
      array.
      
      Fixed by converting ucs2 fields to compatible utf8 analogue.
      
      
      include/my_sys.h:
        Added a function to find compatible character set with ctype array
        available. Currently used by fulltext search to find compatible
        substitute for ucs2 collations.
      mysql-test/r/ctype_ucs.result:
        A test case for BUG#31159.
      mysql-test/t/ctype_ucs.test:
        A test case for BUG#31159.
      mysys/charset.c:
        Added a function to find compatible character set with ctype array
        available. Currently used by fulltext search to find compatible
        substitute for ucs2 collations.
      sql/item_func.cc:
        Convert ucs2 fields to utf8. Fulltext requires ctype array, but
        ucs2 doesn't provide it.
      353ecd9a
  2. 19 Oct, 2007 3 commits
  3. 18 Oct, 2007 1 commit
    • unknown's avatar
      Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base · d14ada56
      unknown authored
      into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
      
      
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/udf_example.c:
        Auto merged
      sql/udf_example.def:
        Auto merged
      d14ada56
  4. 17 Oct, 2007 4 commits
    • unknown's avatar
      Bug #29804 UDF parameters don't contain correct string length · 24cb2b34
      unknown authored
          
      Previously, UDF *_init functions were passed constant strings with erroneous lengths. The length came from the containing variable's size, not the length of the value itself.
          
      Now the *_init functions get the constant as a null terminated string with the correct length supplied too.
      
      
      mysql-test/r/udf.result:
        Test case to check constants passed UDFs.
      mysql-test/t/udf.test:
        Test case to check constants passed UDFs.
      sql/item_func.cc:
        UDF _init functions are now passed the length of the constants, rather than the max length of the var containing the constant.
      sql/udf_example.c:
        Added check_const_len functions. The check_const_len_init functions checks that lengths of constants are correctly passed.
      sql/udf_example.def:
        Add new example functions to windows dll export list.
      24cb2b34
    • unknown's avatar
      Fix syntax error build problem on Windows (variable was defined · 2a65aba5
      unknown authored
      in middle of block)
      
      
      libmysql/libmysql.c:
        Fix syntax error - don't define new variables in the middle of a block.
        
        Also, use size_t instead of uint to avoid unnecessary casting.
      2a65aba5
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint · 1451a0eb
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
      
      
      mysql-test/r/repair.result:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      1451a0eb
    • unknown's avatar
  5. 16 Oct, 2007 6 commits
    • unknown's avatar
      Fixed broken call to my_error · 623e5187
      unknown authored
      
      sql/sql_yacc.yy:
        Fixed error message to use char*, not LEX_STRING
      623e5187
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · fd5bd91a
      unknown authored
      into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-28318-rework
      
      fd5bd91a
    • unknown's avatar
      Implementing code review comments · 473e6285
      unknown authored
      
      mysql-test/r/sp.result:
        Added tests for coverage
      mysql-test/t/sp.test:
        Added tests for coverage
      sql/sql_udf.cc:
        Code cleanup
      473e6285
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint · 47d6d92d
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
      
      
      myisam/sort.c:
        Auto merged
      mysql-test/r/repair.result:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      47d6d92d
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/bug31174/my41-bug31174 · 40fe4b6e
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
      
      40fe4b6e
    • unknown's avatar
      Bug#28318 (CREATE FUNCTION (UDF) requires a schema) -- part II · 739d2417
      unknown authored
      The root cause of the issue was that the CREATE FUNCTION grammar,
      for User Defined Functions, was using the sp_name rule.
      The sp_name rule is intended for fully qualified stored procedure names,
      like either ident.ident, or just ident but with a default database
      implicitly selected.
      
      A UDF does not have a fully qualified name, only a name (ident), and should
      not use the sp_name grammar fragment during parsing.
      
      The fix is to re-organize the CREATE FUNCTION grammar, to better separate:
      - creating UDF (no definer, can have AGGREGATE, simple ident)
      - creating Stored Functions (definer, no AGGREGATE, fully qualified name)
      
      With the test case provided, another issue was exposed which is also fixed:
      the DROP FUNCTION statement was using sp_name and also failing when no database
      is implicitly selected, when droping UDF functions.
      The fix is also to change the grammar so that DROP FUNCTION works with
      both the ident.ident syntax (to drop a stored function), or just the ident
      syntax (to drop either a UDF or a Stored Function, in the current database)
      
      
      mysql-test/r/sp-error.result:
        Adjust test results
      mysql-test/r/udf.result:
        Adjust test results
      mysql-test/t/sp-error.test:
        Adjust test results
      mysql-test/t/udf.test:
        Adjust test results
      sql/sql_parse.cc:
        CREATE UDF FUNCTION does not use a fully qualified name.
      sql/sql_yacc.yy:
        Fix grammar for CREATE / DROP FUNCTION, FOR udf
        Improve error messages for select no_such_function()
      739d2417
  6. 15 Oct, 2007 5 commits
  7. 12 Oct, 2007 12 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 848e8742
      unknown authored
      into  solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
      
      848e8742
    • unknown's avatar
      Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion. · c76bceb0
      unknown authored
      
      BitKeeper/deleted/.del-README.debian:
        Delete: support-files/debian/README.debian
      BitKeeper/deleted/.del-changelog~8457b43736642c:
        Delete: support-files/debian/changelog
      BitKeeper/deleted/.del-control:
        Delete: support-files/debian/control
      BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
        Delete: support-files/debian/copyright
      BitKeeper/deleted/.del-gomi:
        Delete: support-files/debian/gomi
      BitKeeper/deleted/.del-libmysqlclient10.dirs:
        Delete: support-files/debian/libmysqlclient10.dirs
      BitKeeper/deleted/.del-libmysqlclient10.postinst:
        Delete: support-files/debian/libmysqlclient10.postinst
      BitKeeper/deleted/.del-libmysqlclient9.dirs:
        Delete: support-files/debian/libmysqlclient9.dirs
      BitKeeper/deleted/.del-libmysqlclient9.postinst:
        Delete: support-files/debian/libmysqlclient9.postinst
      BitKeeper/deleted/.del-move:
        Delete: support-files/debian/move
      BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
        Delete: support-files/debian/my.cnf
      BitKeeper/deleted/.del-mysql-bench.dirs:
        Delete: support-files/debian/mysql-bench.dirs
      BitKeeper/deleted/.del-aa:
        Delete: support-files/debian/patches/aa
      BitKeeper/deleted/.del-mysql-client.dirs:
        Delete: support-files/debian/mysql-client.dirs
      BitKeeper/deleted/.del-mysql-dev.dirs:
        Delete: support-files/debian/mysql-dev.dirs
      BitKeeper/deleted/.del-mysql-doc.dirs:
        Delete: support-files/debian/mysql-doc.dirs
      BitKeeper/deleted/.del-mysql-max-debug.dirs:
        Delete: support-files/debian/mysql-max-debug.dirs
      BitKeeper/deleted/.del-mysql-max-debug.postinst:
        Delete: support-files/debian/mysql-max-debug.postinst
      BitKeeper/deleted/.del-mysql-max-debug.postrm:
        Delete: support-files/debian/mysql-max-debug.postrm
      BitKeeper/deleted/.del-mysql-max-shared.dirs:
        Delete: support-files/debian/mysql-max-shared.dirs
      BitKeeper/deleted/.del-mysql-max-shared.postinst:
        Delete: support-files/debian/mysql-max-shared.postinst
      BitKeeper/deleted/.del-mysql-max-shared.postrm:
        Delete: support-files/debian/mysql-max-shared.postrm
      BitKeeper/deleted/.del-mysql-max.dirs:
        Delete: support-files/debian/mysql-max.dirs
      BitKeeper/deleted/.del-mysql-max.postinst:
        Delete: support-files/debian/mysql-max.postinst
      BitKeeper/deleted/.del-mysql-max.postrm:
        Delete: support-files/debian/mysql-max.postrm
      BitKeeper/deleted/.del-mysql-server-debug.dirs:
        Delete: support-files/debian/mysql-server-debug.dirs
      BitKeeper/deleted/.del-mysql-server-debug.postinst:
        Delete: support-files/debian/mysql-server-debug.postinst
      BitKeeper/deleted/.del-mysql-server-debug.postrm:
        Delete: support-files/debian/mysql-server-debug.postrm
      BitKeeper/deleted/.del-mysql-server-shared.dirs:
        Delete: support-files/debian/mysql-server-shared.dirs
      BitKeeper/deleted/.del-mysql-server-shared.postinst:
        Delete: support-files/debian/mysql-server-shared.postinst
      BitKeeper/deleted/.del-mysql-server-shared.postrm:
        Delete: support-files/debian/mysql-server-shared.postrm
      BitKeeper/deleted/.del-mysql-server.conffiles:
        Delete: support-files/debian/mysql-server.conffiles
      BitKeeper/deleted/.del-mysql-server.dirs:
        Delete: support-files/debian/mysql-server.dirs
      BitKeeper/deleted/.del-mysql-server.postinst:
        Delete: support-files/debian/mysql-server.postinst
      BitKeeper/deleted/.del-mysql-server.postrm:
        Delete: support-files/debian/mysql-server.postrm
      BitKeeper/deleted/.del-mysql-server.prerm:
        Delete: support-files/debian/mysql-server.prerm
      BitKeeper/deleted/.del-rules~2018e0de32c6d936:
        Delete: support-files/debian/rules
      BitKeeper/deleted/.del-shlibs:
        Delete: support-files/debian/shlibs
      BitKeeper/deleted/.del-ab:
        Delete: support-files/debian/patches/ab
      BitKeeper/deleted/.del-ac:
        Delete: support-files/debian/patches/ac
      BitKeeper/deleted/.del-ad:
        Delete: support-files/debian/patches/ad
      BitKeeper/deleted/.del-ae:
        Delete: support-files/debian/patches/ae
      BitKeeper/deleted/.del-az:
        Delete: support-files/debian/patches/az
      BitKeeper/deleted/.del-ta:
        Delete: support-files/debian/patches/ta
      BitKeeper/deleted/.del-tb:
        Delete: support-files/debian/patches/tb
      c76bceb0
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 8461087d
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
      
      8461087d
    • unknown's avatar
      Merge moksha.com.br:/Users/davi/mysql/bugs/post-rename-5.0 · 7eb5cdb9
      unknown authored
      into  moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime
      
      7eb5cdb9
    • unknown's avatar
      Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements · bf4c0695
      unknown authored
      If mysql_lock_tables fails because the lock was aborted, we need to
      reset thd->some_tables_delete, otherwise we might loop indefinitely
      because handler's tables are not closed in a standard way, meaning
      that close_thread_tables() (which resets some_tables_deleted) is not
      used.
      
      This patch fixes sporadical failures of handler_myisam/innodb tests
      which were introduced by previous fix for this bug.
      
      
      sql/sql_handler.cc:
        Properly reset thd->some_tables_deleted if mysql_lock_tables
        fails for some reason.
      bf4c0695
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254 · ebe9a0be
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
      
      ebe9a0be
    • unknown's avatar
      Fix for bug #31254: "Max_data_length" truncated / reported wrong · c414c0bf
      unknown authored
      (compiler issue ?)
      
      Problem:
      
      Improper compile-time flags on AIX prevented use of files > 2 GB. This
      resulted in Max_data_length being truncated to 2 GB by MyISAM code.
      
      Solution:
      
      Reverted large-file changes from the fix for bug10776. We need to define
      _LARGE_FILES on AIX to have support for files > 2 GB.
      
       Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
      automatically defined by including standards.h, we also need a
      workaround to avoid this conflict.
      
      
      config/ac-macros/large_file.m4:
        Reverted large-file changes from the fix for bug10776. We need to define
        _LARGE_FILES on AIX to have support for files > 2 GB.
      include/my_global.h:
        _LARGE_FILE_API is defined in standards.h that is automatically included
        by at least some C++ compilers on AIX. Since it is also incompatible
        with _LARGE_FILES which is required for POSIX IO calls to be
        largefile-safe, the only workaround is to explicitely #undef
        _LARGE_FILE_API.
      c414c0bf
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 42f03292
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
      
      42f03292
    • unknown's avatar
      Bug#30951: makedate returns different results depending on version of mysql · 773f9dcc
      unknown authored
      makedate() will fold years below 100 into the 1970-2069 range. CS removes code
      that also wrongly folded years between 100 and 200 into that range, which should
      be left unchanged. Backport from 5.1.
      
      
      mysql-test/r/func_sapdb.result:
        Show that makedate() works correctly for 100 <= year < 200.
      mysql-test/t/func_sapdb.test:
        Show that makedate() works correctly for 100 <= year < 200.
      sql-common/my_time.c:
        Remove unnecessary date magic. Syncs behaviour with 5.1+
        and manual.
      773f9dcc
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · fcfe0aa0
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/30821/50-30821
      
      
      sql/mysqld.cc:
        Auto merged
      fcfe0aa0
    • unknown's avatar
      Bug#30821: setting --tc_heuristic_recover tries to set myisam_stats_method · eba2ae13
      unknown authored
      Options to mysqld were not processed correctly because switch statement
      was missing some "break"s. CS adds them.
      
      No test case; would require .opt file and server restart. Manually tested.
      
      
      sql/mysqld.cc:
        Add missing "break"s to switch() in mysqld to fix option processing.
      eba2ae13
    • unknown's avatar
      Removed debian dir. It was a mistake to embed it in the tree in the first place. · aba6332e
      unknown authored
      
      BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474:
        Delete: debian/Makefile.am
      BitKeeper/deleted/.del-README.Maintainer:
        Delete: debian/README.Maintainer
      BitKeeper/deleted/.del-changelog:
        Delete: debian/changelog
      BitKeeper/deleted/.del-compat:
        Delete: debian/compat
      BitKeeper/deleted/.del-control.in:
        Delete: debian/control.in
      BitKeeper/deleted/.del-copyright.more:
        Delete: debian/copyright.more
      BitKeeper/deleted/.del-copyright:
        Delete: debian/copyright
      BitKeeper/deleted/.del-defs.mk.in:
        Delete: debian/defs.mk.in
      BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in:
        Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in
      BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in:
        Delete: debian/libmysqlclientSLIB-dev.dirs.in
      BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in:
        Delete: debian/libmysqlclientSLIB-dev.docs.in
      BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in:
        Delete: debian/libmysqlclientSLIB-dev.examples.in
      BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
        Delete: debian/libmysqlclientSLIB-dev.files.in
      BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in:
        Delete: debian/libmysqlclientSLIB-dev.links.in
      BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in:
        Delete: debian/libmysqlclientSLIBoff.README.Debian.in
      BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in:
        Delete: debian/libmysqlclientSLIBoff.dirs.in
      BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in:
        Delete: debian/libmysqlclientSLIBoff.docs.in
      BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in:
        Delete: debian/libmysqlclientSLIBoff.files.in
      BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in:
        Delete: debian/libmysqlclientSLIBoff.postinst.in
      BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in:
        Delete: debian/libndbclientNLIB-dev.dirs.in
      BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in:
        Delete: debian/libndbclientNLIB-dev.files.in
      BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in:
        Delete: debian/libndbclientNLIB-dev.links.in
      BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in:
        Delete: debian/libndbclientNLIB.README.Debian.in
      BitKeeper/deleted/.del-libndbclientNLIB.dirs.in:
        Delete: debian/libndbclientNLIB.dirs.in
      BitKeeper/deleted/.del-libndbclientNLIB.files.in:
        Delete: debian/libndbclientNLIB.files.in
      BitKeeper/deleted/.del-libndbclientNLIB.postinst.in:
        Delete: debian/libndbclientNLIB.postinst.in
      BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in:
        Delete: debian/mysql-client-BASE.NEWS.in
      BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in:
        Delete: debian/mysql-client-BASE.README.Debian.in
      BitKeeper/deleted/.del-mysql-client-BASE.dirs.in:
        Delete: debian/mysql-client-BASE.dirs.in
      BitKeeper/deleted/.del-mysql-client-BASE.docs.in:
        Delete: debian/mysql-client-BASE.docs.in
      BitKeeper/deleted/.del-mysql-client-BASE.files.in:
        Delete: debian/mysql-client-BASE.files.in
      BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in:
        Delete: debian/mysql-client-BASE.lintian-overrides.in
      BitKeeper/deleted/.del-mysql-common.README.Debian.in:
        Delete: debian/mysql-common.README.Debian.in
      BitKeeper/deleted/.del-mysql-common.dirs.in:
        Delete: debian/mysql-common.dirs.in
      BitKeeper/deleted/.del-mysql-common.files.in:
        Delete: debian/mysql-common.files.in
      BitKeeper/deleted/.del-mysql-common.postrm.in:
        Delete: debian/mysql-common.postrm.in
      BitKeeper/deleted/.del-mysql-common.preinst.in:
        Delete: debian/mysql-common.preinst.in
      BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in:
        Delete: debian/mysql-extra-BASE.dirs.in
      BitKeeper/deleted/.del-mysql-extra-BASE.files.in:
        Delete: debian/mysql-extra-BASE.files.in
      BitKeeper/deleted/.del-mysql-management-BASE.dirs.in:
        Delete: debian/mysql-management-BASE.dirs.in
      BitKeeper/deleted/.del-mysql-management-BASE.files.in:
        Delete: debian/mysql-management-BASE.files.in
      BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in:
        Delete: debian/mysql-management-BASE.mysql-management.init.in
      BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in:
        Delete: debian/mysql-server-BASE.NEWS.in
      BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in:
        Delete: debian/mysql-server-BASE.README.Debian.in
      BitKeeper/deleted/.del-mysql-server-BASE.config.in:
        Delete: debian/mysql-server-BASE.config.in
      BitKeeper/deleted/.del-mysql-server-BASE.dirs.in:
        Delete: debian/mysql-server-BASE.dirs.in
      BitKeeper/deleted/.del-mysql-server-BASE.docs.in:
        Delete: debian/mysql-server-BASE.docs.in
      BitKeeper/deleted/.del-mysql-server-BASE.files.in:
        Delete: debian/mysql-server-BASE.files.in
      BitKeeper/deleted/.del-mysql-server-BASE.links.in:
        Delete: debian/mysql-server-BASE.links.in
      BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in:
        Delete: debian/mysql-server-BASE.lintian-overrides.in
      BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in:
        Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in
      BitKeeper/deleted/.del-my.cnf:
        Delete: debian/additions/my.cnf
      BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in:
        Delete: debian/mysql-server-BASE.logcheck.ignore.server.in
      BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in:
        Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in
      BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in:
        Delete: debian/mysql-server-BASE.mysql-server.logrotate.in
      BitKeeper/deleted/.del-mysql-server-BASE.postinst.in:
        Delete: debian/mysql-server-BASE.postinst.in
      BitKeeper/deleted/.del-mysql-server-BASE.postrm.in:
        Delete: debian/mysql-server-BASE.postrm.in
      BitKeeper/deleted/.del-mysql-server-BASE.preinst.in:
        Delete: debian/mysql-server-BASE.preinst.in
      BitKeeper/deleted/.del-mysql-server-BASE.prerm.in:
        Delete: debian/mysql-server-BASE.prerm.in
      BitKeeper/deleted/.del-mysql-server-BASE.templates.in:
        Delete: debian/mysql-server-BASE.templates.in
      BitKeeper/deleted/.del-mysql-server-PREV.preinst.in:
        Delete: debian/mysql-server-PREV.preinst.in
      BitKeeper/deleted/.del-mysql-server.lintian-overrides:
        Delete: debian/additions/mysql-server.lintian-overrides
      BitKeeper/deleted/.del-mysql-server.preinst.in:
        Delete: debian/mysql-server.preinst.in
      BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in:
        Delete: debian/mysql-storage-BASE.dirs.in
      BitKeeper/deleted/.del-mysql-storage-BASE.files.in:
        Delete: debian/mysql-storage-BASE.files.in
      BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in:
        Delete: debian/mysql-storage-BASE.mysql-storage.init.in
      BitKeeper/deleted/.del-mysql-test-BASE.dirs.in:
        Delete: debian/mysql-test-BASE.dirs.in
      BitKeeper/deleted/.del-mysql-test-BASE.files.in:
        Delete: debian/mysql-test-BASE.files.in
      BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in:
        Delete: debian/mysql-tools-BASE.dirs.in
      BitKeeper/deleted/.del-mysql-tools-BASE.files.in:
        Delete: debian/mysql-tools-BASE.files.in
      BitKeeper/deleted/.del-rules:
        Delete: debian/rules
      BitKeeper/deleted/.del-source.lintian-overrides.in:
        Delete: debian/source.lintian-overrides.in
      BitKeeper/deleted/.del-watch:
        Delete: debian/watch
      BitKeeper/deleted/.del-POTFILES.in.in:
        Delete: debian/po/POTFILES.in.in
      BitKeeper/deleted/.del-ca.po:
        Delete: debian/po/ca.po
      BitKeeper/deleted/.del-cs.po:
        Delete: debian/po/cs.po
      BitKeeper/deleted/.del-da.po:
        Delete: debian/po/da.po
      BitKeeper/deleted/.del-de.po:
        Delete: debian/po/de.po
      BitKeeper/deleted/.del-es.po:
        Delete: debian/po/es.po
      BitKeeper/deleted/.del-eu.po:
        Delete: debian/po/eu.po
      BitKeeper/deleted/.del-fr.po:
        Delete: debian/po/fr.po
      BitKeeper/deleted/.del-gl.po:
        Delete: debian/po/gl.po
      BitKeeper/deleted/.del-it.po:
        Delete: debian/po/it.po
      BitKeeper/deleted/.del-ja.po:
        Delete: debian/po/ja.po
      BitKeeper/deleted/.del-nb.po:
        Delete: debian/po/nb.po
      BitKeeper/deleted/.del-ndb_mgmd.cnf:
        Delete: debian/additions/ndb_mgmd.cnf
      BitKeeper/deleted/.del-nl.po:
        Delete: debian/po/nl.po
      BitKeeper/deleted/.del-pt.po:
        Delete: debian/po/pt.po
      BitKeeper/deleted/.del-pt_BR.po:
        Delete: debian/po/pt_BR.po
      BitKeeper/deleted/.del-ro.po:
        Delete: debian/po/ro.po
      BitKeeper/deleted/.del-ru.po:
        Delete: debian/po/ru.po
      BitKeeper/deleted/.del-sv.po:
        Delete: debian/po/sv.po
      BitKeeper/deleted/.del-templates.pot:
        Delete: debian/po/templates.pot
      BitKeeper/deleted/.del-tr.po:
        Delete: debian/po/tr.po
      aba6332e
  8. 11 Oct, 2007 3 commits
    • unknown's avatar
      Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion · 867cab82
      unknown authored
      Problem: GROUP_CONCAT(DISTINCT BIT_FIELD...) uses a tree to store keys;
      which are constructed using a temporary table fields,
      see Item_func_group_concat::setup().
      As a) we don't store null bits in the tree where the bit fields store parts 
      of their data and b) there's no method to properly compare two table records
      we've got problem.
      
      Fix: convert BIT fields to INT in the temporary table used.
      
      
      mysql-test/r/func_gconcat.result:
        Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
          - test result.
      mysql-test/t/func_gconcat.test:
        Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
          - test case.
      sql/item_sum.cc:
        Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
          - force the create_tmp_table() to convert BIT columns to INT 
            in order to be able to compare records containing BIT fields.
      867cab82
    • unknown's avatar
      Fix for bug #31174: "Repair" command on MyISAM crashes with small · 0aba4cc9
      unknown authored
      myisam_sort_buffer_size.
      
      An incorrect length of the sort buffer was used when calculating the
      maximum number of keys. When myisam_sort_buffer_size is small enough,
      this could result in the number of keys < number of
      BUFFPEK structures which in turn led to use of uninitialized BUFFPEKs.
      
      Fixed by correcting the buffer length calculation.
      
      
      myisam/sort.c:
        Use a correct buffer length when calculating the maximum number of keys.
        Assert that for each BUFFPEK structure there is at least one
        corresponding key. Otherwise we would fail earlier and not reach
        merge_buffers().
      mysql-test/r/repair.result:
        Added a test case for bug #31174.
      mysql-test/t/repair.test:
        Added a test case for bug #31174.
      0aba4cc9
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maint · 75d78c95
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
      
      75d78c95
  9. 10 Oct, 2007 3 commits