1. 03 Jul, 2007 8 commits
    • unknown's avatar
      loaddata.result, loaddata.test: · 8d035c57
      unknown authored
        Updated test case for bug #29294.
      
      
      mysql-test/t/loaddata.test:
        Updated test case for bug #29294.
      mysql-test/r/loaddata.result:
        Updated test case for bug #29294.
      8d035c57
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · c700a776
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      mysql-test/r/loaddata.result:
        Merge with 4.1-opt.
      mysql-test/t/loaddata.test:
        Merge with 4.1-opt.
      c700a776
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · f57e4b99
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/4.1-opt
      
      
      f57e4b99
    • unknown's avatar
      loaddata.result, loaddata.test: · bc3e0086
      unknown authored
        Test case update for bug #29294.
      
      
      mysql-test/t/loaddata.test:
        Test case update for bug #29294.
      mysql-test/r/loaddata.result:
        Test case update for bug #29294.
      bc3e0086
    • unknown's avatar
      sql_class.cc: · 19a5d20c
      unknown authored
        Windows compilation error fix.
      
      
      sql/sql_class.cc:
        Windows compilation error fix.
      19a5d20c
    • unknown's avatar
      Fixed bug #29294. · 166d3c91
      unknown authored
      The `SELECT 'r' INTO OUTFILE ... FIELDS ENCLOSED BY 'r' ' statement
      encoded the 'r' string to a 4 byte string of value x'725c7272'
      (sequence of 4 characters: r\rr).
      The LOAD DATA statement decoded this string to a 1 byte string of
      value x'0d' (ASCII Carriage Return character) instead of the original
      'r' character.
      The same error also happened with the FIELDS ENCLOSED BY clause
      followed by special characters: 'n', 't', 'r', 'b', '0', 'Z' and 'N'.
      
      NOTE 1: This is a result of the undocumented feature: the LOAD DATA INFILE
      recognises 2-byte input sequences like \n, \t, \r and \Z in addition
      to documented 2-byte sequences: \0 and \N. This feature should be
      documented (here backspace character is a default ESCAPED BY character,
      in the real-life example it may be any ESCAPED BY character).
      
      NOTE 2, changed behaviour:
      Now the `SELECT INTO OUTFILE' statement with the `FIELDS ENCLOSED BY'
      clause followed by one of: 'n', 't', 'r', 'b', '0', 'Z' or 'N' characters
      encodes this special character itself by doubling it ('r' --> 'rr'),
      not by prepending it with an escape character.
      
      
      sql/sql_class.h:
        Fixed bug #29294.
        The ESCAPE_CHARS macro constant is defined to enumerate
        symbolic names of espace-sequences like  '\n', '\t' etc.
        The select_export::is_ambiguous_field_sep field has been added
        to distinguish special values of the field_sep field from
        another values (see ESCAPE_CHARS).
      sql/sql_class.cc:
        Fixed bug #29294.
        The select_export::send_data method has been modified to
        encode special values of the field_sep field by
        doubling of those values instead of prepending them with a
        value of the escape_char field.
        Example: The SELECT 'r' INTO OUTFILE FIELDS ENCLOSED BY 'r'
        now produces the 'rr' output string instead of x'5c72'
        (i.e. instead of sequence of 2 bytes: \ and r).
      sql/sql_load.cc:
        Fixed bug #29294.
        Added commentary for the READ_INFO::unescape method.
      mysql-test/t/loaddata.test:
        Updated test case for bug #29294.
      mysql-test/r/loaddata.result:
        Updated test case for bug #29294.
      166d3c91
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 81194444
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28983-2-5.0-opt
      
      
      81194444
    • unknown's avatar
      Bug #28983: 'reset master' in multiple threads and innodb tables · 841cf405
      unknown authored
      asserts debug binary
      
      We can't reliably check if the binary log is opened without 
      acquiring its mutex. 
      Fixed by removing this check.
      
      
      sql/log.cc:
        Bug #28983: 
        can't reliably check if bin_log is open outside of its mutex
      841cf405
  2. 02 Jul, 2007 1 commit
  3. 01 Jul, 2007 1 commit
    • unknown's avatar
      Fixed bug #25798. · 07dcc800
      unknown authored
      This bug may manifest itself not only with the queries for which
      the index-merge access method is chosen. It also may display
      itself for queries with DISTINCT.
      
      The bug was in how the Unique::get method used the merge_buffers
      function. To compare elements in the the queue employed by
      merge_buffers() it must use the buffpek_compare function rather
      than the function for binary comparison. 
      
      
      mysql-test/r/innodb_mysql.result:
        Added a test case for bug #25798.
      mysql-test/t/innodb_mysql.test:
        Added a test case for bug #25798.
      sql/filesort.cc:
        Fixed bug #25798.
        The function merge_buffers() when called from the Uniques::get method
        must use function buffpek_compare to compare elements in the queue it
        employs. The pointer to buffpek_compare and the info for the function
        that compares sorted records are passed to merge_buffers through certain 
        designated fields of the SORTPARAM structure.
      sql/sql_sort.h:
        Fixed bug #25798.
        Added fields to the SORTPARAM structure to be used in the function 
        merge_buffers when called by the Uniques::get method.
      sql/uniques.cc:
        Fixed bug 25798.
        The function merge_buffers() when called from the Uniques::get method
        must use function buffpek_compare to compare elements in the queue it
        employes.
      07dcc800
  4. 30 Jun, 2007 1 commit
  5. 29 Jun, 2007 7 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29205 · a89259fa
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      a89259fa
    • unknown's avatar
      Fixed bug #29205. · db397d16
      unknown authored
      When a UNION statement forced conversion of an UTF8
      charset value to a binary charset value, the byte
      length of the result values was truncated to the
      CHAR_LENGTH of the original UTF8 value.
      
      
      sql/item.cc:
        Fixed bug #29205.
        The calculation of data length was modified in
        the Item_type_holder::join_types method to take into
        account possible conversion of a multibyte charset
        value to a binary charset value, when each
        multibyte character is converted into a sequence
        of bytes (not to a single byte of binary charset).
      mysql-test/t/ctype_utf8.test:
        Updated test case for bug #29205.
      mysql-test/r/ctype_utf8.result:
        Updated test case for bug #29205.
      db397d16
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 6a00ce71
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/29261-bug-5.0-opt-mysql
      
      
      6a00ce71
    • unknown's avatar
      Bug#29261: Sort order of the collation wasn't used when comparing trailing · 4772a012
      unknown authored
      spaces.
      
      When the my_strnncollsp_simple function compares two strings and one is a prefix
      of another then this function compares characters in the rest of longer key
      with the space character to find whether the longer key is greater or less.
      But the sort order of the collation isn't used in this comparison. This may
      lead to a wrong comparison result, wrongly created index or wrong order of the
      result set of a query with the ORDER BY clause.
      
      Now the my_strnncollsp_simple function uses collation sort order to compare
      the characters in the rest of longer key with the space character.
      
      
      mysql-test/t/ctype_collate.test:
        Added a test case for the bug#29261: Sort order of the collation wasn't used
        when comparing trailing spaces.
      mysql-test/r/ctype_collate.result:
        Added a test case for the bug#29261: Sort order of the collation wasn't used
        when comparing trailing spaces.
      strings/ctype-simple.c:
        Bug#29261: Sort order of the collation wasn't used when comparing trailing
        spaces.
        Now the my_strnncollsp_simple function uses collation sort order to compare
        the characters in the rest of longer key with the space character.
      4772a012
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 33eb22a3
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B27333-gcov-5.0-opt
      
      
      33eb22a3
    • unknown's avatar
      Bug#27333: subquery grouped for aggregate of outer · c2e961cf
      unknown authored
      query / no aggregate of subquery
       The optimizer counts the aggregate functions that 
       appear as top level expressions (in all_fields) in 
       the current subquery. Later it makes a list of these
       that it uses to actually execute the aggregates in
       end_send_group().
       That count is used in several places as a flag whether
       there are aggregates functions.
       While collecting the above info it must not consider
       aggregates that are not aggregated in the current 
       context. It must treat them as normal expressions 
       instead. Not doing that leads to incorrect data about
       the query, e.g. running a query that actually has no
       aggregate functions as if it has some (and hence is
       expected to return only one row).
       Fixed by ignoring the aggregates that are not aggregated
       in the current context. 
       One other smaller omission discovered and fixed in the 
       process : the place of aggregation was not calculated for
       user defined functions. Fixed by calling 
       Item_sum::init_sum_func_check() and 
       Item_sum::check_sum_func() as it's done for the rest of 
       the aggregate functions.
      
      
      mysql-test/r/subselect.result:
        Bug #27333: test case
      mysql-test/t/subselect.test:
        Bug #27333: test case
      sql/item_subselect.cc:
        Bug#27333: need select_lex to filter out
         aggregates that are not aggregated in
         the current select.
      sql/item_sum.cc:
        Bug#27333: need select_lex to filter out
         aggregates that are not aggregated in
         the current select.
      sql/item_sum.h:
        Bug#27333: calculate the place of 
         aggregation for user defined functions.
      sql/sql_select.cc:
        Bug#27333: When counting the aggregated functions
         and collecting a list of them we must not consider
         the aggregates that are not aggregated in the local
         context as "local" : i.e. we must treat them as 
         normal functions and not add them to the aggregate
         functions list.
      sql/sql_select.h:
        Bug#27333: need select_lex to filter out
         aggregates that are not aggregated in
         the current select.
      c2e961cf
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 73023608
      unknown authored
      into  mysql.com:/home/hf/work/29247/my50-29247
      
      
      sql-common/client.c:
        Auto merged
      73023608
  6. 28 Jun, 2007 1 commit
  7. 27 Jun, 2007 2 commits
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 00b3d3c2
      unknown authored
      into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug28677
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      00b3d3c2
    • unknown's avatar
      Bug #26642: create index corrupts table definition in .frm · 0c31d0bb
      unknown authored
        
        Thanks to Martin Friebe for finding and submitting a fix for this bug!
        
        A table with maximum number of key segments and maximum length key name
        would have a corrupted .frm file, due to an incorrect calculation of the
        complete key length.  Now the key length is computed correctly (I hope) :-)
        
        MyISAM would reject a table with the maximum number of keys and the maximum
        number of key segments in all keys.  It would allow one less than this total
        maximum.  Now MyISAM accepts a table defined with the maximum.  (This is a
        very minor issue.)
      
      
      myisam/mi_open.c:
        Bug #26642: change >= to > in a comparison (i.e., error 
        only if key_parts_in_table really is greater than 
        MAX_KEY * MAX_KEY_SEG)
      mysql-test/r/create.result:
        Bug #26642: test case
      mysql-test/t/create.test:
        Bug #26642: test case
      sql/table.cc:
        Bug #26642: In create_frm(), fix formula for key_length; 
        it was too small by (keys * 2) bytes
      0c31d0bb
  8. 26 Jun, 2007 4 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 39ef7a53
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29087
      
      
      39ef7a53
    • unknown's avatar
      Fixed bug #29251. · 7fbf6303
      unknown authored
      Sometimes special 0 ENUM values was ALTERed to normal
      empty string ENUM values.
      
      Special 0 ENUM value has the same string representation
      as normal ENUM value defined as '' (empty string).
      The do_field_string function was used to convert
      ENUM data at an ALTER TABLE request, but this
      function doesn't care about numerical "indices" of
      ENUM values, i.e. do_field_string doesn't distinguish
      a special 0 value from an empty string value.
      
      A new copy function called do_field_enum has been added to
      copy special 0 ENUM values without conversion to an empty
      string.
      
      
      sql/field_conv.cc:
        Fixed bug #29251.
        The Copy_field::get_copy_func method has been modified to
        return a pointer to the do_field_enum function if a conversion
        between two columns of incompatible enum types is required.
        The do_field_enum function has been added for the correct
        conversion of special 0 enum values.
      mysql-test/t/type_enum.test:
        Updated test case for bug #29251.
      mysql-test/r/type_enum.result:
        Updated test case for bug #29251.
      7fbf6303
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 69f82e25
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B29154-5.0-opt
      
      
      69f82e25
    • unknown's avatar
      Fixed bug #29087. This bug manifested itself for queries that performed · 0127c1a3
      unknown authored
      a lookup into a BINARY index by a key ended with spaces. It caused
      an assertion abort for a debug version and wrong results for non-debug
      versions.
      
      The problem occurred because the function _mi_pack_key stripped off 
      the trailing spaces from binary search keys while the function _mi_make_key
      did not do it when keys were inserted into the index.
      
      Now the function _mi_pack_key does not remove the trailing spaces from
      search keys if they are of the binary type.
      
      
      mysql-test/r/binary.result:
        Added a test case for bug #29087.
      mysql-test/t/binary.test:
        Added a test case for bug #29087.
      0127c1a3
  9. 25 Jun, 2007 6 commits
    • unknown's avatar
      Bug #29247 Double free in libmysqlclient_r when mysql restarted. · 57444944
      unknown authored
      If one sets MYSQL_READ_DEFAULTS_FILE and MYSQL_READ_DEFAULT_GROUP options
      after mysql_real_connect() called with that MYSQL instance,
      these options will affect next mysql_reconnect then.
      As we use a copy of the original MYSQL object inside mysql_reconnect,
      and mysql_real_connect frees options.my_cnf_file and _group strings,
      we will free these twice when we execute mysql_reconnect with the
      same MYSQL for the second time.
      
      I don't think we should ever read defaults files handling mysql_reconnect.
      So i just set them to 0 for the temporary MYSQL object there/
      
      
      sql-common/client.c:
        Bug #29247 Double free in libmysqlclient_r when mysql restarted.
        
        we don't need mysql_real_connect to reread defaults file in this
        case, so set related parameters to zero
      57444944
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · 637d9f1c
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      637d9f1c
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · fb12c686
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      fb12c686
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1 · be684dc0
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/4.1-opt
      
      
      be684dc0
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 4ea2eb4a
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B29154-5.0-opt
      
      
      4ea2eb4a
    • unknown's avatar
      Bug #29154: LOCK TABLES is not atomic when >1 InnoDB tables are locked · 39459397
      unknown authored
        LOCK TABLES takes a list of tables to lock. It may lock several 
        tables successfully and then encounter a tables that it can't lock, 
        e.g. because it's locked. In such case it needs to undo the locks on
        the already locked tables. And it does that. But it has also notified
        the relevant table storage engine handlers that they should lock.
        The only reliable way to ensure that the table handlers will give up
        their locks is to end the transaction. This is what UNLOCK TABLE 
        does : it ends the transaction if there were locked tables by LOCK 
        tables.
        It is possible to end the transaction when the lock fails in 
        LOCK TABLES because LOCK TABLES ends the transaction at its start 
        already. 
        Fixed by ending (again) the transaction when LOCK TABLES fails to
        lock a table.
      
      
      mysql-test/r/innodb_mysql.result:
        Bug #29154: test case
      mysql-test/t/innodb_mysql.test:
        Bug #29154: test case
      sql/sql_parse.cc:
        Bug #29154: end the trasaction at a failing 
        LOCK TABLES so the handler can free its locks.
      39459397
  10. 24 Jun, 2007 3 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · f30db309
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25602
      
      
      sql/sql_select.cc:
        Auto merged
      f30db309
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · fec835f1
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      sql/log_event.cc:
        Auto merged
      fec835f1
    • unknown's avatar
      Fixed bug #25602. A query with DISTINCT in the select list to which · e009b764
      unknown authored
      the loose scan optimization for grouping queries was applied returned 
      a wrong result set when the query was used with the SQL_BIG_RESULT
      option.
      
      The SQL_BIG_RESULT option forces to use sorting algorithm for grouping
      queries instead of employing a suitable index. The current loose scan
      optimization is applied only for one table queries when the suitable
      index is covering. It does not make sense to use sort algorithm in this
      case. However the create_sort_index function does not take into account
      the possible choice of the loose scan to implement the DISTINCT operator
      which makes sorting unnecessary. Moreover the current implementation of
      the loose scan for queries with distinct assumes that sorting will
      never happen. Thus in this case create_sort_index should not call
      the function filesort.
      
      
      mysql-test/r/group_min_max.result:
        Added a test case for bug #25602.
      mysql-test/t/group_min_max.test:
        Added a test case for bug #25602.
      e009b764
  11. 23 Jun, 2007 3 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · b462e06e
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      b462e06e
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29095 · d37471b4
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      d37471b4
    • unknown's avatar
      Fixed bug #29095. · 1bab1ddc
      unknown authored
      INSERT into table from SELECT from the same table
      with ORDER BY and LIMIT was inserting other data
      than sole SELECT ... ORDER BY ... LIMIT returns.
      
      One part of the patch for bug #9676 improperly pushed
      LIMIT to temporary table in the presence of the ORDER BY
      clause.
      That part has been removed.
      
      
      sql/sql_select.cc:
        Fixed bug #29095.
        One part of the patch for bug #9676 improperly pushed
        LIMIT to temporary table in the presence of the ORDER BY
        clause.
        That part has been removed.
      mysql-test/t/insert_select.test:
        Expanded the test case for bug #9676.
        Created a test case for bug #29095.
      mysql-test/r/insert_select.result:
        Expanded the test case for bug #9676.
        Created a test case for bug #29095.
      1bab1ddc
  12. 22 Jun, 2007 3 commits