1. 26 Apr, 2007 1 commit
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 808beaa5
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
      
      
      include/config-win.h:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/r/func_in.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/func_in.test:
        Auto merged
      ndb/src/ndbapi/DictCache.cpp:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      configure.in:
        Version increment.
      support-files/mysql.spec.sh:
        Include enterprise advert.
      808beaa5
  2. 20 Apr, 2007 4 commits
  3. 19 Apr, 2007 1 commit
    • unknown's avatar
      mysql.sln: · 777b39fb
      unknown authored
        Enable 'mysys' build if target 'Enterprise'
      item_subselect.h:
        Fixed bug #27870. The bug that causes crashes manifests itself at some
        conditions when executing an equijoin query with WHERE condition
        containing a subquery predicate of the form join_attr NOT IN (SELECT ...).
      
      
      VC++Files/mysql.sln:
        Enable 'mysys' build if target 'Enterprise'
      sql/item_subselect.h:
        Fixed bug #27870. The bug that causes crashes manifests itself at some
        conditions when executing an equijoin query with WHERE condition
        containing a subquery predicate of the form join_attr NOT IN (SELECT ...).
      777b39fb
  4. 18 Apr, 2007 2 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/fix-ndb-5.0 · 3e7dd5e0
      unknown authored
      into  trift2.:/MySQL/M50/clone-5.0
      
      
      3e7dd5e0
    • unknown's avatar
      sql/ha_ndbcluster.cc · 0e42267f
      unknown authored
          Hex constants that exceed 32 bit need to be marked "LL" for the compile to work.
      
      
      sql/ha_ndbcluster.cc:
        Hex constants that exceed 32 bit need to be marked "LL" for the compile to work
        (discovered on a Debian PPC box, 32-bit big-endian, running gcc 3.3.6).
      0e42267f
  5. 17 Apr, 2007 9 commits
    • unknown's avatar
      Added funcs_1 and funcs_2 to the test-bt option · be06c015
      unknown authored
      be06c015
    • unknown's avatar
      Dbdict.cpp: · 203b8058
      unknown authored
        Bug #27710 Creating unique index fails during single user mode
        - 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
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Bug #27710 Creating unique index fails during single user mode
        - 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
      203b8058
    • unknown's avatar
      Bug#27783 mysql_install_db should be able to install again, preserving existing files. · e83e62ca
      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.
      e83e62ca
    • unknown's avatar
      Merge trift2.:/MySQL/M50/limit-man-5.0 · e4eb07c5
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      e4eb07c5
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build · d9a96436
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      d9a96436
    • unknown's avatar
      reverted the fix for Bug#5507 · 5234f5ad
      unknown authored
      5234f5ad
    • unknown's avatar
      Merge trift2.:/MySQL/M50/limit-man-5.0 · 6c98456f
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      6c98456f
    • unknown's avatar
      Let the "configure" options that control table handlers (NDB, InnoDB) or features ("embedded") · 5c9123b5
      unknown authored
      also control the list of man pages installed, so that they correspond better to the binaries.
      
      This is the second version of this fix, including review comments.
      
      
      configure.in:
        Several of our man pages are specific to parts (table handlers, features, ...)
        which are controlled by "configure" options, so there are builds which do not
        include these parts.
        For such builds, remove those specific man pages from the list of man pages
        to be installed, so that the man pages correspond better to the binaries.
        
        In this patch, do it for NDB (modify Kent's approach), "embedded", and InnoDB.
        
        Ensure that the handling of the man pages is determined only after the options
        have been processed, the old nandling (NDB only) was done too early.
        
        This is the second version of this fix, including review comments.
      5c9123b5
  6. 16 Apr, 2007 2 commits
    • unknown's avatar
      Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed · a318c75a
      unknown authored
      Additional changes to test:  "flush tables" so that Windows releases
      the files.
      
      
      mysql-test/r/mysqlcheck.result:
        Add "flush tables" to get windows to release the files, so that 
        we can test truncation properly.
      mysql-test/t/mysqlcheck.test:
        Add "flush tables" to get windows to release the files, so that 
        we can test truncation properly.
      a318c75a
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · c2951b70
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      c2951b70
  7. 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
  8. 14 Apr, 2007 3 commits
  9. 13 Apr, 2007 2 commits
  10. 12 Apr, 2007 11 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
      Header file "decimal.h" needs to be delivered with binary packages: · 0d982c5d
      unknown authored
      Bug#27456    decimal.h is not installed with public include files
      
      
      0d982c5d
    • 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
      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 #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
  11. 11 Apr, 2007 1 commit