1. 21 Nov, 2009 4 commits
    • Alexey Kopytov's avatar
      Merged from mysql-next-mr-bugfixing. · 8c1dfab3
      Alexey Kopytov authored
      Updated the result file for func_math.
      8c1dfab3
    • He Zhenxing's avatar
      Post fix for previous patch of bug#37148 · 23da26eb
      He Zhenxing authored
      sql/sql_table.cc:
        Add the missing return 0
      23da26eb
    • He Zhenxing's avatar
      Auto merge · b9268fc8
      He Zhenxing authored
      b9268fc8
    • He Zhenxing's avatar
      BUG#37148 Most callers of mysql_bin_log.write ignore the return result · dd383cad
      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
      dd383cad
  2. 20 Nov, 2009 3 commits
    • Konstantin Osipov's avatar
      Merge with next-mr · 34b11fb6
      Konstantin Osipov authored
      34b11fb6
    • Martin Hansson's avatar
      merge of Bug#33204 (backport) · 3937a798
      Martin Hansson authored
      3937a798
    • Mattias Jonsson's avatar
      Bug#32115: Bad use of Name_resolution_context from current LEX in partitioning · d8d8efc8
      Mattias Jonsson authored
      port from mysql-next (5.4?) to mysql-next-mr-bugfixes (5.5/5.6?)
      
      3477 Mikael Ronstrom	2009-07-29
      Bug#32115, made use of local lex object to avoid side effects of opening partitioned
      tables
      
      3478 Mikael Ronstrom	2009-07-29
      Bug#32115, added an extra test in debug builds to ensure no dangling pointers to the
      old lex object is still around
      
      3479 Mikael Ronstrom	2009-07-29
      Bug#32115, Removed an assert that was no longer needed
      
      3480 Mikael Ronstrom	2009-08-05
      Bug#32115, fixed review comments
      
      3481 Mikael Ronstrom	2009-08-07
      Bug#32115, remove now obsolete lex_start calls
      d8d8efc8
  3. 19 Nov, 2009 2 commits
  4. 18 Nov, 2009 1 commit
    • Guilhem Bichot's avatar
      Backport of the fix for BUG#40368 "mysqld_safe not honouring underscore same... · 27fca0ab
      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.
      27fca0ab
  5. 17 Nov, 2009 3 commits
  6. 15 Nov, 2009 1 commit
  7. 13 Nov, 2009 1 commit
    • Davi Arnaut's avatar
      Post-merge fixes for backports. · 5128b54c
      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.
      5128b54c
  8. 12 Nov, 2009 10 commits
  9. 11 Nov, 2009 13 commits
  10. 10 Nov, 2009 2 commits
    • Alexey Botchkov's avatar
      Bug #47139 Test "merge" crashes in "embedded" run · c868e89f
      Alexey Botchkov authored
        In fact this crashes in normal (not embedded) run also.
        The problem is in the memory mapping. Handling the ha_myisammrg::extra(MMAP)
        the MERGE engine tries to mmap all the tables it unites.
        Though some can be empty and then in the mi_dynmap_file()
        we call the my_mmap(0). Normally this call returns MAP_FAILED,
        but not on FreeBSD. There it returns like a 'normal' value,
        and after the consequitive munmap systems gets unstable and
        crashes on some system call later.
      
      per-file comments:
        storage/myisam/mi_dynrec.c
      Bug #47139      Test "merge" crashes in "embedded" run
          don't try to mmap zero-length area, just return at once.
      c868e89f
    • Alexey Botchkov's avatar
      Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8 · 6388a132
      Alexey Botchkov authored
         The additional patch. That 'loadxml.test' failure was actually about our testing system,
         not the code.
         Firstly we need a new mysqltest command, wich i called 'send_eval'. So the expression
         can be evaluated, then started in a parallel thread. We only have separane 'send' and
         'eval' commands at the moment.
         Then we need to add the waiting code after the 'KILL' to our test, so the thread will be killed
         before the test goes further. The present 'reap' command doesn't handle the killed threads
         well.
            
      per-file comments:
        client/mysqltest.cc
      Bug#42520      killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8
          The 'send_eval' command implemented.
      
        mysql-test/r/loadxml.result
      Bug#42520      killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8
         test result updated.
      
        mysql-test/t/loadxml.test
      Bug#42520      killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8
         test case added.
      6388a132