1. 06 Dec, 2007 5 commits
    • unknown's avatar
      partition_archive tests added · d7a2e005
      unknown authored
      
      mysql-test/r/partition_archive.result:
        test results
      mysql-test/t/partition_archive.test:
        tests added
      d7a2e005
    • unknown's avatar
      Merge mysql.com:/home/hf/work/32247/my51-32247 · 4cb78413
      unknown authored
      into  mysql.com:/home/hf/work/mrg/my51-mrg
      
      
      mysql-test/r/partition.result:
        merging
      mysql-test/t/partition.test:
        merging
      sql/ha_partition.cc:
        SCCS merged
      4cb78413
    • unknown's avatar
      Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table). · b6c0c175
      unknown authored
      ha_partition::update_create_info() just calls update_create_info
      of a first partition, so only get the autoincrement maximum
      of the first partition, so SHOW CREATE TABLE can show
      small AUTO_INCREMENT parameters.
      Fixed by implementing ha_partition::update_create_info() in a way
      other handlers work.
      HA_ARCHIVE:stats.auto_increment handling made consistent with other engines
      
      
      mysql-test/r/archive.result:
        Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
        
        test result fixed
      mysql-test/r/partition.result:
        Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
        
        test result
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
        
        test result fixed
      mysql-test/t/partition.test:
        Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
        
        test added as rpl_innodb_bug28430 is INNOBASE specific while
        the bug is not
      sql/ha_partition.cc:
        Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
        
        ha_partition::update_create_info() implemented
      storage/archive/ha_archive.cc:
        Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
        
        ha_archive.stats.auto_increment now contains next (not last used) value
        of auto_increment to be consistent with other engines
      b6c0c175
    • unknown's avatar
      Merge mysql.com:/misc/mysql/31177/50-31177 · 55dea2fc
      unknown authored
      into  mysql.com:/misc/mysql/31177/51-31177
      
      
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      mysys/my_getopt.c:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        manual merge
      mysql-test/r/ps_3innodb.result:
        manual merge
      mysql-test/r/ps_4heap.result:
        manual merge
      mysql-test/r/ps_5merge.result:
        manual merge
      mysql-test/suite/ndb/r/ps_7ndb.result:
        manual merge
      mysql-test/t/variables.test:
        manual merge
      sql/mysqld.cc:
        NULL
      sql/item_func.cc:
        Signedness is already propagated properly for user-vars in 5.1.
      sql/set_var.cc:
        add correct handling of signedness when assigning 64-bit
        values to sysvars.
      sql/set_var.h:
        cleanliness.
      55dea2fc
    • unknown's avatar
      Bug#31177: Server variables can't be set to their current values · 4618d68d
      unknown authored
      additional fixes for BDB and correct assignment of both signed
      and unsigned 64-bit data to unsigned system variables
      
      
      mysql-test/r/ps_2myisam.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_3innodb.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_4heap.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_5merge.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_6bdb.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_7ndb.result:
        account for UNSIGNED_FLAG
      mysys/my_getopt.c:
        We have correct signed/unsigned information now, so we no longer
        need to err on the side of caution.
      sql/item_func.cc:
        Copy unsigned info over from entry so the item's data
        correctly describe it.
      sql/mysqld.cc:
        BDB log buffer size: default can't be less than minimum
      sql/set_var.cc:
        Handle signedness of in-values correctly when assigning to
        unsigned types, all the way up to 64-bit. Use handler from
        all three unsigned sysvar types.
      sql/set_var.h:
        thd_ulonglong: Override default check with one for unsigned types
      4618d68d
  2. 04 Dec, 2007 1 commit
    • unknown's avatar
      Bug#31177: Server variables can't be set to their current values · 09bf5b91
      unknown authored
      additional fixes for 64-bit
      ---
      Merge mysql.com:/misc/mysql/31177/50-31177
      into  mysql.com:/misc/mysql/31177/51-31177
      ---
      Bug#31177: Server variables can't be set to their current values
      
      additional 5.1 fixes (for plugins)
      
      
      mysql-test/t/variables.test:
        replace 32-bit and 64-bit values
        ---
        manual merge
      mysys/my_getopt.c:
        'mod' no longer used.
        on 64-bit, limit to (signed) (LONG)LONG_MAX to prevent badness
        in classes using longlong.
      sql/sql_plugin.cc:
        handle signedness in plugin-vars so we won't hit an assert()
        in getopt_*_limit_value()
      09bf5b91
  3. 03 Dec, 2007 1 commit
  4. 02 Dec, 2007 2 commits
    • unknown's avatar
      Bug#31177: Server variables can't be set to their current values · d892e682
      unknown authored
      extra 5.1 fixes
      
      
      mysql-test/t/order_fill_sortbuf-master.opt:
        If we set the variable below minimum, we'll get a warning
        at start-up that we don't want in the tests.
      d892e682
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 70cb41a2
      unknown authored
      into  mysql.com:/misc/mysql/31177/51-31177
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/index_merge_myisam.result:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      70cb41a2
  5. 01 Dec, 2007 6 commits
    • unknown's avatar
      Bug#31177: Server variables can't be set to their current values · 58f10e55
      unknown authored
      5.1+ specific fixes (plugins etc.)
      
      
      include/my_getopt.h:
        make both ull and ll global
      mysql-test/r/index_merge_myisam.result:
        we throw warnings to the client, yea, verily
      mysql-test/r/innodb.result:
        we throw warnings to the client, yea, verily
      mysql-test/r/variables.result:
        we throw warnings to the client, yea, verily
      mysql-test/t/variables.test:
        correct result, is multiple of variable's block_size now
      mysys/my_getopt.c:
        export getopt_ll_limit_value(), check for integer wrap-around
        in it, same as in ull variant.  Only print warnings to reporter
        when caller didn't ask for diagnostics, otherwise assume caller
        will handle any warnings (id est, throw them client-wards)
      sql/mysqld.cc:
        correct signedness of "concurrent-insert"
      sql/sql_plugin.cc:
        Throw sys-var out-of-range warnings client-wards for
        plugins, too.
      58f10e55
    • unknown's avatar
      Merge mysql.com:/misc/mysql/31177/50-31177 · 54ad7d88
      unknown authored
      into  mysql.com:/misc/mysql/31177/51-31177
      
      
      include/m_string.h:
        Auto merged
      include/my_getopt.h:
        Auto merged
      mysql-test/r/delayed.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/key_cache.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/r/type_bit_innodb.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      BitKeeper/deleted/.del-index_merge.result:
        Auto merged
      sql/set_var.cc:
        Auto merged
      mysql-test/r/variables.result:
        manual merge
      client/mysql.cc:
        manual merge
      client/mysqltest.c:
        manual merge
      mysql-test/r/subselect.result:
        manual merge
      mysys/my_getopt.c:
        manual merge
      sql/mysqld.cc:
        manual merge
      54ad7d88
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 25886c06
      unknown authored
      into  mysql.com:/misc/mysql/32707/51-32707
      
      
      sql/protocol.cc:
        Auto merged
      25886c06
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · 4e897766
      unknown authored
      into  mysql.com:/home/hf/work/mrg/my51-mrg
      
      
      4e897766
    • unknown's avatar
      merging · 2850d7bd
      unknown authored
      2850d7bd
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 9b1665b1
      unknown authored
      into  mysql.com:/misc/mysql/32180/51-32180
      
      
      9b1665b1
  6. 30 Nov, 2007 15 commits
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/my50-mrg · 51f5ac6b
      unknown authored
      into  mysql.com:/home/hf/work/mrg/my51-mrg
      
      
      sql/mysqld.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      include/mysql_com.h:
        merging
      libmysqld/lib_sql.cc:
        merging
      mysql-test/r/federated.result:
        merging
      mysql-test/t/federated.test:
        merging
      storage/federated/ha_federated.h:
        mergin
      51f5ac6b
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/my41-mrg · 4100e3e4
      unknown authored
      into  mysql.com:/home/hf/work/mrg/my50-mrg
      
      
      include/mysql_com.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      4100e3e4
    • unknown's avatar
      Merge mysql.com:/home/hf/work/32624/my50-32624 · 11c17294
      unknown authored
      into  mysql.com:/home/hf/work/mrg/my50-mrg
      
      
      11c17294
    • unknown's avatar
      Merge mysql.com:/home/hf/work/32374/my50-32374 · 104bba77
      unknown authored
      into  mysql.com:/home/hf/work/mrg/my50-mrg
      
      
      104bba77
    • unknown's avatar
      Merge mysql.com:/home/hf/work/31890/my51-31890 · 65b77b9d
      unknown authored
      into  mysql.com:/home/hf/work/mrg/my51-mrg
      
      
      mysql-test/r/partition.result:
        SCCS merged
      mysql-test/t/partition.test:
        merging
      65b77b9d
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30430/my51-30430 · 69f539af
      unknown authored
      into  mysql.com:/home/hf/work/mrg/my51-mrg
      
      
      69f539af
    • unknown's avatar
      Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc... · 6959d204
      unknown authored
      PS-protocol data is stored in different format - the MYSQL_RECORDS->data
      contains the link to the record content, not to array of the links to
      the field's contents. So we have to handle it separately for
      embedded-server query cache.
      
      
      libmysqld/emb_qcache.cc:
        Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
        
        ps_protocol data now stored in it's particular way.
      libmysqld/emb_qcache.h:
        Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
        
        Querycache_stream::load_char/store_char  ->
          load_uchar/store_uchar
      mysql-test/r/func_misc.result:
        Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
        
        test result
      mysql-test/t/func_misc.test:
        Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
        
        the test uses t2 table, so let's make sure it doesn't exist befor the start
      6959d204
    • unknown's avatar
      Merge mysql.com:/home/hf/work/31900/my41-31900 · d87a75c1
      unknown authored
      into  mysql.com:/home/hf/work/mrg/my41-mrg
      
      
      d87a75c1
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug9481/my51-bug9481 · c6f076f6
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      c6f076f6
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug9481/my50-bug9481 · f904aab4
      unknown authored
      into  polly.(none):/home/kaa/src/opt/bug9481/my51-bug9481
      
      
      sql/sql_class.h:
        Null merge.
      sql/sql_insert.cc:
        Null merge.
      tests/mysql_client_test.c:
        Null merge.
      f904aab4
    • unknown's avatar
      Bug#32775 problems with SHOW EVENTS and Information_Schema · ff7e7fcb
      unknown authored
      removed unnecessary privilege checks for I_S schema
      
      
      mysql-test/r/information_schema.result:
        test result
      mysql-test/t/information_schema.test:
        test case
      sql/events.cc:
        There is no events in I_S so we don't need to execute check_access here.
      sql/sql_parse.cc:
        removed unnecessary check
      ff7e7fcb
    • unknown's avatar
      Bug #32374 crash with filesort when selecting from federated table and view. · cef31e05
      unknown authored
      filesort() uses file->estimate_rows_upper_bound() call to allocate
      internal buffers. If this function returns a value smaller than
      a number of row that will be returned later in find_all_keys(),
      that can cause server crash.
      Fixed by implementing ha_federated::estimate_rows_upper_bound() to
      return maximum possible number of rows.
      Present estimation for FEDERATED always returns 0 if the linked to the VIEW.
      
      
      mysql-test/r/federated.result:
        Bug #32374 crash with filesort when selecting from federated table and view.
        
        test result
      mysql-test/t/federated.test:
        Bug #32374 crash with filesort when selecting from federated table and view.
        
        test case
      sql/ha_federated.cc:
        Bug #32374 crash with filesort when selecting from federated table and view.
        
        ha_federated::estimate_rows_upper_bound() implemented
      sql/ha_federated.h:
        Bug #32374 crash with filesort when selecting from federated table and view.
        
        ha_federated::estimate_rows_upper_bound() interface
      cef31e05
    • unknown's avatar
      Merge mysql.com:/misc/mysql/32707/50-32707 · 945f29aa
      unknown authored
      into  mysql.com:/misc/mysql/32707/51-32707
      
      
      sql/protocol.cc:
        manual merge
      945f29aa
    • unknown's avatar
      Merge mysql.com:/misc/mysql/32707/41-32707 · a5efa43c
      unknown authored
      into  mysql.com:/misc/mysql/32707/50-32707
      
      
      sql/protocol.cc:
        manual merge
      a5efa43c
    • unknown's avatar
      Bug#31177: Server variables can't be set to their current values · 89a20885
      unknown authored
      Default values of variables were not subject to upper/lower bounds
      and step, while setting variables was. Bounds and step are also
      applied to defaults now; defaults are corrected quietly, values
      given by the user are corrected, and a correction-warning is thrown
      as needed. Lastly, very large values could wrap around, starting
      from 0 again. They are bounded at the maximum value for the
      respective data-type now if no lower maximum is specified in the
      variable's definition.
      
      
      client/mysql.cc:
        correct maxima in options array
      client/mysqltest.c:
        adjust minimum for "sleep" option so default value is no longer
        out of bounds.
      include/m_string.h:
        ullstr() - the unsigned brother of llstr()
      include/my_getopt.h:
        Flag if we bounded the value (that is, correct anything aside from
        making value a multiple of block-size)
      mysql-test/r/delayed.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/index_merge.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/innodb.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/innodb_mysql.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/key_cache.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/packet.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/ps.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/subselect.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/type_bit.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/type_bit_innodb.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/variables.result:
        correct results: bounds and step apply to variables' default values, too
      mysql-test/t/variables.test:
        correct results: bounds and step apply to variables' default values, too
      mysys/my_getopt.c:
        - apply bounds/step to default values of variables (based on work by serg)
        - print complaints about incorrect values for variables (truncation etc.,
          by requestion of consulting)
        - if no lower maximum is specified in variable definition, bound unsigned
          values at their maximum to prevent wrap-around
        - some calls to error_reporter had a \n, some didn't. remove \n from calls,
          let reporter-function handle it, so the default reporter behaves like that
          in mysqld
      sql/mysql_priv.h:
        correct RANGE_ALLOC_BLOCK_SIZE (cleared with monty)
      sql/mysqld.cc:
        correct maxima to correct data-type.
        correct minima where higher than default.
        correct range-alloc-block-size.
        correct inno variables so GET_* corresponds to actual variable's type.
      sql/set_var.cc:
        When the new value for a variable is out of bounds, we'll send the
        client a warning (but not if the value was simply not a multiple of
        'blocksize').  sys_var_thd_ulong had this, sys_var_long_ptr_global
        didn't; broken out and streamlined to avoid duplication of code.
      strings/llstr.c:
        ullstr() - the unsigned brother of llstr()
      89a20885
  7. 29 Nov, 2007 2 commits
    • unknown's avatar
      Bug #29085 A small double precision number becomes zero. · 23e402bf
      unknown authored
      Denormalized DOUBLE-s can't be properly handled by old MIPS processors.
      So we need to enable specific mode for them so IRIX will do use
      software round to handle such numbers. 
      
      
      sql/mysqld.cc:
        Bug #29085 A small double precision number becomes zero.
        
        reset_floating_point_exeption() renamed as set_proper_floating_point_mode()
        #ifdef __sgi code added to enable denormalized DOUBLE-s on IRIX
      23e402bf
    • unknown's avatar
      Bug #32624 Error with multi queries in MySQL embedded server 5.1.22. · 1d062682
      unknown authored
      server status wasn't properly sent to the client after the error
      by the embedded server. Wasn't noticed before as one usually stopped
      retrieving results after he gets an error.
      
      
      libmysqld/lib_sql.cc:
        Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
        
        server status transferred to the client after errors
      sql/protocol.cc:
        Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
        
        set server status before net_send_error_packet() call as this
        function sends it to the client in the embedded server
      tests/mysql_client_test.c:
        Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
        
        testcase added
      1d062682
  8. 28 Nov, 2007 3 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · f4a7464f
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.1-bug32772
      
      
      f4a7464f
    • unknown's avatar
      Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA · b9d8e349
      unknown authored
      added new func mysql_create_like_schema_frm() which creates frm file based on I_S table
      
      
      mysql-test/r/create.result:
        test result
      mysql-test/t/create.test:
        test case
      sql/sql_table.cc:
        added new func mysql_create_like_schema_frm() which creates frm file based on I_S table
      b9d8e349
    • unknown's avatar
      BUG#32772: partition crash 1: enum column · b5c0cf45
      unknown authored
      The bug was that for ordered index scans, ha_partition::index_init() did
      not put index columns into table->read_set if the underlying storage 
      engine did not have HA_PARTIAL_COLUMN_READ flag. 
      This was causing assertion failure when handle_ordered_index_scan() tried
      to sort the records according to index order.
      
      Fixed by making ha_partition::index_init() put index columns into table->read_set
      for all ordered scans. 
      
      
      mysql-test/r/partition.result:
        BUG#32772: partition crash 1: enum column
        - Testcase
      mysql-test/t/partition.test:
        BUG#32772: partition crash 1: enum column
        - Testcase
      sql/ha_partition.cc:
        BUG#32772: partition crash 1: enum column
        - Make ha_partition::index_init() include index columns in the read_set
          whenever an ordered scan is initialized, no matter if
          HA_PARTIAL_COLUMN_READ is set or not.
      b5c0cf45
  9. 27 Nov, 2007 3 commits
    • unknown's avatar
      Bug#32707: misdimensioned buffer in protocol layer · 7c0db983
      unknown authored
      Miscalculation in protocol-layer: size buffer correctly so
      even really long error messages cannot overflow our buffer.
      
      
      sql/protocol.cc:
        size buffer correctly so really long error messages cannot overflow it.
      7c0db983
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B30355-5.0-opt · 9d503cea
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B30355-5.1-opt
      
      
      include/mysql_com.h:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/udf_example.c:
        Auto merged
      9d503cea
    • unknown's avatar
      Bug #30355: Incorrect ordering of UDF results · 63b65169
      unknown authored
      There's currently no way of knowing the determinicity of an UDF.
      And the optimizer and the sequence() UDFs were making wrong
      assumptions about what the is_const member means.
      Plus there was no implementation of update_system_tables()
      causing the optimizer to overwrite the information returned by
      the <udf>_init function.
      
      Fixed by equating the assumptions about the semantics of 
      is_const and providing a implementation of update_used_tables().
      Added a TODO item for the UDF API change needed to make a better 
      implementation.
      
      
      include/mysql_com.h:
        Bug #30355: comment added
      mysql-test/r/udf.result:
        Bug #30355: test case
      mysql-test/t/udf.test:
        Bug #30355: test case
      sql/item_func.cc:
        Bug #30355: keep const_item_cache and used_tables_cache in sync
      sql/item_func.h:
        Bug #30355: 
         - a better implementation of update_used_tables()
         - keep const_item_cache and used_tables_cache in sync
      sql/udf_example.c:
        Bug #30355: Wrong value for const_item fixed.
      63b65169
  10. 26 Nov, 2007 2 commits
    • unknown's avatar
      Many files: · 3058e025
      unknown authored
        Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
      
      
      mysql-test/r/subselect.result:
        Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
      mysql-test/r/subselect_notembedded.result:
        Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
      mysql-test/t/subselect.test:
        Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
      mysql-test/t/subselect_notembedded.test:
        Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
      3058e025
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug28837/my51-bug29131 · 8ae8b2e5
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      storage/myisam/ha_myisam.cc:
        Auto merged
      mysql-test/r/merge.result:
        Manual merge.
      mysql-test/r/myisam.result:
        Manual merge.
      mysql-test/t/merge.test:
        Manual merge.
      mysql-test/t/myisam.test:
        Manual merge.
      8ae8b2e5