1. 08 Jul, 2007 1 commit
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 8fa708b7
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
      
      
      sql/field.cc:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        Manual merge
      sql/item_create.cc:
        Manual merge
      mysql-test/t/type_newdecimal.test:
        Manual merge.
      8fa708b7
  2. 07 Jul, 2007 4 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 3c2eb9ec
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29417
      
      
      mysql-test/r/type_newdecimal.result:
        Manual merge.
      mysql-test/t/type_newdecimal.test:
        Manual merge.
      3c2eb9ec
    • unknown's avatar
      Fixed bug #29417. · 578d9721
      unknown authored
      An assertion abort could occur for some grouping queries that employed 
      decimal user variables with assignments to them.
      
      The problem appeared the constructors of the class Field_new_decimal
      because the function my_decimal_length_to_precision did not guarantee
      returning decimal precision not greater than DECIMAL_MAX_PRECISION.
      
      
      mysql-test/r/type_newdecimal.result:
        Added a test case for bug #29417.
      mysql-test/t/type_newdecimal.test:
        Added a test case for bug #29417.
      sql/field.cc:
        Fixed bug #29417.
        An assertion abort could occur for some grouping queries that employed 
        decimal user variables with assignments to them.
        
        The problem appeared the constructors of the class Field_new_decimal
        because the function my_decimal_length_to_precision did not guarantee
        returning decimal precision not greater than DECIMAL_MAX_PRECISION.
        
        Now if the precision returned by calls to my_decimal_length_to_precision
        in the constructors of the class Field_new_decimal is greater than 
        DECIMAL_MAX_PRECISION the precision is set to this value.
      578d9721
    • unknown's avatar
      Fixed bug #29415. · 5e401735
      unknown authored
      The cast operation ignored the cases when the precision and/or the scale exceeded
      the limits, 65 and 30 respectively. No errors were reported in these cases.
      For some queries this may lead to an assertion abort.
      
      Fixed by throwing errors for such cases.
      
      
      mysql-test/r/type_newdecimal.result:
        Added a test case for bug #29415.
      mysql-test/t/type_newdecimal.test:
        Added a test case for bug #29415.
      5e401735
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 5a040380
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/loaddata.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/spatial.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/r/loaddata.result:
        Merge with 5.0-opt.
      mysql-test/t/view.test:
        Merge with 5.0-opt.
      5a040380
  3. 06 Jul, 2007 1 commit
  4. 05 Jul, 2007 4 commits
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a22ddbf1
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      a22ddbf1
    • unknown's avatar
      Fixed bug #29442. · bed05531
      unknown authored
      The SELECT INTO OUTFILE FIELDS ENCLOSED BY digit or minus sign,
      followed by the same LOAD DATA INFILE statement, used wrond encoding
      of non-string fields contained the enclosed character in their text
      representation.
      
      Example:
        SELECT 15, 9 INTO OUTFILE 'text' FIELDS ENCLOSED BY '5';
      
      Old encoded result in the text file:
        5155 595
               ^ was decoded as the 1st enclosing character of the 2nd field;
              ^ was skipped as garbage;
        ^    ^ was decoded as a pair of englosing characters of the 1st field;
            ^   was decoded as traling space of the first field;
          ^^ was decoded as a doubled enclosed character.
      
      New encoded result in the text file:
        51\55 595
        ^   ^ pair of enclosing characters of the 1st field;
          ^^ escaped enclosed character.
      
      
      
      sql/sql_class.h:
        Fixed bug #29442.
        The NUMERIC_CHARS macro constant has been defined to enumerate
        all possible characters of a numeric value text representation.
        The select_export::is_unsafe_field_sep boolean flag has been added
        to apply the encoding algorithm to non-string values when it is
        necessary.
      sql/sql_class.cc:
        Fixed bug #29442.
        The select_export::send_data method has been modified to encode text
        representation of fields of all data types like string fields.
      mysql-test/t/loaddata.test:
        Updated test case for bug #29442.
      mysql-test/r/loaddata.result:
        Updated test case for bug #29442.
      bed05531
    • unknown's avatar
      Bug #29166: · 61d616dd
      unknown authored
      AsText() needs to know the maximum number of
      characters a IEEE double precision value can
      occupy to make sure there's enough buffer space.
      The number was too small to hold all possible
      values and this caused buffer overruns.
      Fixed by correcting the calculation of the 
      maximum digits in a string representation of an
      IEEE double precision value as printed by 
      String::qs_append(double).
      
      
      mysql-test/r/gis.result:
        Bug #29166: test case
      mysql-test/t/gis.test:
        Bug #29166: test case
      sql/spatial.cc:
        Bug #29166: correct calculation of the maximum digits in
        a string representation of a double
      61d616dd
    • unknown's avatar
      Fixed bug #29392. · b7f5b7b0
      unknown authored
      This bug may manifest itself for select queries over a multi-table view
      that includes an ORDER BY clause in its definition. If the select list of 
      the query contains references to the same view column with different
      aliases the names of the columns in the result output will be nevertheless
      the same, coinciding with one of the alias.
      
      The bug happened because the method Item_ref::get_tmp_table_item that
      was inherited by the class Item_direct_view_ref ignored the fact that
      the name of the view column reference must be inherited by the fields
      of the temporary table that was created in order to get the result rows
      sorted.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #29392.
      mysql-test/t/view.test:
        Added a test case for bug #29392.
      sql/item.h:
        Fixed bug #29392.
        This bug may manifest itself for select queries over a multi-table view
        that includes an ORDER BY clause in its definition. If the select list of 
        the query contains references to the same view column with different
        aliases the names of the columns in the result output will be nevertheless
        the same, coinciding with one of the alias.
        
        The bug happened because the method Item_ref::get_tmp_table_item that
        was inherited by the class Item_direct_view_ref ignored the fact that
        the name of the view column reference must be inherited by the fields
        of the temporary table that was created in order to get the result rows
        sorted.
        
        Fixed by providing a proper implementation of the get_tmp_table_item 
        method for the Item_direct_view_ref class.
      b7f5b7b0
  5. 04 Jul, 2007 7 commits
  6. 03 Jul, 2007 14 commits
    • unknown's avatar
      loaddata.result, loaddata.test: · 3d974217
      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.
      3d974217
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · d8c60b95
      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.
      d8c60b95
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 2cfb62a2
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/4.1-opt
      
      2cfb62a2
    • unknown's avatar
      loaddata.result, loaddata.test: · c30e513b
      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.
      c30e513b
    • unknown's avatar
      sql_class.cc: · a4c295f3
      unknown authored
        Windows compilation error fix.
      
      
      sql/sql_class.cc:
        Windows compilation error fix.
      a4c295f3
    • unknown's avatar
      Fixed bug #29294. · 36bb14d6
      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.
      36bb14d6
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 8a09b19c
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
      
      
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      8a09b19c
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27345 · 60346d19
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
      
      
      strings/ctype-uca.c:
        Auto merged
      strings/ctype-mb.c:
        After merge fix.
      strings/ctype-ucs2.c:
        After merge fix.
      60346d19
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 482b7444
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27345
      
      482b7444
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b94c9fa8
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28983-2-5.0-opt
      
      b94c9fa8
    • unknown's avatar
      Bug #28983: 'reset master' in multiple threads and innodb tables · 545cb426
      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
      545cb426
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · f19dec39
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      f19dec39
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 45b76315
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      45b76315
    • unknown's avatar
      ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0) · 6fa046d1
      unknown authored
        Not very clever fix for DIH incorrect REDO handling
        - Dont report GCP_SAVE_CONF until first LCP has been complete during NR
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Not very clever fix for DIH incorrect REDO handling
          - Dont report GCP_SAVE_CONF until first LCP has been complete during NR
      6fa046d1
  7. 02 Jul, 2007 9 commits