1. 16 Apr, 2007 2 commits
  2. 15 Apr, 2007 4 commits
    • unknown's avatar
      item.cc: · 3e8252ff
      unknown authored
        Fix warning after fix for bug#27321.
      
      
      sql/item.cc:
        Fix warning after fix for bug#27321.
      3e8252ff
    • unknown's avatar
      subselect.test, subselect.result: · 6ad00742
      unknown authored
        After merge fix.
      
      
      mysql-test/r/subselect.result:
        After merge fix.
      mysql-test/t/subselect.test:
        After merge fix.
      6ad00742
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9255aab5
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql
      
      
      mysql-test/r/subselect3.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/subselect.result:
        Manually merged
      mysql-test/t/subselect.test:
        Manually merged
      mysql-test/t/subselect3.test:
        Manually merged
      9255aab5
    • unknown's avatar
      Bug#27321: Wrong subquery result in a grouping select. · 1cf3b965
      unknown authored
      The Item_outer_ref class based on the Item_direct_ref class was always used
      to represent an outer field. But if the outer select is a grouping one and the 
      outer field isn't under an aggregate function which is aggregated in that
      outer select an Item_ref object should be used to represent such a field.
      If the outer select in which the outer field is resolved isn't grouping then
      the Item_field class should be used to represent such a field.
      This logic also should be used for an outer field resolved through its alias
      name.
      
      Now the Item_field::fix_outer_field() uses Item_outer_field objects to
      represent aliased and non-aliased outer fields for grouping outer selects
      only.
      Now the fix_inner_refs() function chooses which class to use to access outer
      field - the Item_ref or the Item_direct_ref. An object of the chosen class
      substitutes the original field in the Item_outer_ref object.
      The direct_ref and the found_in_select_list fields were added to the
      Item_outer_ref class.
      
      
      mysql-test/t/subselect3.test:
        Some test cases were corrected after the fix for the bug#27321.
      mysql-test/r/subselect3.result:
        Some test cases were corrected after the fix for the bug#27321.
      mysql-test/t/subselect.test:
        Added a test case for the bug#27321: Wrong subquery result in a grouping select.
      mysql-test/r/subselect.result:
        Added a test case for the bug#27321: Wrong subquery result in a grouping select.
        Some test cases were corrected after this fix.
      sql/sql_union.cc:
        Bug#27321: Wrong subquery result in a grouping select.
        Cleanup of the inner_refs_list.
      sql/sql_select.cc:
        Bug#27321: Wrong subquery result in a grouping select.
        Now the fix_inner_refs() function chooses which class to use to access outer
        field - the Item_ref or the Item_direct_ref. An object of the chosen class
        substitutes the original field in the Item_outer_ref object.
        A comment is corrected.
      sql/item.cc:
        Bug#27321: Wrong subquery result in a grouping select.
        Now the Item_field::fix_outer_field() uses Item_outer_field objects to
        represent aliased and non-aliased outer fields for grouping outer selects
        only.
      sql/item.h:
        Bug#27321: Wrong subquery result in a grouping select.
        The direct_ref and the found_in_select_list fields were added to the
        Item_outer_ref class.
      1cf3b965
  3. 14 Apr, 2007 3 commits
  4. 13 Apr, 2007 7 commits
  5. 12 Apr, 2007 15 commits
    • unknown's avatar
      Bug#27775 mediumint auto_increment with ndb_restore · 53fa178c
      unknown authored
      - autoincrement column of size medium int not handled in ndb_restore
      - added testcase also for other types, tiny, small... etc
      
      
      53fa178c
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a1626c66
      unknown authored
      into  gshchepa.localdomain:/home/uchum/work/bk-trees/5507-ci
      
      
      a1626c66
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 011e3a26
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
      
      
      011e3a26
    • unknown's avatar
    • unknown's avatar
      Bug#5507: TRUNCATE does not work with views. · 0b54001b
      unknown authored
      Support of views wasn't implemented for the TRUNCATE statement.
      Now TRUNCATE on views has the same semantics as DELETE FROM view:
      mysql_truncate() checks whether the table is a view and falls back
      to delete if so.
      In order to initialize properly the LEX::updatable for a view
      st_lex::can_use_merged() now allows usage of merged views for the
      TRUNCATE statement.
      
      
      mysql-test/r/truncate.result:
        Added a test case for the Bug#5507: TRUNCATE does not work with views.
      mysql-test/t/truncate.test:
        Added a test case for the Bug#5507: TRUNCATE does not work with views.
      sql/sql_lex.cc:
        Bug#5507: TRUNCATE does not work with views.
        can_use_merged() was denying of usage of merged views for a
        TRUNCATE statement. This results in improper initialization
        of view LEX::updatable. Fixed.
      sql/sql_delete.cc:
        Bug#5507: TRUNCATE does not work with views.
        1.mysql_truncate() was lacking of check whether the table is view. Added.
        2.mysql_truncate() calls mysql_delete(), but mysql_delete() always reports
        errors as "DELETE" errors. Fixed.
      mysql-test/t/view.test:
        Updated test case for Bug#14540: OPTIMIZE, ANALYZE, REPAIR applied 
        to not a view.
      mysql-test/r/view.result:
        Updated test case for Bug#14540: OPTIMIZE, ANALYZE, REPAIR applied 
        to not a view.
      0b54001b
    • unknown's avatar
      BUG#27367 mysql.server should be LSB init script compliant · 44c00123
      unknown authored
      Moved cd $basedir to live in the start section, as it only applies to the start
      functionality and breaks the restart task
      
      
      44c00123
    • unknown's avatar
      Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus · 49e9743d
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
      
      
      49e9743d
    • unknown's avatar
      Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus · 1aee9665
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
      
      
      1aee9665
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt · 2eaf8ac8
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
      
      
      2eaf8ac8
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · 70d753c6
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
      
      
      70d753c6
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 795d8583
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      795d8583
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 4e84edc9
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
      
      
      4e84edc9
    • unknown's avatar
      Bug#27783 mysql_install_db should be able to install again, preserving existing files. · 87a99ed7
      unknown authored
       - Allow mysql_install_db to be run a second time in the same
         datadir to create and fill any missing system tables
      
      
      scripts/mysql_install_db.sh:
        Remove check that dissallowed running mysql_install_db a second time
        in same directory
      scripts/mysql_system_tables.sql:
        Save information about if tables db and user already existed
      scripts/mysql_system_tables_data.sql:
        Fill tables db and user with initial data if tables
        didn't already exist.
      87a99ed7
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · f4c619ba
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      f4c619ba
    • unknown's avatar
      Bug #27758 Restoring NDB backups makes table usable in SQL nodes · d7dadcd7
      unknown authored
      - parse indexname using "split" instead of sscanf, as not to break at space
      - test case with space in key
      - enclose names in printout
      
      
      mysql-test/r/ndb_restore.result:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - change to using an index with space to reproduce bug
      mysql-test/t/ndb_restore.test:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - change to using an index with space to reproduce bug
      ndb/tools/restore/consumer_restore.cpp:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - parse indexname using "split" instead of sscanf, as not to break at space
        - enclose names in printout
      ndb/tools/restore/restore_main.cpp:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - enclose names in printout
      sql/ha_ndbcluster.cc:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - correct error message
      d7dadcd7
  6. 11 Apr, 2007 9 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 ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7c4db88a
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      7c4db88a
    • 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
      Post-merge fix. · 8d40fa58
      unknown authored
      8d40fa58
    • 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