1. 25 Nov, 2009 1 commit
  2. 23 Nov, 2009 3 commits
  3. 21 Nov, 2009 5 commits
    • Alexey Kopytov's avatar
      Backport of the fix for bug #33969: Updating a text field via a · 031e01b8
      Alexey Kopytov authored
      left join 
      
      When creating a temporary TEXT/BLOB field from an Item in
      Item::make_string_field(), the field's type was unconditionally
      set to the one corresponding to the maximum length (i.e.
      LONGTEXT/ LONGBLOB). This resulted in problems when exactly the
      same TEXT/BLOB is type required in cases like CREATE ... SELECT
      or creating internal temporary tables for joins. 
      
      Fixed by calling a different constructor for Field_blob so that
      an appropriate type is used depending on the Item's max_length
      value.
      031e01b8
    • Alexey Kopytov's avatar
      Merged from mysql-next-mr-bugfixing. · 8fe704cf
      Alexey Kopytov authored
      Updated the result file for func_math.
      8fe704cf
    • He Zhenxing's avatar
      Post fix for previous patch of bug#37148 · 00939c9b
      He Zhenxing authored
      sql/sql_table.cc:
        Add the missing return 0
      00939c9b
    • He Zhenxing's avatar
      Auto merge · c2292892
      He Zhenxing authored
      c2292892
    • He Zhenxing's avatar
      BUG#37148 Most callers of mysql_bin_log.write ignore the return result · 12672912
      He Zhenxing authored
      This is the non-ndb part of the patch.
      
      The return value of mysql_bin_log.write was ignored by most callers,
      which may lead to inconsistent on master and slave if the transaction
      was committed while the binlog was not correctly written. If
      my_error() is call in mysql_bin_log.write, this could also lead to
      assertion issue if my_ok() or my_error() is called after.
      
      This fixed the problem by let the caller to check and handle the
      return value of mysql_bin_log.write. This patch only adresses the
      simple cases.
      
      
      mysql-test/include/binlog_inject_error.inc:
        inject binlog write error when doing a query
      mysql-test/suite/binlog/t/binlog_write_error.test:
        Simple test case to check if proper error is reported when injecting binlog write errors.
      sql/events.cc:
        check return value of mysql_bin_log.write
      sql/log.cc:
        check return value of mysql_bin_log.write
      sql/log_event.cc:
        check return value of mysql_bin_log.write
      sql/log_event_old.cc:
        check return value of mysql_bin_log.write
      sql/mysql_priv.h:
        Change write_bin_log to return int instead of void
      sql/rpl_injector.cc:
        check return value of writing binlog
      sql/sp.cc:
        check return value of writing binlog
      sql/sp_head.cc:
        return 1 if writing binlog failed
      sql/sql_acl.cc:
        check return value of writing binlog
      sql/sql_base.cc:
        check return value of writing binlog
      sql/sql_class.h:
        Change binlog_show_create_table to return int
      sql/sql_db.cc:
        Change write_to_binlog to return int
        check return value of writing binlog
      sql/sql_delete.cc:
        check return value of writing binlog
      sql/sql_insert.cc:
        check return value of writing binlog
      sql/sql_load.cc:
        check return value of writing binlog
      sql/sql_parse.cc:
        check return value of writing binlog
      sql/sql_partition.cc:
        check return value of writing binlog
      sql/sql_rename.cc:
        check return value of writing binlog
      sql/sql_repl.cc:
        check return value of writing binlog
      sql/sql_table.cc:
        Change write_bin_log to return int, and return 1 if there was error writing binlog
      sql/sql_tablespace.cc:
        check return value of writing binlog
      sql/sql_trigger.cc:
        check return value of writing binlog
      sql/sql_udf.cc:
        check return value of writing binlog
      sql/sql_update.cc:
        check return value of writing binlog
      sql/sql_view.cc:
        check return value of writing binlog
      12672912
  4. 20 Nov, 2009 4 commits
  5. 19 Nov, 2009 2 commits
  6. 18 Nov, 2009 5 commits
    • Guilhem Bichot's avatar
      Backport of the fix for BUG#40368 "mysqld_safe not honouring underscore same... · 3cf417c0
      Guilhem Bichot authored
      Backport of the fix for BUG#40368 "mysqld_safe not honouring underscore same as dash on server options" from 6.0
      (revision-id:guilhem@mysql.com-20090505113602-l12kxupeatve18dh).
      Such bug led "mysqld_safe --core_file_size=#" to not work because mysqld_safe wouldn't recognize
      that "ulimit -c" is needed; only --core-file-size=# worked. Same for --open_files_limit and other
      options with _ where mysqld_safe needs to do something more than passing to mysqld.
      Original fix by Erik Ljungstrom erik at ibiblio dot org ; slightly modified here.
      Tested on all internally accessible Unix.
      3cf417c0
    • Marc Alff's avatar
      Port the unit test framework to windows · a0345b23
      Marc Alff authored
      Backport from 6.0.14 to 5.6.0
      
      Original code from Guilhem Bichot
      a0345b23
    • Marc Alff's avatar
      WL#3230 concurrent hash · fdfe0ce0
      Marc Alff authored
      Backport from 6.0.14 to 5.6.0
      
      Original code from Sergei Golubchik
      fdfe0ce0
    • Marc Alff's avatar
      Misc cleanup · a69ab738
      Marc Alff authored
      a69ab738
    • Marc Alff's avatar
      WL#2595 kernel-independent atomic operations · 7e1a54f7
      Marc Alff authored
      Backport from 6.0.14 to 5.6.0
      
      Original code from Sergei Golubchik
      7e1a54f7
  7. 17 Nov, 2009 3 commits
  8. 16 Nov, 2009 2 commits
  9. 15 Nov, 2009 1 commit
  10. 13 Nov, 2009 1 commit
    • Davi Arnaut's avatar
      Post-merge fixes for backports. · ee120da6
      Davi Arnaut authored
      mysql-test/r/sp-error.result:
        Update test case result.
      mysql-test/t/dirty_close.test:
        Dirty close does not work under embedded.
      mysql-test/t/sp-error.test:
        Use the specific error number so it won't catch
        other non-fatal errors.
      ee120da6
  11. 12 Nov, 2009 10 commits
  12. 11 Nov, 2009 3 commits
    • Magne Mahre's avatar
      Bug#40700: aclocal warnings for missing cache-id's · e8ad413e
      Magne Mahre authored
            
      Just change mysql_foo to mysql_cv_foo for one cache-id variable name.  There
      was only one bad variable name, present in 5.0 and 5.1, but not in the -pe
      branch.
      
      
      Backported to 5.6.0  (mysql-next-mr-runtime)
      
      e8ad413e
    • Magne Mahre's avatar
      Bug #33544 UDF_INIT member decimals initialized wrong with · e625d328
      Magne Mahre authored
                 STRING_RESULT argument
      
      There is a "magic" number for precision : NOT_FIXED_DEC. 
      This means that the precision is not a fixed number.
      But this constant was re-defined in several files and 
      was not available to the UDF developers.
       
      Moved the NOT_FIXED_DEC definition to the correct header
      and removed the redundant definitions.
      
      Backported to 5.6.0  (mysql-next-mr-runtime)
      
      client/sql_string.h:
        moved NOT_FIXED_DEC to the correct header
      include/mysql_com.h:
        moved NOT_FIXED_DEC to the correct header
      libmysql/libmysql.c:
        moved NOT_FIXED_DEC to the correct header
      sql/field.h:
        moved NOT_FIXED_DEC to the correct header
      sql/sql_string.h:
        moved NOT_FIXED_DEC to the correct header
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        moved NOT_FIXED_DEC to the correct header
      e625d328
    • Magne Mahre's avatar
      Bug #37097 mysqltest add result file format version 2 · 3c775a0e
      Magne Mahre authored
      Add result file format v2
      
      Backport to 5.6.0   
      
      3c775a0e