1. 14 Aug, 2012 1 commit
  2. 07 Aug, 2012 1 commit
  3. 01 Aug, 2012 2 commits
  4. 06 Jul, 2012 2 commits
    • Michael Widenius's avatar
      Fixed wrong error codes from InnoDB/XtraDB that caused %M to give system... · 5a86a612
      Michael Widenius authored
      Fixed wrong error codes from InnoDB/XtraDB that caused %M to give system dependent error messages (for unknown error code)
      - InnoDB now returns handler specific HA_WRONG_CREATE_OPTION instead of MySQL specific ER_ILLEGAL_HA_CREATE_OPTION
      - This changes the user level error message from "Unknown error" to "Wrong create options"
      
      
      mysql-test/r/lowercase_table2.result:
        Updated result file
      mysql-test/r/partition_innodb_plugin.result:
        Updated to new error message
      mysql-test/r/partition_open_files_limit.result:
        Updated result file
      mysql-test/r/row-checksum-old.result:
        Updated to new error message
      mysql-test/r/row-checksum.result:
        Updated to new error message
      mysql-test/r/symlink.result:
        Updated result file
      mysql-test/suite/innodb/r/innodb-create-options.result:
        Updated to new error message
      mysql-test/suite/innodb/r/innodb-zip.result:
        Updated to new error message
      mysql-test/suite/innodb/r/innodb.result:
        Updated to new error message
      storage/innobase/handler/ha_innodb.cc:
        Return HA_WRONG_CREATE_OPTION instead of ER_ILLEGAL_HA_CREATE_OPTION
        This gives more clear and OS indepedent error messages
      storage/xtradb/handler/ha_innodb.cc:
        Return HA_WRONG_CREATE_OPTION instead of ER_ILLEGAL_HA_CREATE_OPTION
        This gives more clear and OS indepedent error messages
      5a86a612
    • Michael Widenius's avatar
      Fixed compiler warnings · f27c26e9
      Michael Widenius authored
      client/mysqltest.cc:
        Added cast
      plugin/feedback/utils.cc:
        Added #ifdef
      sql/sql_select.cc:
        Added cast
      sql/sys_vars.h:
        Changed limits to int
      support-files/compiler_warnings.supp:
        Added suppression
      f27c26e9
  5. 27 Jun, 2012 3 commits
    • Michael Widenius's avatar
      Automatic merge with 5.5 · 69b81775
      Michael Widenius authored
      Fixed failing test case
      69b81775
    • Michael Widenius's avatar
      automatic merge with 5.5 · aa67a198
      Michael Widenius authored
      aa67a198
    • Michael Widenius's avatar
      Don't abort InnoDB/XtraDB if one can't allocate resources for AIO · 44d8fe96
      Michael Widenius authored
      - Better error messages
      
      This fixes that one again can run the test systems with many threads without having to increase fs.aio-max-nr.
      
      
      mysql-test/include/mtr_check.sql:
        Ignore the INNODB_USE_NATIVE_AIO variable (may change during execution)
      mysql-test/mysql-test-run.pl:
        Ignore warnings for failure to setup AIO
      storage/innobase/os/os0file.c:
        Continue without AIO even if we can't allocate resources for AIO
      storage/xtradb/os/os0file.c:
        Continue without AIO even if we can't allocate resources for AIO
      storage/xtradb/srv/srv0start.c:
        Give an error message (instead of core dump) if AIO can't be initialized
      44d8fe96
  6. 25 Jun, 2012 1 commit
  7. 24 Jun, 2012 1 commit
  8. 23 Jun, 2012 3 commits
  9. 22 Jun, 2012 2 commits
  10. 21 Jun, 2012 7 commits
  11. 20 Jun, 2012 7 commits
  12. 19 Jun, 2012 2 commits
    • unknown's avatar
      Merged the fix for bug lp:944706, mdev-193 · 0b93b444
      unknown authored
      0b93b444
    • Igor Babaev's avatar
      Fixed bug mdev-354. · 0c69f220
      Igor Babaev authored
      Virtual columns of ENUM and SET data types were not supported properly
      in the original patch that introduced virtual columns into MariaDB 5.2.
      The problem was that for any  virtual column the patch used the 
      interval_id field of the definition of the column in the frm file as
      a reference to the virtual column expression.
      The fix stores the optional interval_id of the virtual column in the
      extended header of the virtual column expression. 
      0c69f220
  13. 18 Jun, 2012 5 commits
  14. 17 Jun, 2012 2 commits
    • Sergei Golubchik's avatar
    • Michael Widenius's avatar
      Fixes after Serg's review of %M extenstions · 9ebda876
      Michael Widenius authored
      - Changed output to be error "error-text" instead of error - error-text
      
      
      extra/perror.c:
        Move my_handler_errors.h into include
      include/my_handler_errors.h:
        Move my_handler_errors.h into include
      mysql-test/r/errors.result:
        Updated result
      mysql-test/r/innodb_mysql_sync.result:
        Updated result
      mysql-test/r/myisam-system.result:
        Updated result
      mysql-test/r/myisampack.result:
        Updated result
      mysql-test/r/partition_innodb_plugin.result:
        Updated result
      mysql-test/r/ps_1general.result:
        Updated result
      mysql-test/r/trigger.result:
        Updated result
      mysql-test/r/type_bit.result:
        Updated result
      mysql-test/r/type_bit_innodb.result:
        Updated result
      mysql-test/r/type_blob.result:
        Updated result
      mysql-test/suite/archive/archive.result:
        Updated result
      mysql-test/suite/binlog/r/binlog_index.result:
        Updated result
      mysql-test/suite/binlog/r/binlog_ioerr.result:
        Updated result
      mysql-test/suite/csv/csv.result:
        Updated result
      mysql-test/suite/engines/iuds/r/type_bit_iuds.result:
        Updated result
      mysql-test/suite/federated/federated_bug_35333.result:
        Updated result
      mysql-test/suite/innodb/r/innodb-create-options.result:
        Updated result
      mysql-test/suite/innodb/r/innodb-index.result:
        Updated result
      mysql-test/suite/innodb/r/innodb-zip.result:
        Updated result
      mysql-test/suite/innodb/r/innodb.result:
        Updated result
      mysql-test/suite/innodb/r/innodb_bug13635833.result:
        Updated result
      mysql-test/suite/innodb/r/innodb_bug21704.result:
        Updated result
      mysql-test/suite/innodb/r/innodb_bug46000.result:
        Updated result
      mysql-test/suite/parts/r/partition_bit_innodb.result:
        Updated result
      mysql-test/suite/parts/r/partition_bit_myisam.result:
        Updated result
      mysql-test/suite/percona/percona_innodb_fake_changes.result:
        Updated result
      mysql-test/suite/perfschema/r/misc.result:
        Updated result
      mysql-test/suite/perfschema/r/privilege.result:
        Updated result
      mysql-test/suite/rpl/r/rpl_EE_err.result:
        Updated result
      mysql-test/suite/rpl/r/rpl_binlog_errors.result:
        Updated result
      mysql-test/suite/rpl/r/rpl_drop_db.result:
        Updated result
      sql/share/errmsg-utf8.txt:
        Removed 'column' from error text that was used in different context
      strings/my_vsnprintf.c:
        Move my_handler_errors.h into include
        Minor cleanups
        Changed output of %M to be error "error-text" instead of error - error-text
      unittest/mysys/my_vsnprintf-t.c:
        Updated error text
      9ebda876
  15. 16 Jun, 2012 1 commit