1. 17 Feb, 2011 9 commits
    • Vasil Dimov's avatar
      d679c397
    • Vasil Dimov's avatar
      Merge mysql-5.1 -> mysql-5.5 (empty) · 3f6d6230
      Vasil Dimov authored
      3f6d6230
    • Vasil Dimov's avatar
      Merge mysql-5.5-innodb -> mysql-5.5 · 60a84072
      Vasil Dimov authored
      60a84072
    • Vasil Dimov's avatar
      Merge mysql-5.1-innodb -> mysql-5.1 · 0a3e7beb
      Vasil Dimov authored
      0a3e7beb
    • Magne Mahre's avatar
      Merge from 5.1 · 2a345659
      Magne Mahre authored
      2a345659
    • Magne Mahre's avatar
      Bug#48053 String::c_ptr has a race and/or does an invalid · f2a42aee
      Magne Mahre authored
                memory reference
      
      There are two issues present here.
        1) There is a possibility that we test a byte beyond the
           allocated buffer
      
        2) We compare a byte that might never have been
           initalized to see if it's 0.
      
      The first issue is not triggered by existing code, but an
      ASSERT has been added to safe-guard against introducing
      new code that triggers it.
      
      The second issue is what triggers the Valgrind warnings
      reported in the bug report. A buffer is allocated in
      class String to hold the value. This buffer is populated
      by the character data constituting the string, but is not
      zero-terminated in most cases.  Testing if it is indeed
      zero-terminated means that we check a byte that has never
      been explicitly set, thus causing Valgrind to trigger.
      
      Note that issue 2 is not a serious problem.  The variable
      is read, and if it's not zero, we will set it to zero.
      There are no further consequences.
      
      Note that this patch does not fix the underlying problems
      with issue 1, as it is deemed too risky to fix at this
      point (as noted in the bug report).  As discussed in
      the report, the c_ptr() method should probably be
      replaced, but this requires a thorough analysis of the
      ~200 calls to the method.
      f2a42aee
    • Marko Mäkelä's avatar
      778e700d
    • Marko Mäkelä's avatar
    • Tor Didriksen's avatar
      Disable this test when running 'mtr --mem' · 26077d8d
      Tor Didriksen authored
      With --mem if fails with
      +UNEXPECTED ERROR NUMBER: 1290
      
      In var/log/mysqld.2.err we have:
      [ERROR] LOAD DATA INFILE in the slave SQL Thread can only read from --slave-load-tmpdir. Please, report a bug.
      [ERROR] Slave SQL: Error 'The MySQL server is running with the --slave-load-tmpdir option so it cannot execute this statement' on query. Default database: 'test'. Query: 'LOAD DATA INFILE '../../tmp/SQL_LOAD-2-1-1.data' INTO  TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, `b`)', Error_code: 1290
      
      getcwd() in the server yields something like: /dev/shm/var_auto_iv5Q/mysqld.2/data
      26077d8d
  2. 16 Feb, 2011 15 commits
  3. 15 Feb, 2011 9 commits
  4. 14 Feb, 2011 4 commits
    • Joerg Bruehe's avatar
      Merge bug fix 42969 into main 5.5 branch. · 0dab3360
      Joerg Bruehe authored
      0dab3360
    • Jon Olav Hauglid's avatar
      Bug #11766788 (former bug 59986) · 6688a4f2
      Jon Olav Hauglid authored
      Assert in Diagnostics_area::set_ok_status() for XA COMMIT
      
      This assert was triggered if XA COMMIT was issued when an XA transaction
      already had encountered an error (e.g. a deadlock) which required
      the XA transaction to be rolled back.
      
      In general, the assert is triggered if a statement tries to send OK to
      the client when an error has already been reported. It was triggered
      in this case because the trans_xa_commit() function first reported an
      error, then rolled back the transaction and finally returned FALSE,
      indicating success. Since trans_xa_commit() reported success,
      mysql_execute_command() tried to report OK, triggering the assert.
      
      This patch fixes the problem by fixing trans_xa_commit() to return TRUE
      if it encounters an error that requires rollback, even if the rollback
      itself is successful.
      
      Test case added to xa.test.
      6688a4f2
    • Jimmy Yang's avatar
      8586497e
    • Jimmy Yang's avatar
      Fix Bug #59749 Enabling concurrent reads while creating non-primary unique · d06bb27f
      Jimmy Yang authored
      index gives failures.
      
      Approved by Marko
      d06bb27f
  5. 11 Feb, 2011 3 commits
    • Joerg Bruehe's avatar
      Fix bug#42969 Please add a MANIFEST to each build · fd21e07d
      Joerg Bruehe authored
      With this change, there will be new files "INFO_SRC"
      and "INFO_BIN", which describe the source and the
      binaries.
      They will be contained in all packages:
      - in "tar.gz" and derived packages, in "docs/",
      - in RPMs, in "/usr/share/doc/packages/MySQL-server".
      
      "INFO_SRC" is also part of a source tarball.
      It gives the version as exact as possible, preferably
      by calling "bzr version-info" on the source tree.
      If that is not possible, it just contains the three
      level version number.
      
      "INFO_BIN" contains some info when and where the
      binaries were built, the options given to the compiler,
      and the flags controlling the included features.
      
      The tests (test "mysql" in the main suite) are extended
      to verify the existence of both "INFO_SRC" and "INFO_BIN",
      as well as some of the expected contents.
      fd21e07d
    • Georgi Kodinov's avatar
      bumped up the version to 5.1.11 · 7c5ae44e
      Georgi Kodinov authored
      7c5ae44e
    • Georgi Kodinov's avatar
      version bump to 5.1.57 · 56bca19e
      Georgi Kodinov authored
      56bca19e