1. 29 Sep, 2009 2 commits
  2. 26 Sep, 2009 1 commit
  3. 25 Sep, 2009 4 commits
    • unknown's avatar
      Fix some test failures found during RPM package building: · faaace2f
      unknown authored
       - mysqlslap result file update after merge.
       - Fix skipping certain tests when running test suite as root, got broken somehow.
      
      mysql-test/mysql-test-run.pl:
        Somehow skipping tests when running as root got broken. The mysqltest if() no longer seems
        to accept YES as a true value, so use 1 for true value instead.
      mysql-test/r/mysqlslap.result:
        Result file update after change in engine behaviour of mysqlslap.
      mysql-test/t/mysqld_option_err.test:
        This test does not work when run as root.
      faaace2f
    • unknown's avatar
      Merge MySQL-5.1.38 and XtraDB-7 into MariaDB. · 44718ad4
      unknown authored
      Merge Percona microsec_process patch.
      Includes lots of after-merge fixes, Windows fixes, and other misc. small fixes.
      44718ad4
    • Igor Babaev's avatar
      Merge · 9c6ad3d0
      Igor Babaev authored
      9c6ad3d0
    • Igor Babaev's avatar
      Took care of mysql test suite failures on Windows. · d210e5fd
      Igor Babaev authored
      mysql-test/suite/rpl/t/rpl_binlog_corruption.test:
        Disabled the test for Windows (see bug #47639)
      mysql-test/suite/rpl/t/rpl_killed_ddl.test:
        Disabled the test for Windows (see bug #47638)
      vio/viosocket.c:
        Added an implementation of vio_poll_read for Windows.
        Winsock does not support the poll function.
        So the existing generic implementation of vio_poll_read
        could not be used for Windows.
      d210e5fd
  4. 24 Sep, 2009 2 commits
  5. 23 Sep, 2009 1 commit
    • unknown's avatar
      Merge Percona microsec_process patch into MariaDB. · e16081e1
      unknown authored
      This adds a TIME_MS column to SHOW FULL PROCESSLIST and
      INFORMATION_SCHEMA.PROCESSLIST that works like the TIME column, but
      in units of milliseconds with microsecond precision.
      
      Note that this also changes behaviour of the existing TIME column. In
      the MySQL server, the TIME column changes when a thread sets @TIMESTAMP.
      This is contrary to documentation and also potentially confusing, so
      could in any case be considered a bug. With this patch, to ensure
      consistency between TIME and TIME_MS, setting @TIMESTAMP has no effect
      on either value.
      
      Add a test case for the TIME and TIME_MS columns.
      Update existing test cases for changed behaviour.
      
      Author: Percona
      Signed-off-by: default avatarKristian Nielsen <knielsen@knielsen-hq.org>
      
      
      mysql-test/r/create.result:
        Result file update.
      mysql-test/r/information_schema.result:
        Add test case.
        Result file update (changed behaviour).
      mysql-test/t/information_schema.test:
        Add test case.
        Adjust test case for changed behaviour.
      mysql-test/t/not_embedded_server.test:
        Update (commented-out) test case for newly added column.
      sql/sql_show.cc:
        Merge Percona microsec_process patch into MariaDB.
      e16081e1
  6. 20 Sep, 2009 1 commit
  7. 19 Sep, 2009 2 commits
  8. 18 Sep, 2009 8 commits
    • Hakan Kuecuekyilmaz's avatar
      Merge. · 824c6d1c
      Hakan Kuecuekyilmaz authored
      824c6d1c
    • Igor Babaev's avatar
      Made innodb_xtradb_bug317074.test to be a 'big' test · 6811136c
      Igor Babaev authored
      to avoid a timeout failure of it on Windows. 
      6811136c
    • Igor Babaev's avatar
      Applied the fix for bug #46931 from mysql-5.1 main trunk · c78dad15
      Igor Babaev authored
      to fix a failure in rpl_get_master_version_and_clock.test
      c78dad15
    • Hakan Kuecuekyilmaz's avatar
      Merge. · 6cf15d08
      Hakan Kuecuekyilmaz authored
      6cf15d08
    • Hakan Kuecuekyilmaz's avatar
      Fix for · 1ee2d817
      Hakan Kuecuekyilmaz authored
          mysqlslap: setting --engine does not get replicated
          http://bugs.mysql.com/bug.php?id=46967
      
      and
          mysqlslap: specifying --engine and --create does not
          work with --engine=<storage_engine>:<option>
          https://bugs.launchpad.net/maria/+bug/429773
      
      Problems were that an --engine=<storage_engine> was translated
      to a "set storage_engine = <storage_engine>", wich is _not_
      replicated. A --engine=<storage_engine>:<option> was not always
      properly parsed and in some cases crashed.
      
      Fixed by eliminating "set storage_engine = ..." and adding
      proper DDL generation. Initialized an unitialized buffer to
      prevent crashes and fixed to use proper pointer for in
      case of --engine=<storage_engine>:<option> being the last
      element in list of --engines.
      
      Also cleaned up code for better readability.
      
      Q: Should MySQL's replication actually replicate a
         "set storage_engine = ..." command or not?
      A: No it should not. It is documented here:
         http://dev.mysql.com/doc/refman/5.1/en/replication-features-variables.html
         ...
         "The storage_engine system variable is not replicated, which is a
         good thing for replication between different storage engines." ...
      
      Before the patch, mysqlslap was behaving this way:
      
      +-------------------------------+--------+-------------+
      |                               | single | replication |
      +-------------------------------+--------+-------------+
      | Before patch                                         | 
      +-------------------------------+--------+-------------+
      | --engine[1]                                          |
      +-----+-------------------------+--------+-------------+
      | 1.1 | eng1                    |  OK    |   Not OK    |
      | 1.2 | eng1,eng2               |  OK    |   Not OK    |
      | 1.3 | eng1,eng2,eng3          |  OK    |   Not OK    |
      | 1.4 | memory:option           |  OK    |   Not OK    |
      | 1.5 | memory:option,eng1      |  OK    |   Not OK    |
      | 1.6 | eng1,memory:option      | Not OK |   Not OK    |
      | 1.7 | memory:option,eng1,eng2 | Crash  |   Not OK    |
      | 1.8 | eng1,memory:option,eng2 |  OK    |   Not OK    |
      | 1.9 | eng1,eng2,memory:option | Not OK |   Not OK    |
      +-----+-------------------------+--------+-------------+
      +-------------------------------+--------+-------------+
      | --create --engine[2]                                 |
      +-----+-------------------------+--------+-------------+
      | 2.1 | eng1                    |  OK    |   Not OK    |
      | 2.2 | eng1,eng2               |  OK    |   Not OK    |
      | 2.3 | eng1,eng2,eng3          |  OK    |   Not OK    |
      | 2.4 | memory:option           | Not OK |   Not OK    |
      | 2.5 | memory:option,eng1      | Not OK |   Not OK    |
      | 2.6 | eng1,memory:option      | Not OK |   Not OK    |
      | 2.7 | memory:option,eng1,eng2 | Crash  |   Not OK    |
      | 2.8 | eng1,memory:option,eng2 | Not OK |   Not OK    |
      | 2.9 | eng1,eng2,memory:option | Not OK |   Not OK    |
      +-----+-------------------------+--------+-------------+
      
      After my final patch, mysqlslap now runs like this:
      
      +-------------------------------+--------+-------------+
      |                               | single | replication |
      +-------------------------------+--------+-------------+
      | After third patch                                    | 
      +-------------------------------+--------+-------------+
      | --engine[1]                                          |
      +-----+-------------------------+--------+-------------+
      | 1.1 | eng1                    |  OK    |  OK         |
      | 1.2 | eng1,eng2               |  OK    |  OK         |
      | 1.3 | eng1,eng2,eng3          |  OK    |  OK         |
      | 1.4 | memory:option           |  OK    |  OK         |
      | 1.5 | memory:option,eng1      |  OK    |  OK         |
      | 1.6 | eng1,memory:option      |  OK    |  OK         |
      | 1.7 | memory:option,eng1,eng2 |  OK    |  OK         |
      | 1.8 | eng1,memory:option,eng2 |  OK    |  OK         |
      | 1.9 | eng1,eng2,memory:option |  OK    |  OK         |
      +-----+-------------------------+--------+-------------+
      +-------------------------------+--------+-------------+
      | --create --engine[2]                                 |
      +-----+-------------------------+--------+-------------+
      | 2.1 | eng1                    |  OK    |  OK         |
      | 2.2 | eng1,eng2               |  OK    |  OK         |
      | 2.3 | eng1,eng2,eng3          |  OK    |  OK         |
      | 2.4 | memory:option           |  OK    |  OK         |
      | 2.5 | memory:option,eng1      |  OK    |  OK         |
      | 2.6 | eng1,memory:option      |  OK    |  OK         |
      | 2.7 | memory:option,eng1,eng2 |  OK    |  OK         |
      | 2.8 | eng1,memory:option,eng2 |  OK    |  OK         |
      | 2.9 | eng1,eng2,memory:option |  OK    |  OK         |
      +-----+-------------------------+--------+-------------+
      1ee2d817
    • Sergey Petrunya's avatar
      Gcov support improvements · 6e0da275
      Sergey Petrunya authored
      - address review feedback (cleaner perl code)
      
      6e0da275
    • Sergey Petrunya's avatar
      A change of direction for fix 10 csets ago: · 55298d1b
      Sergey Petrunya authored
      - When the table is created with an attribute that is not supported by
        the storage engine, the attribute ought to be still kept.
      
      55298d1b
    • Sergey Petrunya's avatar
      Fix mysql-test-run on windows: · bb2b8592
      Sergey Petrunya authored
      Make it not to add '--console' when '--log-error' option is present
      - Review feedback
      
      bb2b8592
  9. 17 Sep, 2009 3 commits
  10. 16 Sep, 2009 8 commits
  11. 15 Sep, 2009 8 commits
    • Sergey Petrunya's avatar
      MySQL 5.1 -> Maria 5.1 merge: Fix windows build · 3d60f05f
      Sergey Petrunya authored
      - Fix XtraDB to be built as a static library.
      
      storage/xtradb/buf/buf0flu.c:
        Fix previous merge error (was harmless except for on win32)
      storage/xtradb/plug.in:
        Make it sync with innobase/plug.in.disabled
      3d60f05f
    • unknown's avatar
      More after-merge fixes for merging MySQL 5.1.38 into MariaDB. · e8d7e27f
      unknown authored
      
      mysql-test/t/mysqldump.test:
        Make test case work when build directory is not world readable
        (this is the case for Buildbot checkouts).
      mysys/my_getopt.c:
        Restore bugfix which was lost in previous merge.
      storage/xtradb/buf/buf0flu.c:
        Fix extranous line caused by bad merge.
      e8d7e27f
    • unknown's avatar
      MySQL 5.1.38 merge into MariaDB. · 2a4c97fc
      unknown authored
      Merge remaining bits of mysql-5.1.38 into MariaDB (9 commits were missing
      from the original merge).
      2a4c97fc
    • unknown's avatar
      More after-merge fixes for MySQL 5.1.38 merge. · 85c97f96
      unknown authored
      Fix version number (we are based on 5.1.38, not 5.1.39).
      Fix mistaken translation in error message.
      85c97f96
    • Sergey Petrunya's avatar
      · 7fd10246
      Sergey Petrunya authored
      mysql-test/include/concurrent.inc:
        Merge
      7fd10246
    • Sergey Petrunya's avatar
      Post-merge fixes · 9f6c4ad8
      Sergey Petrunya authored
      9f6c4ad8
    • Sergey Petrunya's avatar
    • unknown's avatar
      MySQL 5.1.38 after-merge fixes. · 9ec5b6f4
      unknown authored
      Fix some mistakes in the original merge found during review.
      
      mysql-test/include/concurrent.inc:
        Add missing lines mistakenly omitted in merge.
      mysql-test/include/mix1.inc:
        Revert wrong change done during merge.
      mysql-test/include/wait_for_status_var.inc.moved:
        Remove file which was accidentally not removed during conflict resolution in merge.
      mysql-test/r/innodb_mysql.result:
        Revert result file change following fixing root problem in merge.
      9ec5b6f4