1. 19 Apr, 2007 1 commit
    • unknown's avatar
      Bug #27123 (partition + on duplicate key update + varchar = Can't find · 37410d4d
      unknown authored
      record in table)
      
      key_restore function didn't work as intended in the case of
      VARCHAR or BLOB fields, stored the restored key in field->ptr instead
      of to_record.
      That produced the wrong key so search returned wrong result
      
      
      mysql-test/r/partition.result:
        result added
      mysql-test/t/partition.test:
        testcase
      sql/field.cc:
        Field_blob::store_length made static
      sql/field.h:
        Field_blob::store_length and set_ptr functions implemented in slightly
        different way
      sql/ha_ndbcluster.cc:
        set_ptr_offset used
      sql/key.cc:
        set key_part->field->ptr to the proper place inside the to_record
        so the restored key will be placed there as key_restore
        is supposed to behave
      37410d4d
  2. 15 Apr, 2007 6 commits
    • unknown's avatar
      subselect.result: · a30802b4
      unknown authored
        After merge fix.
      
      
      mysql-test/r/subselect.result:
        After merge fix.
      a30802b4
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql · b138a4d3
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
      
      
      mysql-test/r/subselect3.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      mysql-test/r/subselect.result:
        Manual merge
      mysql-test/t/subselect.test:
        Manual merge
      b138a4d3
    • 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
  3. 14 Apr, 2007 5 commits
  4. 13 Apr, 2007 5 commits
  5. 12 Apr, 2007 23 commits
    • unknown's avatar
      correct merge error · fa0f4547
      unknown authored
      fa0f4547
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2c06963e
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/tools/restore/Restore.hpp:
        Auto merged
      storage/ndb/tools/restore/consumer_restore.cpp:
        Auto merged
      mysql-test/r/ndb_restore.result:
        manual merge
      mysql-test/t/ndb_restore.test:
        manual merge
      2c06963e
    • unknown's avatar
      Bug#27775 mediumint auto_increment with ndb_restore · 0c2f1e3a
      unknown authored
      - autoincrement column of size medium int not handled in ndb_restore
      - added testcase also for other types, tiny, small... etc
      
      0c2f1e3a
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user · e6c8de9e
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
      
      e6c8de9e
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bdfef71c
      unknown authored
      into  gshchepa.localdomain:/home/uchum/work/bk-trees/5507-ci
      
      bdfef71c
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 86ca4948
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
      
      86ca4948
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · ecffbf87
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/include/ndbapi/NdbRecAttr.hpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbRecAttr.cpp:
        Auto merged
      ecffbf87
    • unknown's avatar
    • unknown's avatar
      Bug#5507: TRUNCATE does not work with views. · f6123687
      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.
      f6123687
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt · d954c192
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
      
      d954c192
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt · 6a9776da
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
      
      6a9776da
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · 92447690
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
      
      92447690
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 277dfc0f
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      277dfc0f
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 31db7dfa
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      31db7dfa
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user · 9eeb801f
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
      
      9eeb801f
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 36b6a8d7
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
      
      36b6a8d7
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · df7ff478
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      df7ff478
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 84227177
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Auto merged
      storage/ndb/test/include/HugoOperations.hpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      storage/ndb/test/src/HugoOperations.cpp:
        Auto merged
      storage/ndb/test/src/HugoTransactions.cpp:
        Auto merged
      storage/ndb/include/kernel/AttributeHeader.hpp:
        merge
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        merge
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        merge
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        merge
      storage/ndb/test/ndbapi/testBasic.cpp:
        merge
      84227177
    • unknown's avatar
      ndb - bug#27756 · dc8d4699
      unknown authored
        make sure that copy tuple is released in all cases
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        make sure that copy tuple is released in all cases
      storage/ndb/test/run-test/daily-basic-tests.txt:
        add testcase
      dc8d4699
    • unknown's avatar
      ndb - bug#27756 · ebadeef4
      unknown authored
        testcase only
        new pseudo column NDB$COPY_ROWID
      
      
      storage/ndb/include/kernel/AttributeHeader.hpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/test/ndbapi/testBasic.cpp:
        add testcase for bug#27756
      ebadeef4
    • unknown's avatar
      ndb - hugo - add new method for setting primary key(s) · c3ca248b
      unknown authored
      
      storage/ndb/test/include/HugoOperations.hpp:
        Add method for setting of primary key
      storage/ndb/test/src/HugoAsynchTransactions.cpp:
        Add method for setting of primary key
      storage/ndb/test/src/HugoOperations.cpp:
        Add method for setting of primary key
      storage/ndb/test/src/HugoTransactions.cpp:
        Add method for setting of primary key
      c3ca248b
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 4e946606
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      4e946606
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 94f9da5e
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/tools/restore/consumer_restore.cpp:
        Auto merged
      storage/ndb/tools/restore/restore_main.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        null merge, 5.1 already reports correct error
      mysql-test/r/ndb_restore.result:
        manual merge
      mysql-test/t/ndb_restore.test:
        manual merge
      94f9da5e