1. 12 Oct, 2007 2 commits
    • unknown's avatar
      Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint · 16e83252
      unknown authored
      into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
      
      
      BitKeeper/deleted/.del-changelog:
        Auto merged
      BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
        Auto merged
      BitKeeper/deleted/.del-mysql-client-BASE.files.in:
        Auto merged
      BitKeeper/deleted/.del-mysql-server-BASE.files.in:
        Auto merged
      configure.in:
        Auto merged
      BitKeeper/deleted/.del-mysql-test-BASE.files.in:
        Auto merged
      BitKeeper/deleted/.del-rules:
        Auto merged
      Makefile.am:
        Merged in removal of debian dir from 5.0-maint
      16e83252
    • 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
  2. 11 Oct, 2007 3 commits
  3. 10 Oct, 2007 15 commits
  4. 09 Oct, 2007 20 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · d5fb3253
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      d5fb3253
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 03ae735a
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      03ae735a
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · eb4a491e
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      eb4a491e
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · a7137828
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      client/mysqldump.c:
        Auto merged
      mysys/my_init.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      a7137828
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 13cf2d99
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/mysqld.cc:
        Auto merged
      13cf2d99
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c082b295
      unknown authored
      into  mysql.com:/home/ram/work/mysql-5.1-maint
      
      c082b295
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.0-maint · 0b6cd0f9
      unknown authored
      into  mysql.com:/home/ram/work/mysql-5.1-maint
      
      
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        manual merge.
      mysql-test/t/type_datetime.test:
        manual merge.
      0b6cd0f9
    • unknown's avatar
      metadata test of bug # 31249: problem with convert(..., datetime) removed · 461e4668
      unknown authored
      as PS protocol gives slightly different metadata.
      
      461e4668
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 1fc44802
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/mysqld.cc:
        Use local (null merge)
      sql/set_var.cc:
        Use local (null merge)
      storage/innobase/handler/ha_innodb.cc:
        Use local (null merge)
      storage/innobase/handler/ha_innodb.h:
        Use local (null merge)
      1fc44802
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0d6a6566
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      0d6a6566
    • unknown's avatar
      Fix for bug #29444: crash with partition refering to table in create-select · 492f0e3f
      unknown authored
      Problem: creating a partitioned table during name resolution for the 
      partition function we search for column names in all parts of the
      CREATE TABLE query. It is superfluous (and wrong) sometimes.
      
      Fix: launch name resolution for the partition function against
      the table we're creating.
      
      
      mysql-test/r/partition.result:
        Fix for bug #29444: crash with partition refering to table in create-select
          - test result.
      mysql-test/t/partition.test:
        Fix for bug #29444: crash with partition refering to table in create-select
          - test result.
      sql/item.cc:
        Fix for bug #29444: crash with partition refering to table in create-select
          - LEX::use_only_table_context introduced, which is used in the 
            Item_field::fix_fields() to resolve names only against
            context->first_name_resolution_table/last_name_resolution_table.
      sql/sql_lex.cc:
        Fix for bug #29444: crash with partition refering to table in create-select
          - LEX::use_only_table_context introduced, which is used in the 
            Item_field::fix_fields() to resolve names only against
            context->first_name_resolution_table/last_name_resolution_table.
      sql/sql_lex.h:
        Fix for bug #29444: crash with partition refering to table in create-select
          - LEX::use_only_table_context introduced, which is used in the 
            Item_field::fix_fields() to resolve names only against
            context->first_name_resolution_table/last_name_resolution_table.
      sql/sql_partition.cc:
        Fix for bug #29444: crash with partition refering to table in create-select
          - set the lex->use_only_table_context before the func_expr->fix_fields()
            call to ensure we're resolving names against the table we're creating;
            then restore it back after the call.
      492f0e3f
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.1-maint · 3b9738db
      unknown authored
      into  mysql.com:/home/ram/work/b31438/b31438.5.1
      
      3b9738db
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a4ed5f59
      unknown authored
      into  mysql.com:/home/ram/work/b31249/b31249.5.0
      
      
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      a4ed5f59
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.1-maint · 0d4ea9b0
      unknown authored
      into  mysql.com:/home/ram/work/b31438/b31438.5.1
      
      0d4ea9b0
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b31249/b31249.5.0 · afbf1985
      unknown authored
      into  mysql.com:/home/ram/work/b31249/b31249.5.1
      
      
      sql/item_timefunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/type_datetime.result:
        manual merge.
      mysql-test/t/type_datetime.test:
        manual merge.
      afbf1985
    • unknown's avatar
      Fix for bug #31249: Assertion `!table || (!table->write_set || · 0602a4fe
      unknown authored
      bitmap_is_set(table->write_set, fiel
      
      Problem: creating a temporary table we allocate the group buffer if needed
      followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
      the group buffer than actually needed (used) for values retrieval may lead 
      to overlapping with followed bitmaps in the memory pool that in turn leads 
      to unpredictable consequences.
      
      As we use Item->max_length sometimes to calculate group buffer size,
      it must be set to proper value. In this particular case 
      Item_datetime_typecast::max_length is too small.
      
      Another problem is that we use max_length to calculate the group buffer
      key length for items represented as DATE/TIME fields which is superfluous.
      
      Fix: set Item_datetime_typecast::max_length properly,
      accurately calculate the group buffer key length for items 
      represented as DATE/TIME fields in the buffer.
      
      
      mysql-test/r/type_datetime.result:
        Fix for bug #31249: Assertion `!table || (!table->write_set || 
        bitmap_is_set(table->write_set, fiel
          - test result.
      mysql-test/t/type_datetime.test:
        Fix for bug #31249: Assertion `!table || (!table->write_set || 
        bitmap_is_set(table->write_set, fiel
          - test case.
      sql/item_timefunc.h:
        Fix for bug #31249: Assertion `!table || (!table->write_set || 
        bitmap_is_set(table->write_set, fiel
          - set Item_datetime_typecast::max_length properly.
      sql/sql_select.cc:
        Fix for bug #31249: Assertion `!table || (!table->write_set || 
        bitmap_is_set(table->write_set, fiel
          - the group buffer key length for items represented as 
        DATE/TIME fields in the buffer should be calculated using
        the maximum pack length of such fields (== 8), using 
        max_length here is redundant.
      0602a4fe
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · edc809c5
      unknown authored
      into  alf.(none):/src/bug28774/my50-bug28774
      
      edc809c5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · b127976c
      unknown authored
      into  alf.(none):/src/bug28774/my51-bug28774
      
      b127976c
    • unknown's avatar
      Merge alf.(none):/src/bug28774/my50-bug28774 · e4779936
      unknown authored
      into  alf.(none):/src/bug28774/my51-bug28774
      
      
      client/mysql_upgrade.c:
        Auto merged
      e4779936
    • unknown's avatar
      Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and · 36773be2
      unknown authored
      doesn't clean them up
      - Make sure to cleanup temporary files after use.
      
      
      client/mysql_upgrade.c:
        Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
        doesn't clean them up
        - Close file handle and delete temporary file when write fails.
      36773be2