1. 26 Oct, 2009 3 commits
    • Igor Babaev's avatar
      Merge of the latest 5.1 changes. · d6b3882c
      Igor Babaev authored
      d6b3882c
    • Michael Widenius's avatar
      Automatic merge with maria-merge · 19413d4b
      Michael Widenius authored
      19413d4b
    • Michael Widenius's avatar
      Fixed compiler warning message · a46bb97d
      Michael Widenius authored
      - Added checking of return value for system(), freopen(), fgets() and chown()
      - Ensure that calls that require a format strings gets a format string
      - Other trivial things
      Updated test suite results (especially for pbxt and embedded server)
      Removed warning for "Invalid (old?) table or database name 'mysqld.1'" from pbxt tests
      Speed up some pbxt tests by inserting begin ; commit; around "while loops with inserts"
      Added mysqld startup option '--debug-flush'
      Create maria_recovery.trace in data directory instead of current directory
      
      client/mysql.cc:
        Check return value from system()
      client/mysql_upgrade.c:
        Check return value from fgets()
      client/mysqladmin.cc:
        Check return value from fgets()
      client/mysqlslap.c:
        Check return value from system() (but ignore it, as it's not critical)
      extra/yassl/src/crypto_wrapper.cpp:
        Check return value from fgets() (but ignore it, as it's internal file)
      extra/yassl/taocrypt/src/aes.cpp:
        Added extra {} to remove compiler warning
      extra/yassl/taocrypt/src/blowfish.cpp:
        Added extra {} to remove compiler warning
      extra/yassl/taocrypt/src/misc.cpp:
        Ifdef not used code
      include/mysys_err.h:
        Added error message for failing chown()
      mysql-test/mysql-test-run.pl:
        Don't give warning for skipping ndbcluster (never enabled in MariaDB)
      mysql-test/suite/funcs_1/r/is_columns_is_embedded.result:
        Update with new information schema information
      mysql-test/suite/funcs_1/r/is_tables_is_embedded.result:
        New test
      mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result:
        Update test results (has not been tested for a long time)
      mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result:
        Update test results (has not been tested for a long time)
      mysql-test/suite/funcs_1/t/is_tables_is.test:
        Don't run with embedded server (as results differ)
        I added a new test for embedded server
      mysql-test/suite/funcs_1/t/is_tables_is_embedded.test:
        New test
      mysql-test/suite/pbxt/my.cnf:
        Allow one to run pbxt tests without having to specify --mysqld=--default-storage-engine=pbxt
      mysql-test/suite/pbxt/t/count_distinct3.test:
        Speed up test by inserting begin; ... commit;
      mysql-test/suite/pbxt/t/subselect.test:
        Speed up test by inserting begin; ... commit;
      mysys/errors.c:
        Added error message for failing chown()
      mysys/my_copy.c:
        Added error message for failing chown()
      mysys/my_redel.c:
        Added error message for failing chown()
      mysys/safemalloc.c:
        Added cast to get rid of compiler warning
      sql/ha_partition.cc:
        Fixed wrong argument to sql_print_error() (it requires a format string)
      sql/log.cc:
        Test return value of freopen()
      sql/mysqld.cc:
        Test return value of freopen()
        Added startup option '--debug-flush' to be used when one gets a core dump (easy to explain to people on IRC)
      sql/rpl_rli.cc:
        Fixed wrong argument to sql_print_error() (it requires a format string)
      sql/set_var.cc:
        Added {} to get rid of compiler warnings
      sql/slave.cc:
        Fixed wrong argument to mi->report() and sql_print...() (they require a format string)
      sql/sql_cache.cc:
        Fixed wrong argument to sql_printinformation() (it requires a format string)
      sql/sql_parse.cc:
        Test return value of fgets()
      sql/sql_plugin.cc:
        Fixed wrong argument to sql_print_error() (it requires a format string)
      sql/sql_select.cc:
        Use unique table name for internal temp tables instead of full path
        (Simple speed & space optimization)
      sql/udf_example.c:
        Removed compiler warning about not used variable
      storage/maria/ha_maria.cc:
        Fixed wrong argument to sql_print_error() and ma_check_print_error() (they require a format string)
      storage/maria/ma_recovery.c:
        Create maria_recovery.trace in data directory instead of current directory
      storage/maria/unittest/ma_test_loghandler-t.c:
        Fixed wrong argument to ok();  Requires a format string
      storage/pbxt/src/strutil_xt.cc:
        Detect temporary tables by checking if that path for the table is in the mysql data directory.
        The database for temporary tables is after this patch, from PBXT point of view, ""
        This is needed to stop PBXT from calling filename_to_tablename() with the base directory as an argument, which caused
        ERROR: Invalid (old?) table or database name 'mysqld.1'" in the log when running the test suite.
      tests/mysql_client_test.c:
        Fixed compiler warnings
      unittest/mysys/base64-t.c:
        Fixed wrong argument to diag() (it requires a format string)
        Added a comment that the current 'print' of differing buffers doesn't print the right thing,
        but didn't fix this as it's not important (unless we find a bug in the real code)
      a46bb97d
  2. 23 Oct, 2009 3 commits
    • Michael Widenius's avatar
      Automatic merge · 24b35e5a
      Michael Widenius authored
      24b35e5a
    • Michael Widenius's avatar
      Fixes for binary distribution in tar file · 1d8424d7
      Michael Widenius authored
      - mysql_install_db doesn't require --basedir option anymore
      - Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install
      - Move some files from share/mysql to where they have always been (1.0 - 5.0)
      - Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility)
      - Move man files to 'man' (from 'share/man')
      - Ensure that all scripts are executable
      
      mysql_secure_installation.sh
      - Added support for --basedir flag
      - Don't assume that the mysql binary is in the path
      
      Other:
      - Fixed crash when one got kill signal during bootstrap
      
      Docs/INSTALL-BINARY:
        Change references from MySQL to MariaDB
      Docs/mysql.info:
        Change references from MySQL to MariaDB
      README:
        Removed duplicate row
      configure.in:
        Change references from MySQL to MariaDB
      libmysql/libmysql.c:
        Assume that if version string contains '-maria-' we are also using MariaDB
      scripts/make_binary_distribution.sh:
        Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install
        Remove some files that should not be part of a MariaDB binary install
        Move some files from share/mysql to where they have always been (1.0 - 5.0)
        Move man files to 'man' (from 'share/man')
        Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility)
        Removed generation of 'netware/init_db.sql', as it was never used
        Remove old reference to bk tree
      scripts/mysql_secure_installation.sh:
        Added support for --basedir flag
        Don't assume that the mysql binary is in the path
        Use .my.cnf files
        Removed a lot of useless 'echo' rows
      sql/mysqld.cc:
        Fixed crash when one got kill signal during bootstrap
      storage/maria/Makefile.am:
        Don't add internal test files to binary distributions
      storage/myisam/Makefile.am:
        Don't add internal test files to binary distributions
      support-files/Makefile.am:
        Make scripts executable
      support-files/config.huge.ini.sh:
        Removed execution bit
      support-files/config.medium.ini.sh:
        Removed execution bit
      support-files/config.small.ini.sh:
        Removed execution bit
      support-files/mysql.server.sh:
        Ensure this works also mysqld is in the 'bin' directory
      1d8424d7
    • unknown's avatar
      Merge Peter Lieverdink's fixes: · 6c88140e
      unknown authored
       - configtest target in rc script.
       - type fix usefull -> useful.
      6c88140e
  3. 20 Oct, 2009 1 commit
  4. 17 Oct, 2009 1 commit
  5. 16 Oct, 2009 3 commits
  6. 15 Oct, 2009 1 commit
  7. 14 Oct, 2009 1 commit
  8. 13 Oct, 2009 2 commits
  9. 12 Oct, 2009 6 commits
  10. 11 Oct, 2009 6 commits
  11. 10 Oct, 2009 1 commit
    • unknown's avatar
      Fix failures in the funcs_1 test suite. · 5ea75e5f
      unknown authored
      Some result updates necessary due to extra tables and columns added in
      information_schema in MariaDB (XtraDB, PBXT, microsec_process).
      
      Also fix bad merge of two result files; apparently the test case was merged,
      but the result file was not.
      
      mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
        Handle the new TIME_MS column in information_schema.processlist.
      mysql-test/suite/funcs_1/datadict/processlist_val.inc:
        Handle the new TIME_MS column in information_schema.processlist.
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        Handle new tables in information_schema.
      mysql-test/suite/funcs_1/r/is_tables_is.result:
        Handle new tables in information_schema.
      mysql-test/suite/funcs_1/r/is_tables_myisam.result:
        Fix previous bad merge; apparently this file was not merged along with test changes.
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
        Handle the new TIME_MS column in information_schema.processlist.
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
        Fix previous bad merge; apparently this file was not merged along with test changes.
        Also handle the new TIME_MS column in INFORMATION_SCHEMA.PROCESSLIST.
      mysql-test/suite/funcs_1/t/is_columns_is.test:
        Since result file includes PBXT information_schema tables, we need PBXT to run this test.
      5ea75e5f
  12. 09 Oct, 2009 3 commits
    • unknown's avatar
      Fix many test failures in parts test suite with --embedded-server. · c9fca7e4
      unknown authored
      Fix some connect options to work with embedded.
      
      Disable in --embedded tests that rely on connecting to mysqld externally by
      spawning mysqltest.
      
      Disable in --embedded tests that rely on the mysqltest --list_files command,
      which does not seem to work properly in --embedded.
      
      mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter1_1_innodb.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter1_1_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter1_2_innodb.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter1_2_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter2_1_innodb.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter2_1_maria.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter2_1_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter2_2_innodb.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter2_2_maria.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter2_2_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter3_innodb.test:
        Disable in --embedded tests that rely on the mysqltest --list_files command,
        which does not seem to work properly in --embedded.
      mysql-test/suite/parts/t/partition_alter3_myisam.test:
        Disable in --embedded tests that rely on the mysqltest --list_files command,
        which does not seem to work properly in --embedded.
      mysql-test/suite/parts/t/partition_alter4_innodb.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_alter4_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_basic_innodb.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_basic_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_basic_symlink_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_engine_innodb.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_engine_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_special_innodb.test:
        Fix some connect options to work with embedded.
      mysql-test/suite/parts/t/partition_syntax_innodb.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      mysql-test/suite/parts/t/partition_syntax_myisam.test:
        Disable in --embedded tests that rely on connecting to mysqld externally by
        spawning mysqltest.
      c9fca7e4
    • unknown's avatar
    • unknown's avatar
      Implement mysqltest --enable_prepare_warnings to properly fix some test failures. · 1689356f
      unknown authored
      The --enable_prepare_warnings allows to not discard warnings from autorepair
      of crashed table in --ps-protocol mode.
      
      Use this to properly fix the parts.partition_recover_myisam and
      maria.maria-recover tests.
      
      Add a test case for the new feature. This also adds missing test coverage
      for the case where the same warning is thrown in both prepare and execute
      phase.
      
      
      client/mysqltest.cc:
        Implement new commands --enable-prepare_warnings and --disable_prepare_warnings.
      mysql-test/r/mysqltest_ps.result:
        Add test case for new --enable_prepare_warning mysqltest command.
      mysql-test/suite/maria/t/maria-recover.test:
        Better fix of test case using new --enable_prepare_warnings command.
      mysql-test/suite/parts/t/partition_recover_myisam.test:
        Fix test failure in --ps-protocol mode.
      mysql-test/t/mysqltest_ps.test:
        Add test case for new --enable_prepare_warning mysqltest command.
      1689356f
  13. 08 Oct, 2009 4 commits
  14. 07 Oct, 2009 5 commits