1. 20 Apr, 2007 1 commit
  2. 19 Apr, 2007 6 commits
    • unknown's avatar
      Bug #27964: pthread_key_create doesn't set errno, so don't report \ · 4c865ebc
      unknown authored
      	errno
      
      Vasil Dimov (at Oracle) noted that pthread_key_create() does not
      set errno, so if it fails then we return the wrong error code.
      
      Instead, capture the return value, which is the real error value, 
      and instead report that.
      
      
      mysys/my_thr_init.c:
        pthread functions don't set the global errno, which should be
        obvious.
      4c865ebc
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.0-maint · a5b5535d
      unknown authored
      into  mysql.com:/home/ram/work/b26851/b26851.5.0
      
      a5b5535d
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.0-maint · f7175dcf
      unknown authored
      into  mysql.com:/home/ram/work/b22824/my50-b22824
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/strict.result:
        merging
      mysql-test/t/strict.test:
        merging
      f7175dcf
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.0-maint · 9e897c56
      unknown authored
      into  mysql.com:/home/ram/work/b26851/b26851.5.0
      
      
      client/mysql.cc:
        Auto merged
      9e897c56
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 648c3671
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/inno/apr18/50
      
      648c3671
    • unknown's avatar
      Apply innodb-5.0-ss1405 snapshot · f1c7fd19
      unknown authored
      NULL MERGE: this ChangeSet will be null merged into mysql-5.1
      
      Fixes:
      
      - Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
        Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
        this flag immediately after open(2)ing. This way an error caused by
        O_DIRECT not being supported can easily be ignored.
      - Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
      - Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
        Report the current value of the AUTO_INCREMENT counter to MySQL.
      
      
      innobase/configure.in:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1396:
        branches/5.0: Merge r1395 from trunk:
        
        * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
        to set this flag immediately after open(2)ing. This way an error caused by
        O_DIRECT not being supported can easily be ignored.
        
        * Add support for skipping the OS caching on Solaris by calling directio()
        instead of fcntl().
      innobase/os/os0file.c:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1394:
        branches/5.0: Merge r1391 from trunk:
        
        Merge the bodies of os_file_handle_error() and os_file_handle_error_no_exit()
        into a generic function which is called from both os_file_handle_error() and
        os_file_handle_error_no_exit()
        
        
        Revision r1396:
        branches/5.0: Merge r1395 from trunk:
        
        * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
        to set this flag immediately after open(2)ing. This way an error caused by
        O_DIRECT not being supported can easily be ignored.
        
        * Add support for skipping the OS caching on Solaris by calling directio()
        instead of fcntl().
      mysql-test/r/innodb.result:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1405:
        branches/5.0: Merge r1404 from trunk:
        
        Report the current value of the AUTO_INCREMENT counter to MySQL.
        (Bug #23313, Bug #21404)
        
        ha_innobase::update_create_info(): New function, to report
        the auto_increment_value.
      mysql-test/t/innodb.test:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1405:
        branches/5.0: Merge r1404 from trunk:
        
        Report the current value of the AUTO_INCREMENT counter to MySQL.
        (Bug #23313, Bug #21404)
        
        ha_innobase::update_create_info(): New function, to report
        the auto_increment_value.
      sql/ha_innodb.cc:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1405:
        branches/5.0: Merge r1404 from trunk:
        
        Report the current value of the AUTO_INCREMENT counter to MySQL.
        (Bug #23313, Bug #21404)
        
        ha_innobase::update_create_info(): New function, to report
        the auto_increment_value.
      sql/ha_innodb.h:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1405:
        branches/5.0: Merge r1404 from trunk:
        
        Report the current value of the AUTO_INCREMENT counter to MySQL.
        (Bug #23313, Bug #21404)
        
        ha_innobase::update_create_info(): New function, to report
        the auto_increment_value.
      f1c7fd19
  3. 18 Apr, 2007 6 commits
    • unknown's avatar
      Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2 · 32e10ba7
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
      
      
      configure.in:
        Auto merged
      32e10ba7
    • unknown's avatar
      Fixed make distcheck problem. · a96f2406
      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
      a96f2406
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/50 · 968b2240
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      mysys/my_alloc.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      968b2240
    • unknown's avatar
      Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2 · e9f88b39
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
      
      
      configure.in:
        SCCS merged
      e9f88b39
    • unknown's avatar
      Changed a comment to be more clear. · c4239905
      unknown authored
      c4239905
    • unknown's avatar
      BUG#27769 - MySQL should include debian packaging dir · 36094f9b
      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.
      36094f9b
  4. 17 Apr, 2007 5 commits
  5. 16 Apr, 2007 4 commits
    • unknown's avatar
      Merge damien-katzs-computer.local:/Users/dkatz/mysql50 · 65f993fc
      unknown authored
      into  damien-katzs-computer.local:/Users/dkatz/50b
      
      65f993fc
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · b0e0b044
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
      
      
      BitKeeper/deleted/.del-configure.in.rej:
        Auto merged
      configure.in:
        Auto merged
      b0e0b044
    • unknown's avatar
      Bug #27710 Creating unique index fails during single user mode · 182ed6f3
      unknown authored
        - enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
      
      182ed6f3
    • unknown's avatar
      Fix for · a5b72a5b
      unknown authored
      bug #27715: mysqld --character-sets-dir buffer overflow
      bug ##26851: Mysql Client --pager Buffer Overflow
      
      Using strmov() to copy an argument may cause overflow 
      if the argument's length is bigger than the buffer:
      use strmake instead.
      Also, we have to encrease the error message buffer size to fit 
      the longest message.
      
      
      client/mysql.cc:
        Fix for 
        bug #27715: mysqld --character-sets-dir buffer overflow
        bug ##26851: Mysql Client --pager Buffer Overflow
          - use strmake() instead of strmov() to avoid buffer overflow.
      mysql-test/r/mysql.result:
        Fix for 
        bug #27715: mysqld --character-sets-dir buffer overflow
        bug ##26851: Mysql Client --pager Buffer Overflow
        
          - test result.
      mysql-test/t/mysql.test:
        Fix for 
        bug #27715: mysqld --character-sets-dir buffer overflow
        bug ##26851: Mysql Client --pager Buffer Overflow
        
          - test case.
      mysys/charset.c:
        Fix for 
        bug #27715: mysqld --character-sets-dir buffer overflow
        bug ##26851: Mysql Client --pager Buffer Overflow
        
          - encrease error message buffer size to fit the (possible) longest message.
      a5b72a5b
  6. 15 Apr, 2007 4 commits
    • unknown's avatar
      item.cc: · ac7b8e31
      unknown authored
        Fix warning after fix for bug#27321.
      
      
      sql/item.cc:
        Fix warning after fix for bug#27321.
      ac7b8e31
    • unknown's avatar
      subselect.test, subselect.result: · 5ac8dab5
      unknown authored
        After merge fix.
      
      
      mysql-test/r/subselect.result:
        After merge fix.
      mysql-test/t/subselect.test:
        After merge fix.
      5ac8dab5
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d06ea19d
      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
      d06ea19d
    • unknown's avatar
      Bug#27321: Wrong subquery result in a grouping select. · 321726e8
      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.
      321726e8
  7. 14 Apr, 2007 3 commits
  8. 13 Apr, 2007 10 commits
  9. 12 Apr, 2007 1 commit