1. 18 Apr, 2007 3 commits
    • unknown's avatar
      Fixed make distcheck problem. · ad4922ef
      unknown authored
      
      Makefile.am:
        Removed debian/control creation from the top level dist-hook
      configure.in:
        Create debian/control from configure again
      debian/rules:
        Protect debian/control from the debuild distclean run. 
        Prevent a makefile variable loop when settin MYSQL_BASE_VERSION
      ad4922ef
    • unknown's avatar
      Changed a comment to be more clear. · 3b2b2d88
      unknown authored
      3b2b2d88
    • unknown's avatar
      BUG#27769 - MySQL should include debian packaging dir · 6d296e5e
      unknown authored
      Replaced hardcoded sover reference with variable.
      Removed references to added manpages.
      ---
      BUG#27769 
      Cleaned up some things to make building the packages go a little smoother. 
      ---
      debian/rules really does need to be called from the source root.
      ---
      Fixed two problems with the build caused by adding debian to the source tree
      ---
      Left off the debian/ prefix to the Makefile filter.
      ---
      BUG#27769 - MySQL should include debian packaging dir
      Changed substitution variables to match already existing autoconf vars.
      Generate debian/control and debian/defs.mk from autoconf now, since we run that
      to make a source package. 
      ---
      Corrected incorrect variable name
      ---
      Renamed template files to have shorter names. 
      ---
      Moved generation of debian/control to dist-hook so make clean won't eat it.
      ---
      A few final changes to make debs build from a source tarball dist. 
      
      
      debian/libmysqlclientSLIB-dev.README.Maintainer.in:
        Rename: debian/libmysqlclientMYSOVER-dev.README.Maintainer.in -> debian/libmysqlclientSLIB-dev.README.Maintainer.in
      debian/libmysqlclientSLIB-dev.dirs.in:
        Rename: debian/libmysqlclientMYSOVER-dev.dirs.in -> debian/libmysqlclientSLIB-dev.dirs.in
      debian/libmysqlclientSLIB-dev.docs.in:
        Rename: debian/libmysqlclientMYSOVER-dev.docs.in -> debian/libmysqlclientSLIB-dev.docs.in
      debian/libmysqlclientSLIB-dev.examples.in:
        Rename: debian/libmysqlclientMYSOVER-dev.examples.in -> debian/libmysqlclientSLIB-dev.examples.in
      debian/libmysqlclientSLIB-dev.files.in:
        Rename: debian/libmysqlclientMYSOVER-dev.files.in -> debian/libmysqlclientSLIB-dev.files.in
      debian/libmysqlclientSLIB-dev.links.in:
        Rename: debian/libmysqlclientMYSOVER-dev.links.in -> debian/libmysqlclientSLIB-dev.links.in
      debian/libmysqlclientSLIB.README.Debian.in:
        Rename: debian/libmysqlclientMYSOVER.README.Debian.in -> debian/libmysqlclientSLIB.README.Debian.in
      debian/libmysqlclientSLIB.dirs.in:
        Rename: debian/libmysqlclientMYSOVER.dirs.in -> debian/libmysqlclientSLIB.dirs.in
      debian/libmysqlclientSLIB.docs.in:
        Rename: debian/libmysqlclientMYSOVER.docs.in -> debian/libmysqlclientSLIB.docs.in
      debian/libmysqlclientSLIB.files.in:
        Rename: debian/libmysqlclientMYSOVER.files.in -> debian/libmysqlclientSLIB.files.in
      debian/libmysqlclientSLIB.postinst.in:
        Rename: debian/libmysqlclientMYSOVER.postinst.in -> debian/libmysqlclientSLIB.postinst.in
      debian/libndbclientNLIB-dev.dirs.in:
        Rename: debian/libndbclientNDBSOVER-dev.dirs.in -> debian/libndbclientNLIB-dev.dirs.in
      debian/libndbclientNLIB-dev.files.in:
        Rename: debian/libndbclientNDBSOVER-dev.files.in -> debian/libndbclientNLIB-dev.files.in
      debian/libndbclientNLIB-dev.links.in:
        Rename: debian/libndbclientNDBSOVER-dev.links.in -> debian/libndbclientNLIB-dev.links.in
      debian/libndbclientNLIB.README.Debian.in:
        Rename: debian/libndbclientNDBSOVER.README.Debian.in -> debian/libndbclientNLIB.README.Debian.in
      debian/libndbclientNLIB.dirs.in:
        Rename: debian/libndbclientNDBSOVER.dirs.in -> debian/libndbclientNLIB.dirs.in
      debian/libndbclientNLIB.files.in:
        Rename: debian/libndbclientNDBSOVER.files.in -> debian/libndbclientNLIB.files.in
      debian/libndbclientNLIB.postinst.in:
        Rename: debian/libndbclientNDBSOVER.postinst.in -> debian/libndbclientNLIB.postinst.in
      debian/mysql-client-BASE.NEWS.in:
        Rename: debian/mysql-client-MYVER.NEWS.in -> debian/mysql-client-BASE.NEWS.in
      debian/mysql-client-BASE.README.Debian.in:
        Rename: debian/mysql-client-MYVER.README.Debian.in -> debian/mysql-client-BASE.README.Debian.in
      debian/mysql-client-BASE.dirs.in:
        Rename: debian/mysql-client-MYVER.dirs.in -> debian/mysql-client-BASE.dirs.in
      debian/mysql-client-BASE.docs.in:
        Rename: debian/mysql-client-MYVER.docs.in -> debian/mysql-client-BASE.docs.in
      debian/mysql-extra-BASE.dirs.in:
        Rename: debian/mysql-extra-MYVER.dirs.in -> debian/mysql-extra-BASE.dirs.in
      debian/mysql-extra-BASE.files.in:
        Rename: debian/mysql-extra-MYVER.files.in -> debian/mysql-extra-BASE.files.in
      debian/mysql-management-BASE.dirs.in:
        Rename: debian/mysql-management-MYVER.dirs.in -> debian/mysql-management-BASE.dirs.in
      debian/mysql-management-BASE.files.in:
        Rename: debian/mysql-management-MYVER.files.in -> debian/mysql-management-BASE.files.in
      debian/mysql-management-BASE.mysql-management.init.in:
        Rename: debian/mysql-management-MYVER.mysql-management.init.in -> debian/mysql-management-BASE.mysql-management.init.in
      debian/mysql-server-BASE.NEWS.in:
        Rename: debian/mysql-server-MYVER.NEWS.in -> debian/mysql-server-BASE.NEWS.in
      debian/mysql-server-BASE.README.Debian.in:
        Rename: debian/mysql-server-MYVER.README.Debian.in -> debian/mysql-server-BASE.README.Debian.in
      debian/mysql-server-BASE.dirs.in:
        Rename: debian/mysql-server-MYVER.dirs.in -> debian/mysql-server-BASE.dirs.in
      debian/mysql-server-BASE.docs.in:
        Rename: debian/mysql-server-MYVER.docs.in -> debian/mysql-server-BASE.docs.in
      debian/mysql-server-BASE.links.in:
        Rename: debian/mysql-server-MYVER.links.in -> debian/mysql-server-BASE.links.in
      debian/mysql-server-BASE.logcheck.ignore.paranoid.in:
        Rename: debian/mysql-server-MYVER.logcheck.ignore.paranoid.in -> debian/mysql-server-BASE.logcheck.ignore.paranoid.in
      debian/mysql-server-BASE.logcheck.ignore.server.in:
        Rename: debian/mysql-server-MYVER.logcheck.ignore.server.in -> debian/mysql-server-BASE.logcheck.ignore.server.in
      debian/mysql-server-BASE.logcheck.ignore.workstation.in:
        Rename: debian/mysql-server-MYVER.logcheck.ignore.workstation.in -> debian/mysql-server-BASE.logcheck.ignore.workstation.in
      debian/mysql-server-BASE.mysql-server.logrotate.in:
        Rename: debian/mysql-server-MYVER.mysql-server.logrotate.in -> debian/mysql-server-BASE.mysql-server.logrotate.in
      debian/mysql-server-BASE.preinst.in:
        Rename: debian/mysql-server-MYVER.preinst.in -> debian/mysql-server-BASE.preinst.in
      debian/mysql-server-BASE.prerm.in:
        Rename: debian/mysql-server-MYVER.prerm.in -> debian/mysql-server-BASE.prerm.in
      debian/mysql-server-PREV.preinst.in:
        Rename: debian/mysql-server-MYOLDVER.preinst.in -> debian/mysql-server-PREV.preinst.in
      debian/mysql-storage-BASE.dirs.in:
        Rename: debian/mysql-storage-MYVER.dirs.in -> debian/mysql-storage-BASE.dirs.in
      debian/mysql-storage-BASE.files.in:
        Rename: debian/mysql-storage-MYVER.files.in -> debian/mysql-storage-BASE.files.in
      debian/mysql-storage-BASE.mysql-storage.init.in:
        Rename: debian/mysql-storage-MYVER.mysql-storage.init.in -> debian/mysql-storage-BASE.mysql-storage.init.in
      debian/mysql-test-BASE.dirs.in:
        Rename: debian/mysql-test-MYVER.dirs.in -> debian/mysql-test-BASE.dirs.in
      debian/mysql-test-BASE.files.in:
        Rename: debian/mysql-test-MYVER.files.in -> debian/mysql-test-BASE.files.in
      debian/mysql-tools-BASE.dirs.in:
        Rename: debian/mysql-tools-MYVER.dirs.in -> debian/mysql-tools-BASE.dirs.in
      debian/mysql-tools-BASE.files.in:
        Rename: debian/mysql-tools-MYVER.files.in -> debian/mysql-tools-BASE.files.in
      Makefile.am:
        Moved generation of debian/control to dist-hook so make clean won't eat it.
        ---
        Need to generate the control file in the dist dir - not the source dir.
      configure.in:
        Added variables to support the generation of debian/control and debian/defs.mk from configure
        ---
        Moved generation of debian/control to dist-hook so make clean won't eat it.
      debian/Makefile.am:
        Distribute the generated control file so that debuild will work naturally.
        ---
        Broke the EXTRA_DIST line into separate lines. 
        Added defs.mk.in
        ---
        Modified debian/Makefile to use the new shorter template file names.
      debian/control.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/defs.mk.in:
        Changed substitution variables to match already existing autoconf vars.
        Made defs.mk.in generated from template. 
        Persisted variables here. 
        ---
        Corrected incorrect variable name
      debian/mysql-client-BASE.files.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/mysql-client-BASE.lintian-overrides.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/mysql-server-BASE.config.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/mysql-server-BASE.files.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/mysql-server-BASE.lintian-overrides.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/mysql-server-BASE.postinst.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/mysql-server-BASE.postrm.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/mysql-server-BASE.templates.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/po/POTFILES.in.in:
        Changed substitution variables to match already existing autoconf vars.
      debian/rules:
        BUG#27769 - MySQL should include debian packaging dir
        Replaced hardcoded sover reference with variable.
        Removed references to added manpages.
        ---
        Prevented the test suite from being run unless requested. 
        ---
        Needed a space between ifneq and (
        ---
        The variable substitution was stepping on the Makefile from automake. 
        ---
        Left off the debian/ prefix to the Makefile filter.
        ---
        Changed substitution variables to match already existing autoconf vars.
        ---
        Save debian/defs.mk from make distclean
      debian/source.lintian-overrides.in:
        Changed substitution variables to match already existing autoconf vars.
      6d296e5e
  2. 12 Apr, 2007 4 commits
  3. 11 Apr, 2007 8 commits
    • unknown's avatar
      Adding files to support building for debian. · 359594cc
      unknown authored
      ```yaml
      Removed reference to debian svn location of debian dir. 
      Changed verbage of comment to appease Timothy.
      ```
      
      Removed added manpages that aren't appropriate for our build. 
      ---
      Added debian dir to list of dist targets. 
      Added list of files needed to be distributed in debian dir.
      ---
      Added semi-colons to fix syntax error.
      ---
      BUG#27769 MySQL should include debian packaing dir
      Added debian/Makefile to configure.in to support make dist.
      
      
      BitKeeper/deleted/.del-configure.in.rej:
        Delete: configure.in.rej
      Makefile.am:
        Added debian dir to list of dist targets.
      configure.in:
        Added debian/Makefile to configure.in to support make dist
      BitKeeper/deleted/.del-comp_err.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-msql2mysql.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-my_print_defaults.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-myisam_ftdump.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-myisamchk.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-myisamlog.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-myisampack.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_config.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_convert_table_format.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_explain_log.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_find_rows.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_fix_extensions.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_install_db.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_secure_installation.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_setpermission.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_tableinfo.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysql_waitpid.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysqlbinlog.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysqlbug.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysqlcheck.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysqldumpslow.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysqlimport.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysqlmanager.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-mysqltest.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-pack_isam.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-resolve_stack_dump.1:
        Adding files to support building for debian.
      BitKeeper/deleted/.del-resolveip.1:
        Adding files to support building for debian.
      debian/Makefile.am:
        Added list of files needed to be distributed in debian dir.
      debian/README.Maintainer:
        Adding files to support building for debian.
        ---
        Removed reference to debian svn location of debian dir. 
        Changed verbage of comment to appease Timothy.
      debian/changelog:
        Adding files to support building for debian.
      debian/compat:
        Adding files to support building for debian.
      debian/control.in:
        Adding files to support building for debian.
      debian/copyright.more:
        Adding files to support building for debian.
      debian/copyright:
        Adding files to support building for debian.
      debian/defs.mk:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER-dev.README.Maintainer.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER-dev.dirs.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER-dev.docs.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER-dev.examples.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER-dev.files.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER-dev.links.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER.README.Debian.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER.dirs.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER.docs.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER.files.in:
        Adding files to support building for debian.
      debian/libmysqlclientMYSOVER.postinst.in:
        Adding files to support building for debian.
      debian/libndbclientNDBSOVER-dev.dirs.in:
        Adding files to support building for debian.
      debian/libndbclientNDBSOVER-dev.files.in:
        Adding files to support building for debian.
      debian/libndbclientNDBSOVER-dev.links.in:
        Adding files to support building for debian.
      debian/libndbclientNDBSOVER.README.Debian.in:
        Adding files to support building for debian.
      debian/libndbclientNDBSOVER.dirs.in:
        Adding files to support building for debian.
      debian/libndbclientNDBSOVER.files.in:
        Adding files to support building for debian.
      debian/libndbclientNDBSOVER.postinst.in:
        Adding files to support building for debian.
      debian/mysql-client-MYVER.NEWS.in:
        Adding files to support building for debian.
      debian/mysql-client-MYVER.README.Debian.in:
        Adding files to support building for debian.
      debian/mysql-client-MYVER.dirs.in:
        Adding files to support building for debian.
      debian/mysql-client-MYVER.docs.in:
        Adding files to support building for debian.
      debian/mysql-client-MYVER.files.in:
        Adding files to support building for debian.
      debian/mysql-client-MYVER.lintian-overrides.in:
        Adding files to support building for debian.
      debian/mysql-common.README.Debian.in:
        Adding files to support building for debian.
      debian/mysql-common.dirs.in:
        Adding files to support building for debian.
      debian/mysql-common.files.in:
        Adding files to support building for debian.
      debian/mysql-common.postrm.in:
        Adding files to support building for debian.
      debian/mysql-common.preinst.in:
        Adding files to support building for debian.
      debian/mysql-extra-MYVER.dirs.in:
        Adding files to support building for debian.
      debian/mysql-extra-MYVER.files.in:
        Adding files to support building for debian.
      debian/mysql-management-MYVER.dirs.in:
        Adding files to support building for debian.
      debian/mysql-management-MYVER.files.in:
        Adding files to support building for debian.
      debian/mysql-management-MYVER.mysql-management.init.in:
        Adding files to support building for debian.
      debian/mysql-server-MYOLDVER.preinst.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.NEWS.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.README.Debian.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.config.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.dirs.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.docs.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.files.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.links.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.lintian-overrides.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.logcheck.ignore.paranoid.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.logcheck.ignore.server.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.logcheck.ignore.workstation.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.mysql-server.logrotate.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.postinst.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.postrm.in:
        Adding files to support building for debian.
      debian/additions/my.cnf:
        Adding files to support building for debian.
      debian/additions/mysql-server.lintian-overrides:
        Adding files to support building for debian.
      debian/additions/ndb_mgmd.cnf:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.preinst.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.prerm.in:
        Adding files to support building for debian.
      debian/mysql-server-MYVER.templates.in:
        Adding files to support building for debian.
      debian/mysql-server.preinst.in:
        Adding files to support building for debian.
      debian/mysql-storage-MYVER.dirs.in:
        Adding files to support building for debian.
      debian/mysql-storage-MYVER.files.in:
        Adding files to support building for debian.
      debian/mysql-storage-MYVER.mysql-storage.init.in:
        Adding files to support building for debian.
      debian/mysql-test-MYVER.dirs.in:
        Adding files to support building for debian.
      debian/mysql-test-MYVER.files.in:
        Adding files to support building for debian.
      debian/mysql-tools-MYVER.dirs.in:
        Adding files to support building for debian.
      debian/mysql-tools-MYVER.files.in:
        Adding files to support building for debian.
      debian/po/POTFILES.in.in:
        Adding files to support building for debian.
      debian/po/ca.po:
        Adding files to support building for debian.
      debian/po/cs.po:
        Adding files to support building for debian.
      debian/po/da.po:
        Adding files to support building for debian.
      debian/po/de.po:
        Adding files to support building for debian.
      debian/po/es.po:
        Adding files to support building for debian.
      debian/po/eu.po:
        Adding files to support building for debian.
      debian/po/fr.po:
        Adding files to support building for debian.
      debian/po/gl.po:
        Adding files to support building for debian.
      debian/po/it.po:
        Adding files to support building for debian.
      debian/po/ja.po:
        Adding files to support building for debian.
      debian/po/nb.po:
        Adding files to support building for debian.
      debian/po/nl.po:
        Adding files to support building for debian.
      debian/po/pt.po:
        Adding files to support building for debian.
      debian/po/pt_BR.po:
        Adding files to support building for debian.
      debian/po/ro.po:
        Adding files to support building for debian.
      debian/po/ru.po:
        Adding files to support building for debian.
      debian/po/sv.po:
        Adding files to support building for debian.
      debian/po/templates.pot:
        Adding files to support building for debian.
      debian/po/tr.po:
        Adding files to support building for debian.
      debian/rules:
        Adding files to support building for debian.
        ---
        Added semi-colons to fix syntax error.
      debian/source.lintian-overrides.in:
        Adding files to support building for debian.
      debian/watch:
        Adding files to support building for debian.
      359594cc
    • unknown's avatar
      Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect · 35c10cca
      unknown authored
       - Add testcase for SSL connection from mysqldump to mysqld
      
      
      mysql-test/r/openssl_1.result:
        Add test result
      mysql-test/t/openssl_1.test:
        Add test case for mysqldump with SSL connection to mysqld
      35c10cca
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import · 15050080
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      15050080
    • unknown's avatar
      Bug#21765 Illegal Instruction crash on pre-pentium when using YASSL · c6b0cff1
      unknown authored
       - Import patch with different method of detecting if machine has
         cpuid instruction
      
      
      extra/yassl/taocrypt/src/misc.cpp:
        Import patch yassl.diff
      c6b0cff1
    • unknown's avatar
      Print warning to log when SSL setup fails · d25a540d
      unknown authored
      d25a540d
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 · 2b6cd457
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      vio/viosslfactories.c:
        Auto merged
      mysql-test/r/openssl_1.result:
        Manual merge
      mysql-test/t/openssl_1.test:
        Manual merge
      2b6cd457
    • unknown's avatar
      Add test for connect using different ssl ciphers · d032b0e5
      unknown authored
      
      mysql-test/r/openssl_1.result:
        Update result
      d032b0e5
    • unknown's avatar
      561cd328
  4. 10 Apr, 2007 15 commits
  5. 09 Apr, 2007 2 commits
  6. 08 Apr, 2007 1 commit
  7. 07 Apr, 2007 4 commits
  8. 06 Apr, 2007 3 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b5cf43c9
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
      
      
      b5cf43c9
    • unknown's avatar
      Bug#27586: Wrong autoinc value assigned by LOAD DATA in the · 35a0f472
      unknown authored
      NO_AUTO_VALUE_ON_ZERO mode.
      
      The table->auto_increment_field_not_null variable wasn't reset after
      reading a row which may lead to inserting a wrong value to the auto-increment
      field to the following row.
      
      The table->auto_increment_field_not_null variable is reset now right after a
      row is being written in the read_fixed_length() and the read_sep_field()
      functions.
      Removed wrong setting of the table->auto_increment_field_not_null variable in
      the read_sep_field() function.
      
      
      mysql-test/t/loaddata.test:
        Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
        NO_AUTO_VALUE_ON_ZERO mode.
      mysql-test/r/loaddata.result:
        Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
        NO_AUTO_VALUE_ON_ZERO mode.
      sql/sql_load.cc:
        Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
        NO_AUTO_VALUE_ON_ZERO mode.
        The table->auto_increment_field_not_null variable is reset now right after a
        row is being written in the read_fixed_length() and the read_sep_field()
        functions.
        Remove wrong setting of the table->auto_increment_field_not_null variable in
        the read_sep_field() function.
      35a0f472
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · d6a78be9
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      d6a78be9