An error occurred fetching the project authors.
  1. 15 Nov, 2011 1 commit
    • Nirbhay Choubey's avatar
      Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH · 4df195a4
      Nirbhay Choubey authored
                          OPTION SKIP-WRITE-BINLOG
      
      System tables were not getting upgraded when
      mysql_upgrade was run with --skip-write-binlog
      option. (Same for --write-binlog.) Also, with
      this option, mysql_upgrade_info file was not
      getting created after the upgrade.
      
      mysql_upgrade makes use of mysql client tool in
      order to run upgrade scripts, while doing so it
      passes some of the command line options (used to
      start mysql_upgrade) directly to mysql client.
      The reason behind this bug being, some options
      like skip-write-binlog and upgrade-system-tables
      were being passed to mysql tool along with other
      options, and hence mysql execution failed due
      presence of these invalid options.
      
      Fixed this issue by filtering out the above mentioned
      options from the list of options that will be passed to
      mysql and mysqlcheck tools. However, since --write-binlog
      is supported by mysqlcheck, this option would be used
      explicitly while running mysqlcheck. (not part of patch,
      already there)
      
      Checking the contents of general log after the upgrade
      is not doable via an mtr test. So performed manual test.
      Added a test to verify the creation of mysql_upgrade_info.
      
      
      client/mysql_upgrade.c:
        Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH
                            OPTION SKIP-WRITE-BINLOG
        
        With this patch, --upgrade-system-tables and
        --write-binlog options will not be added to the
        list of options, used to start mysql and mysqlcheck
        tools.
      mysql-test/r/mysql_upgrade.result:
        Added a testcase for Bug#11827359.
      mysql-test/t/mysql_upgrade.test:
        Added a testcase for Bug#11827359.
      4df195a4
  2. 02 Nov, 2010 2 commits
    • Joerg Bruehe's avatar
      Bug #57916: Fix the naming of the proxy_priv table · 7375a944
      Joerg Bruehe authored
      1. Fixed the name of the table to proxies_priv
      2. Fixed the column names to be of the form Capitalized_lowercase instead of
         Capitalized_Capitalized
      3. Added Timestamp and Grantor columns
      4. Added tests to plugin_auth to check the table structure
      5. Updated the existing tests
      
      Fix done by Georgi Kodinov,
      now transferred to the 5.5.7 release build clone.
      7375a944
    • Georgi Kodinov's avatar
      Bug #57916: Fix the naming of the proxy_priv table · 00f1e71d
      Georgi Kodinov authored
      1. Fixed the name of the table to proxies_priv
      2. Fixed the column names to be of the form Capitalized_lowecarse instead of
      Capitalized_Capitalized
      3. Added Timestamp and Grantor columns
      4. Added tests to plugin_auth to check the table structure
      5. Updated the existing tests
      00f1e71d
  3. 22 Sep, 2010 1 commit
    • Jon Olav Hauglid's avatar
      Bug #56494 Segfault in upgrade_shared_lock_to_exclusive() for · e14934d2
      Jon Olav Hauglid authored
                 REPAIR of merge table
      Bug #56422 CHECK TABLE run when the table is locked reports
                 corruption along with timeout
      
      The crash happened if a table maintenance statement (ANALYZE TABLE,
      REPAIR TABLE, etc.) was executed on a MERGE table and opening and 
      locking a child table failed. This could for example happen if a child
      table did not exist or if a lock timeout happened while waiting for
      a conflicting metadata lock to disappear.
      
      Since opening and locking the MERGE table and its children failed,
      the tables would be closed and the metadata locks released.
      However, TABLE_LIST::table for the MERGE table would still be set,
      with its value invalid since the tables had been closed.
      This caused the table maintenance statement to try to continue
      and upgrade the metadata lock on the MERGE table. But since the lock
      already had been released, this caused a segfault.
      
      This patch fixes the problem by setting TABLE_LIST::table to NULL 
      if open_and_lock_tables() fails. This prevents maintenance
      statements from continuing and trying to upgrade the metadata lock.
      
      The patch includes a 5.5 version of the fix for
      Bug #46339 crash on REPAIR TABLE merge table USE_FRM.
      This bug caused REPAIR TABLE ... USE_FRM to give an assert 
      when used on merge tables.
      
      The patch also enables the CHECK TABLE statement for log tables.
      Before, CHECK TABLE for log tables gave ER_CANT_LOCK_LOG_TABLE,
      yet still counted the statement as successfully executed.
      With the changes to table maintenance statement error handling
      in this patch, CHECK TABLE would no longer be considered as
      successful in this case. This would have caused upgrade scripts
      to mistakenly think that the general and slow logs are corrupted
      and have to be repaired. Enabling CHECK TABLES for log tables
      prevents this from happening.
      
      Finally, the patch changes the error message from "Corrupt" to
      "Operation failed" for a number of issues not related to table
      corruption. For example "Lock wait timeout exceeded" and 
      "Deadlock found trying to get lock".
      
      Test cases added to merge.test and check.test.
      e14934d2
  4. 09 Aug, 2010 1 commit
  5. 01 Jul, 2010 1 commit
  6. 04 Dec, 2009 1 commit
  7. 03 Dec, 2009 1 commit
    • unknown's avatar
      This is a patch for bug#41569. · 699a8711
      unknown authored
      "mysql_upgrade (ver 5.1) add 3 fields to mysql.proc table but does
      not set values".
                  
      mysql_upgrade (ver 5.1) adds 3 fields (character_set_client, 
      collation_connection and db_collation) to the mysql.proc table, but 
      does not set any values. When we run stored procedures, which were 
      created with mysql 5.0, a warning is logged into the error log.
                  
      The solution to this is for mysql_upgrade to set default best guess
      values for these fields. A warning is also written during upgrade, to
      make the user aware that default values are set.
      
      client/mysql_upgrade.c:
        Result lines which start with "WARNING" are passed through to the output. 
        This way we have a way of triggering WARNING-messages during upgrade 
        directly from the .sql-script.
      mysql-test/r/mysql_upgrade.result:
        Expected result of the test.
      mysql-test/t/mysql_upgrade.test:
        Added a test-case for the bug.
      scripts/mysql_system_tables_fix.sql:
        The new fields are populated, and warnings are written.
      699a8711
  8. 29 Oct, 2009 1 commit
    • Alexey Botchkov's avatar
      mysql_upgrade test fixed · eff49de2
      Alexey Botchkov authored
      per-file comments:
        mysql-test/r/mysql_upgrade.result
           result updated
        mysql-test/t/mysql_upgrade.test
           --skip-verbose option added to the call
      eff49de2
  9. 28 Oct, 2009 1 commit
    • Alexey Botchkov's avatar
      WL#4991 mysql_upgrade --fix-privilege-tables · 36299d59
      Alexey Botchkov authored
         (backport)
         mysql_upgrade script accepts --upgrade-system-tables option,
         fixing only system tables in this case.
      
      per-file comments:
        client/mysql_upgrade.c
      WL#4991 mysql_upgrade --fix-privilege-tables
          --upgrade-system-tables option added.
         if it is set, the tool won't look for the mysqlcheck then
         run_mysqlcheck_fixnames() and run_mysqlcheck_upgrade won't be called.
        mysql-test/r/mysql_upgrade.result
      WL#4991 mysql_upgrade --fix-privilege-tables
          test result added
        mysql-test/t/mysql_upgrade.test
      WL#4991 mysql_upgrade --fix-privilege-tables
          test case added
      36299d59
  10. 26 Jan, 2009 1 commit
    • Magnus Svensson's avatar
      WL#4189 mtr.pl v2 · 2bea349b
      Magnus Svensson authored
       - rewrite "check warnings" to be faster by not creating a full join
         between error_log and suspicious_patterns while running REGEXP.
         Instead add a column to error_log that will be set to 1 to indicate
         a warning and run the 6 REGEXP's we have for suspicious lines as
         6 separate full table scans.
       - Remove the "suspicious_patterns" table from mtr db
       - Use 'xykls37' as separator when loading the error log, that line should
         hopefully never exist in a line that should be a warning
      2bea349b
  11. 30 Oct, 2008 1 commit
  12. 29 Oct, 2008 1 commit
    • Mats Kindahl's avatar
      Post-merge fixes to fix test cases. · 1f6e419d
      Mats Kindahl authored
      mysql-test/extra/rpl_tests/rpl_log.test:
        Using RESET MASTER in the middle of a sequence of statements cause
        a race condition between the dump thread sending the preceeding
        statements to the slave and the RESET MASTER.
      mysql-test/suite/federated/federated.test:
        Fixing include paths.
      mysql-test/suite/federated/federated_bug_25714.test:
        Removing extreneous lines added by merge.
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
        Correcting typo (the spaces following the connection name was included as part of the name).
      mysql-test/t/distinct.test:
        Correcting paths.
      1f6e419d
  13. 13 Oct, 2008 1 commit
    • Sven Sandberg's avatar
      BUG#39853: lowercase_table3 fails on powermacg5 in rpl tree · 4e09e915
      Sven Sandberg authored
      Problem: during a refactoring of mtr, a pattern for suppressing a warning from lowercase_table3 was lost.
      Fix: re-introduce the suppression.
      Problem 2: suppression was misspelt as supression. Fixed by adding a p.
      
      
      mysql-test/include/mtr_warnings.sql:
        fixed spelling error
      mysql-test/suite/rpl/t/rpl_bug33931.test:
        fixed spelling error
      mysql-test/suite/rpl/t/rpl_idempotency.test:
        fixed spelling error
      mysql-test/suite/rpl/t/rpl_temporary.test:
        fixed spelling error
      mysql-test/suite/rpl/t/rpl_temporary_errors.test:
        fixed spelling error
      mysql-test/t/lowercase_table3.test:
        fixed spelling error
      4e09e915
  14. 08 Apr, 2008 1 commit
    • unknown's avatar
      Check warnings in servers error log as part of test case · 2c4ca510
      unknown authored
      BitKeeper/deleted/.del-rpl_bug33931-slave.opt:
        Delete: mysql-test/suite/rpl/t/rpl_bug33931-slave.opt
      mysql-test/include/default_mysqld.cnf:
        Set a default name for "log-bin"
      mysql-test/mysql-test-run.pl:
        Check for warnings in mysqld error log files after each testcase,
        using SQL
      mysql-test/lib/mtr_cases.pm:
        Make mtr_match into a perl module
      mysql-test/lib/mtr_match.pm:
        Make mtr_match into a perl module
      mysql-test/lib/mtr_report.pm:
        Make mtr_match into a perl module
        Print warnings if testcase failed from warnings
      mysql-test/r/information_schema.result:
        Be more selective which databases and tables are select in the queries
      mysql-test/r/mysql_upgrade.result:
        Update result, mysql_upgrade will check _all_ databases
      mysql-test/r/mysqlcheck.result:
        Update result, mysql_upgrade should check _all_ databases
      mysql-test/r/sp-destruct.result:
        Be more selective which databases and tables are select in the queries
      mysql-test/r/sp-error.result:
        Backup and restore mysql.proc table
      mysql-test/r/sp-security.result:
        Be more selective which databases and tables are select in the queries
      mysql-test/r/sp.result:
        Be more selective which databases and tables are select in the queries
      mysql-test/suite/rpl/r/rpl_bug33931.result:
        Move the setting of debug flag into the test file instead of in -slave.opt
        Add supression
      mysql-test/suite/rpl/r/rpl_idempotency.result:
        Add supression
        Add master-slave-end.inc
      mysql-test/suite/rpl/t/rpl_bug33931.test:
        Move the setting of debug flag into the test file instead of in -slave.opt
        Add supression
      mysql-test/suite/rpl/t/rpl_idempotency.test:
        Add supression
        Add master-slave-end.inc
      mysql-test/t/information_schema.test:
        Be more selective which databases and tables are select in the queries
      mysql-test/t/sp-destruct.test:
        Be more selective which databases and tables are select in the queries
      mysql-test/t/sp-error.test:
        Backup and restore mysql.proc table
      mysql-test/t/sp-security.test:
        Be more selective which databases and tables are select in the queries
      mysql-test/t/sp.test:
        Be more selective which databases and tables are select in the queries
      mysql-test/include/check-warnings.test:
        New BitKeeper file ``mysql-test/include/check-warnings.test''
      mysql-test/include/mtr_warnings.sql:
        New BitKeeper file ``mysql-test/include/mtr_warnings.sql''
      2c4ca510
  15. 27 Aug, 2007 1 commit
    • unknown's avatar
      Bug#30487 mysql_upgrade reports misleading errors · f237b984
      unknown authored
       - Update result file to include these "misleading errors", better to 
      run mysql_upgrade with them than not at all.
      
      
      mysql-test/r/mysql_upgrade.result:
        Update result file for mysql_upgrade after removing it's disabling
      f237b984
  16. 19 May, 2007 2 commits
    • unknown's avatar
      Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE · 0a9d4ca3
      unknown authored
       - Upgrade result file for 5.1
      
      
      mysql-test/r/mysql_upgrade.result:
        Update result for 5.1 - it has more system tables
      0a9d4ca3
    • unknown's avatar
      Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE · f52f931f
      unknown authored
       - The SQL commands used by mysql_upgrade are written to be run
          with sql_mode set to '' - thus the scripts should change sql_mode
          for the session to make sure the SQL is legal.
      
      
      mysql-test/r/mysql_upgrade.result:
        Update test result
      mysql-test/t/mysql_upgrade.test:
        The SQL commands used by mysql_upgrade are written to be run
        with sql_mode set to '' - thus the scripts should change sql_mode
        for the session to make sure the SQL is legal.
      scripts/mysql_system_tables_fix.sql:
        Set sql_mode to '' before running the SQL commands
        to fix system tables - backport from 5.1
      f52f931f
  17. 19 Apr, 2007 2 commits
    • unknown's avatar
      Add replace for varying errno · 45face8f
      unknown authored
      45face8f
    • unknown's avatar
      mysql_upgrade portability fixes · 36cd228a
      unknown authored
      client/mysql_upgrade.c:
        Add defines for WEXITSTATUS
        Pass arguments on command line instead of --defaults-file=<temp file>
      mysql-test/r/mysql_upgrade.result:
        When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
        is used on all platforms.
      mysql-test/t/mysql_upgrade.test:
        When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
        is used on all platforms.
      scripts/comp_sql.c:
        Some compilers have a max string length, insert a newline at
        every 512th char in long strings
      36cd228a
  18. 18 Apr, 2007 2 commits
    • unknown's avatar
      Update mysql_upgrade tests for 5.1 · 07ec45cc
      unknown authored
      Add "two liner" to mysqld --bootstrap that allows
      wo write scripts that can be run both by mysql and mysqld --bootstrap
      Remove duplicate create of MySQL system tables 
      
      
      mysql-test/r/mysql_upgrade.result:
        Update mysql_upgrade.result for new tables in 5.1
      scripts/mysql_system_tables.sql:
        Use "delimiter ;;" to make it possible to run the script
        both with "mysql" and "mysqld --bootstrap"
      scripts/mysql_system_tables_fix.sql:
        Remove duplicate stored procedure for creating slow_log
        and general_log.
        Remove duplicate CREATE of ndb_binlog_index.
        Those are already defined in mysql_system_tables.sql
      sql/sql_parse.cc:
        Make "mysqld --bootstrap skip lines startig with "delimiter"
        thus making it possible to write sql scripts containing
        stored procedures that can be executed both  with "mysql" and
        "mysqld --bootstrap"
      07ec45cc
    • unknown's avatar
      Bug#25452 mysql_upgrade access denied · 1d24597f
      unknown authored
       - Improve mysql_upgrade and add comments describing it's logic
       - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
        was started from
       - Don't look for mysql_fix_privilege_tables.sql randomly, compile
        in the mysql_fix_privilege_tables.sql file and use that to upgrade
        the system tables of MySQL
       - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
       - Fix bug#26639, bug#24248 and bug#25405
      
      
      BitKeeper/etc/ignore:
        Added scripts/comp_sql scripts/mysql_fix_privilege_tables_sql.c to the ignore list
      CMakeLists.txt:
        Build files also in scripts/
      Makefile.am:
        Build scripts/ a little earlier to make
        the scripts/mysql_fix_privilege_tables_sql.c file available
        when client/ is built
      client/mysql_upgrade.c:
        Updated version of mysql_upgrade with comments and logical functions
      include/my_global.h:
        Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
      mysql-test/r/mysql_upgrade.result:
        Update result
      mysql-test/t/mysql_upgrade.test:
        Add more tests for different bugs related to mysql_upgrade
      scripts/Makefile.am:
        Build comp_sql and mysql_fix_privilege_tables_sql.c
      sql/mysql_priv.h:
        Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
      scripts/CMakeLists.txt:
        New BitKeeper file ``scripts/CMakeLists.txt''
      scripts/comp_sql.c:
        New BitKeeper file ``scripts/comp_sql.c''
      1d24597f
  19. 28 Feb, 2007 1 commit
  20. 26 Feb, 2007 1 commit
    • unknown's avatar
      Bug#20166 mysql-test-run.pl does not test system privilege tables creation · 5d4e0417
      unknown authored
       - Use mysql_system_tables.sql to create MySQL system tables in
         all places where we create them(mysql_install_db, mysql-test-run-pl
         and mysql_fix_privilege_tables.sql)
      
      
      BitKeeper/deleted/.del-init_db.sql:
        Rename: mysql-test/init_db.sql -> BitKeeper/deleted/.del-init_db.sql
      BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
        Rename: mysql-test/lib/init_db.sql -> BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8
      BitKeeper/deleted/.del-mysql_create_system_tables.sh:
        Rename: scripts/mysql_create_system_tables.sh -> BitKeeper/deleted/.del-mysql_create_system_tables.sh
      BitKeeper/etc/ignore:
        Added scripts/mysql_fix_privilege_tables.sql to the ignore list
      mysql-test/Makefile.am:
        lib/init_db.sql has been removed
      mysql-test/mysql-test-run.pl:
        - Build var/tmp/bootstrap.sql from mysql_system_tables.sql,
        mysql_test_data_timezone.sql and fill_help_tables.sql and use
        it when bootsraping the system tables to use during test.
      mysql-test/r/create.result:
        Update result file
      mysql-test/r/derived.result:
        Update result file
      mysql-test/r/join.result:
        Update result file
      mysql-test/r/mysql_upgrade.result:
        Update result file
      mysql-test/r/sp-security.result:
        Update result file
      mysql-test/t/create.test:
        Add user mysqltest_1 before trying to connect as that user - no
        anon users by default anymore
      mysql-test/t/derived.test:
        Add user mysqltest_1 before trying to connect as that user - no
        anon users by default anymore
      mysql-test/t/grant2.test:
        Add anonymous users for part of thes that need it.
      mysql-test/t/grant_cache.test:
        Add anonymous users for part of thes that need it.
      mysql-test/t/init_connect.test:
        Add anonymous users for part of thes that need it.
      mysql-test/t/lock_multi.test:
        Add anonymous users for part of thes that need it.
      mysql-test/t/ndb_basic.test:
        Connect as "root", blank user will take currently logged in
        username
      mysql-test/t/ndb_index_ordered.test:
        Connect as "root", blank user will take currently logged in
        username
      mysql-test/t/ndb_multi.test:
        Connect as "root", blank user will take currently logged in
        username
      mysql-test/t/overflow.test:
        Connect as root - no anonymous users by default anymore
      mysql-test/t/rpl_temporary.test:
        Add anonymous users for the test
      mysql-test/t/xa.test:
        Connect as "root", blank user wil pick currently logged in user
      scripts/Makefile.am:
        Remove mysql_create_system_tables.sh
        Add mysql_system_tables.sql and mysql_test_data_timezone.sql
        Build mysql_fix_privilege_tables.sql from mysql_system_tables.sql
        and mysql_fix_privilege_tables.sql.in
      scripts/mysql_fix_privilege_tables.sh:
        Update message describing what the script does
      scripts/mysql_fix_privilege_tables.sql.in:
        Remove the part that creates system tables as that will be added to
        mysql_fix_privileg_tables.sql from mysql_system_tables.sql
        Change all comments to use #
      scripts/mysql_install_db.sh:
        Use mysql_system_tables.sql to create the MySQL system tables
        Update comments and indentation
        Add more descriptive comments about --windows switch
        Reduce number of hardcoded names for the SQL files the script
        looks for
      mysql-test/include/add_anonymous_users.inc:
        New BitKeeper file ``mysql-test/include/add_anonymous_users.inc''
      mysql-test/include/delete_anonymous_users.inc:
        New BitKeeper file ``mysql-test/include/delete_anonymous_users.inc''
      scripts/mysql_system_tables.sql:
        New BitKeeper file ``scripts/mysql_system_tables.sql''
      scripts/mysql_test_data_timezone.sql:
        New BitKeeper file ``scripts/mysql_test_data_timezone.sql''
      5d4e0417
  21. 09 Dec, 2006 1 commit
    • unknown's avatar
      WL #3031 · c60024b0
      unknown authored
      Change to test results, committing so I can clone to another box to complete merge.
      
      
      c60024b0
  22. 05 Dec, 2006 1 commit
  23. 29 Nov, 2006 1 commit
  24. 15 Nov, 2006 1 commit
  25. 13 Nov, 2006 1 commit
    • unknown's avatar
      Make it possible for .test suites to run "mysql_upgrade" · 8c598f60
      unknown authored
      Add new test file mysql_upgrade.test
      
      
      BitKeeper/deleted/.del-abi_check.ic:
        Rename: include/abi_check.ic -> BitKeeper/deleted/.del-abi_check.ic
      client/mysql_upgrade.c:
        Make mysql_upgrade search also in "client" dir so it can be run from a source dist.
      mysql-test/mysql-test-run.pl:
        Make it possible for .test scripts to run "mysql_upgrade"
      mysql-test/r/mysql_upgrade.result:
        New BitKeeper file ``mysql-test/r/mysql_upgrade.result''
      mysql-test/t/mysql_upgrade.test:
        New BitKeeper file ``mysql-test/t/mysql_upgrade.test''
      8c598f60
  26. 14 Aug, 2006 1 commit
    • unknown's avatar
      Manual merge 5.0->5.1. Post-merge fixes. · 21e75cb0
      unknown authored
      client/mysqldump.c:
        A post-merge fix - 'sock' was renamed to 'mysql'
      mysql-test/r/events_bugs.result:
        A post merge fix: now we strip rear comments from the query before
        it gets into the log.
      mysql-test/r/func_group.result:
        A post merge fix: default clause is now printed uppercase.
      mysql-test/r/im_life_cycle.result:
        Fix my mistake in manual resolve.
      mysql-test/r/mysqlcheck.result:
        use test; - after we drop client_test_db there is no current database.
        This cleanup is present in 5.1 only, but the test that was added in 
        5.0 assumes there is a current database, test.
      mysql-test/r/mysqldump.result:
        Ignore results of execution of mysqldump: we can't rely on 
        MASTER_LOG_POS in test results, it's different for statement
        and row level logging.
      mysql-test/r/mysqlshow.result:
        A post-merge fix: information schema contains a few more tables
        in 5.1
      mysql-test/r/mysqltest.result:
        A post merge fix: add 5.1 test end separator.
      mysql-test/r/ndb_basic.result:
        A post-merge fix: add test end separators.
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        A post merge fix: length of varbinary column is now 3 times less.
        Assuming a side effect of some other change. Length of any
        field is not relevant in this test.
      mysql-test/r/rpl_view.result:
        Add an end of test marker.
      mysql-test/r/show_check.result:
        Remove duplicate results. Add results from a merged test case.
      mysql-test/r/sp-error.result:
        Add test end separators.
      mysql-test/r/sp-security.result:
        Post-merge fix: use test after the current database is dropped.
      mysql-test/r/sp.result:
        Remove a duplicate result (bad merge that left a copy of
        the test case for Bug#19862 in the test suite).
      mysql-test/r/strict.result:
        An after-merge fix for a new test case: in 5.1 we issue a more accurate
        error message: "Incorrect value" instead of "Truncated value". I reason
        it so that in case of an error nothing is truncated, really.
        Also found similar changes in other test cases.
      mysql-test/r/type_datetime.result:
        Fix the text of an error.
      mysql-test/r/union.result:
        A post-merge fix: CHARACTER SET is now uppercase.
      mysql-test/t/mysqlcheck.test:
        A post-merge fix: use test, after current database is dropped, there
        is no current database.
      mysql-test/t/mysqldump.test:
        Disable result log: it's dependent on binlog position.
      mysql-test/t/sp-security.test:
        use test
      sql/item_sum.cc:
        Adjust the call to the constructor after the merge.
      sql/sp_head.cc:
        Add a missing DBUG_VOID_RETURN, move security checks out of
        execute_trigger to Table_triggers_list: in 5.1 we check for
        TRIGGER privilege, not SUPER privilege to execute triggers, so these
        checks lack table context inside execute_trigger and have to be
        performed when we have table object on hand.
      sql/sql_db.cc:
        A post-merge fix: adjust load_db_opt_by_name and check_db_dir_existence
        (new functions added in 5.0) to be tablename-to-filename encoding 
        friendly.
      sql/sql_lex.cc:
        A post-merge fix: make skip_rear_comments operate on const uchar *s.
      sql/sql_lex.h:
        A post-merge fix.
      sql/sql_show.cc:
        A post-merge fix: fix a bad merge, rename orig_sql_command -> sql_command.
      sql/sql_trigger.cc:
        A post-merge fix: move security checks to process_triggers
        from execute_trigger.
      sql/sql_view.cc:
        Adjust to the new signature of skip_rear_comments.
      sql/sql_yacc.yy:
        Adjust to the new signature of init_strings.
      21e75cb0
  27. 24 Jul, 2006 1 commit
    • unknown's avatar
      Bug #16502: mysqlcheck gets confused with views · c4bfacd7
      unknown authored
        Make mysqlcheck skip over views when processing all of the tables in a
        database.
      
      
      client/mysqlcheck.c:
        Use SHOW TABLE STATUS to get table list, and skip over things that don't
        have an engine (like a VIEW).
      mysql-test/r/mysqlcheck.result:
        Add new results
      mysql-test/t/mysqlcheck.test:
        Add new regression test
      c4bfacd7
  28. 05 Jun, 2006 1 commit
    • unknown's avatar
      After merge fixes · 6c3babe5
      unknown authored
      Remove compiler warnings
      
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Fixed regex to get rid of xid= in output
      mysql-test/r/mysqlcheck.result:
        Drop client_test_db if mysql_client_test fails
      mysql-test/t/mysqlcheck.test:
        Drop client_test_db if mysql_client_test fails
      mysql-test/t/mysqldump.test:
        Use --defaults-file instead of --defaults-extra-file to avoid reading my.cnf files
      sql/event_scheduler.cc:
        Remove compiler warnings
      sql/ha_partition.cc:
        Don't divide with 0 when checking current auto_increment value
      sql/handler.cc:
        After merge fix
      sql/mysqld.cc:
        Remove comiler warning
      sql/partition_info.cc:
        After merge fix
        Fixed memory reference overrun for some wrong partition definitions
      sql/sql_base.cc:
        After merge fix
        Always set *leaves in setup_tables_and_check_access() (assume argument is always given).
      sql/sql_select.cc:
        Simple optimization
      sql/sql_show.cc:
        Remove compiler warning
      sql/sql_table.cc:
        After merge fix
      storage/csv/ha_tina.cc:
        Ensure table maps are restored properly
      storage/ndb/include/ndbapi/Ndb.hpp:
        Remove compiler warning
      6c3babe5
  29. 01 Mar, 2006 1 commit
  30. 24 Feb, 2006 1 commit
    • unknown's avatar
      This patch cleans up two tests which were a bit fragile from other failing... · 868cc7fd
      unknown authored
      This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.
      
      
      BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6:
        Delete: include/raid.h
      BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1:
        Delete: mysys/raid.cc
      BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c:
        Delete: mysys/raid2.c
      include/Makefile.am:
        Removing raid
      include/my_sys.h:
        Removing Raid
      include/myisam.h:
        Removing raid
      mysql-test/r/case.result:
        Cleaned up incomming tables
      mysql-test/r/mysqlcheck.result:
        new results
      mysql-test/t/case.test:
        Cleaned up test
      mysql-test/t/mysqlcheck.test:
        Cleaned up two tests.
      mysys/Makefile.am:
        Removed raid
      mysys/my_static.c:
        Removed raid
      storage/myisam/mi_check.c:
        Removed raid
      storage/myisam/mi_info.c:
        Removed raid bits.
      868cc7fd
  31. 19 Jan, 2006 1 commit
    • unknown's avatar
      WL1019: complete patch. Reapplied patch to the clean · 41536fce
      unknown authored
      tree to get rid of multiple typos in CS comments and
      unify the patch.
      
      
      configure.in:
        CSV is compiled in by default now
      include/my_base.h:
        add new ha_extra flag for the log tables
      mysql-test/include/im_check_os.inc:
        we should only run im tests if csv is on for now: im relies
        on mysqld options available only in csv build.
      mysql-test/include/system_db_struct.inc:
        check log tables structure
      mysql-test/lib/init_db.sql:
        create log tables when running tests.
      mysql-test/mysql-test-run.pl:
        Add old logs flag to IM tests. As IM could only deal with
        old logs (this feature is not needed with log tables)
      mysql-test/r/connect.result:
        update result
      mysql-test/r/csv.result:
        update result
      mysql-test/r/im_utils.result:
        update result
      mysql-test/r/information_schema.result:
        update result
      mysql-test/r/mysqlcheck.result:
        update result
      mysql-test/r/show_check.result:
        update result
      mysql-test/r/system_mysql_db.result:
        update result
      mysql-test/t/connect.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/csv.test:
        add tests for concurrent insert (the functionality is added
        to CSV in this patch)
      mysql-test/t/information_schema.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/mysqlcheck.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/show_check.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/system_mysql_db.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      mysql-test/t/system_mysql_db_fix.test:
        disable test if CSV engine is not in: result depends on the
        presence of CSV-based log tables
      scripts/mysql_create_system_tables.sh:
        new system tables: slow_log and general_log
      scripts/mysql_fix_privilege_tables.sql:
        add new log tables: use an SP to create them for
        non-csv build to work fine.
      sql/ha_myisam.cc:
        move locking-related checks to the hanlder
      sql/ha_myisam.h:
        new function declared
      sql/handler.h:
        new virtual function is added: we should check for handler-related
        locking issues in the handler
      sql/lock.cc:
        from now on we check for handler-related locking issues
        in the handler itself rather then in lock.cc
      sql/log.cc:
        Add log tables support, refactoring: there are log event
        handlers with common interface. They are used by the LOGGER
        class, which is responsible for their initialization, cleanup
        and managment. Logging to the tables provided by one of the
        log event handler types.
      sql/log.h:
        declare new log classes
      sql/log_event.cc:
        convert old logging routines calls to use new API
      sql/mysql_priv.h:
        define common log routines and objects
      sql/mysqld.cc:
        Add support for the log tables. Their initalization, cleanup
        and specific options.
      sql/share/errmsg.txt:
        add new error messages for the log tables
      sql/slave.cc:
        convert old logging routines calls to use new API
      sql/sql_base.cc:
        TABLE objects used by the logger should be skipped
        during refreshes (as log tables are always opened
        and locked). fix table_is_used to skip them.  This
        is needed for FLUSH LOGS to work
      sql/sql_db.cc:
        convert old logging routines calls to use new API
      sql/sql_delete.cc:
        fix TRUNCATE to work with log tables
      sql/sql_parse.cc:
        command_name is now an array of LEX_STRINGs
      sql/sql_prepare.cc:
        convert old logging routines calls to use new API
      sql/sql_show.cc:
        convert old logging routines calls to use new API
      sql/sql_table.cc:
        don't reoped the log tables for admin purposes
      sql/table.cc:
        mark log tables as such during the open
      sql/table.h:
        add log-related info
      storage/csv/ha_tina.cc:
        add support for concurrent insert (see bk commit - 5.1 tree
        (petr:1.1910) for standalone patch), add log tables-specific
        csv table handling.
      storage/csv/ha_tina.h:
        enable concurrent insert for CSV, add log table flag
      mysql-test/r/log_tables.result:
        New BitKeeper file ``mysql-test/r/log_tables.result''
      mysql-test/t/log_tables.test:
        New BitKeeper file ``mysql-test/t/log_tables.test''
      41536fce
  32. 12 Jan, 2006 1 commit
    • unknown's avatar
      wl2325 wl2324 · 4c798b42
      unknown authored
      mysql-test/include/have_ndb_extra.inc:
        New BitKeeper file ``mysql-test/include/have_ndb_extra.inc''
      mysql-test/include/not_ndb.inc:
        New BitKeeper file ``mysql-test/include/not_ndb.inc''
      mysql-test/r/have_ndb_extra.require:
        New BitKeeper file ``mysql-test/r/have_ndb_extra.require''
      mysql-test/r/ndb_alter_table_row.result:
        New BitKeeper file ``mysql-test/r/ndb_alter_table_row.result''
      mysql-test/r/ndb_alter_table_stm.result:
        New BitKeeper file ``mysql-test/r/ndb_alter_table_stm.result''
      mysql-test/r/ndb_binlog_basic.result:
        New BitKeeper file ``mysql-test/r/ndb_binlog_basic.result''
      mysql-test/r/ndb_binlog_multi.result:
        New BitKeeper file ``mysql-test/r/ndb_binlog_multi.result''
      mysql-test/r/ndb_multi_row.result:
        New BitKeeper file ``mysql-test/r/ndb_multi_row.result''
      mysql-test/r/not_ndb.require:
        New BitKeeper file ``mysql-test/r/not_ndb.require''
      mysql-test/r/rpl_ndb_bank.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_bank.result''
      mysql-test/r/rpl_ndb_basic.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_basic.result''
      mysql-test/r/rpl_ndb_disk.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_disk.result''
      mysql-test/r/rpl_ndb_idempotent.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_idempotent.result''
      mysql-test/r/rpl_ndb_load.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_load.result''
      mysql-test/r/rpl_ndb_multi.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_multi.result''
      mysql-test/r/rpl_ndb_sync.result:
        New BitKeeper file ``mysql-test/r/rpl_ndb_sync.result''
      mysql-test/r/rpl_row_basic_7ndb.result:
        New BitKeeper file ``mysql-test/r/rpl_row_basic_7ndb.result''
      mysql-test/t/ndb_alter_table_row.test:
        New BitKeeper file ``mysql-test/t/ndb_alter_table_row.test''
      mysql-test/t/ndb_alter_table_stm.test:
        New BitKeeper file ``mysql-test/t/ndb_alter_table_stm.test''
      mysql-test/t/ndb_binlog_basic.test:
        New BitKeeper file ``mysql-test/t/ndb_binlog_basic.test''
      mysql-test/t/ndb_binlog_multi.test:
        New BitKeeper file ``mysql-test/t/ndb_binlog_multi.test''
      mysql-test/t/ndb_multi_row.test:
        New BitKeeper file ``mysql-test/t/ndb_multi_row.test''
      mysql-test/t/rpl_ndb_bank.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_bank.test''
      mysql-test/t/rpl_ndb_basic.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_basic.test''
      mysql-test/t/rpl_ndb_disk.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_disk.test''
      mysql-test/t/rpl_ndb_idempotent.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_idempotent.test''
      mysql-test/t/rpl_ndb_load.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_load.test''
      mysql-test/t/rpl_ndb_multi.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_multi.test''
      mysql-test/t/rpl_ndb_sync.test:
        New BitKeeper file ``mysql-test/t/rpl_ndb_sync.test''
      mysql-test/t/rpl_row_basic_7ndb.test:
        New BitKeeper file ``mysql-test/t/rpl_row_basic_7ndb.test''
      sql/ha_ndbcluster_binlog.cc:
        New BitKeeper file ``sql/ha_ndbcluster_binlog.cc''
      sql/ha_ndbcluster_binlog.h:
        New BitKeeper file ``sql/ha_ndbcluster_binlog.h''
      sql/ha_ndbcluster_tables.h:
        New BitKeeper file ``sql/ha_ndbcluster_tables.h''
      sql/rpl_injector.cc:
        New BitKeeper file ``sql/rpl_injector.cc''
      sql/rpl_injector.h:
        New BitKeeper file ``sql/rpl_injector.h''
      storage/ndb/include/kernel/signaldata/DihFragCount.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/DihFragCount.hpp''
      4c798b42
  33. 11 Jan, 2006 1 commit
    • unknown's avatar
      WL #1034 (Internal CRON) pre-push fixes · b8ce8ad1
      unknown authored
      after another merge fixes.
      
      
      mysql-test/r/information_schema.result:
        WL #1034 (Internal CRON)
        fix result
      mysql-test/r/mysqlcheck.result:
        WL #1034 (Internal CRON)
        fix result
      mysql-test/r/sp.result:
        WL #1034 (Internal CRON)
        fix result
      sql/event.cc:
        after fixes for WL1012 fix these to be able to compile
      sql/event_timed.cc:
        after fixes for WL1012 fix these to be able to compile
      sql/share/errmsg.txt:
        readd error messages removed during manual update
      sql/sql_yacc.yy:
        fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
        merge. The merge wasn't good :(
      b8ce8ad1
  34. 06 Nov, 2005 1 commit
    • unknown's avatar
      WL#2575 - Fulltext: Parser plugin for FTS · 66002e45
      unknown authored
      WL#2763 - MySQL plugin interface: step 1
      Manual merge from CNET tree.
      
      
      include/ft_global.h:
        Default parser added.
      include/my_global.h:
        dlopen related code moved from sql_udf.cc into my_global.h
      include/myisam.h:
        Added fulltext parser to MI_KEYDEF
      libmysqld/Makefile.am:
        Added LIBDIR macro.
      mysql-test/r/connect.result:
        Test result fixed: added plugin table
      mysql-test/r/information_schema.result:
        Test result fixed: added plugin table.
      mysql-test/r/mysqlcheck.result:
        Test result fixed: added plugin table.
      mysql-test/r/system_mysql_db.result:
         Test fixed: added plugin table
      mysql-test/t/system_mysql_db_fix.test:
         Test fixed: added plugin table
      scripts/mysql_create_system_tables.sh:
        Added mysql.plugin table.
      scripts/mysql_fix_privilege_tables.sql:
        Added mysql.plugin table.
      sql/Makefile.am:
        Added LIBDIR macro.
      sql/ha_myisam.cc:
        Pass fulltext parser from sql to myisam layer.
      sql/lex.h:
        Plugin related symbols.
      sql/mysqld.cc:
        Initialize/deinitialize plugins, pass opt_plugin_dir.
        plugin-dir renamed to plugin_dir.
        plugin_dir is relative to mysql_home now.
      sql/set_var.cc:
        plugin_dir added to SHOW VARIABLES.
      sql/share/errmsg.txt:
        Plugin related error messages.
      sql/sql_class.h:
        Added parser to Key class.
        Hold parser_name instead of plugin in Key class.
      sql/sql_lex.h:
        INSTALL/UNINSTALL PLUGIN commands.
      sql/sql_parse.cc:
        INSTALL/UNINSTALL PLUGIN commands.
      sql/sql_show.cc:
        SHOW CREATE TABLE: output parser name if index was created WITH PARSER.
      sql/sql_table.cc:
        Pass fulltext parser from yacc to sql layer.
      sql/sql_udf.cc:
        dlopen related code moved into my_global.h.
        Implemented better check for UDF path.
        UDF loads libraries that are under plugin_dir now.
      sql/sql_yacc.yy:
        INSTALL/UNINSTALL PLUGIN syntax.
        Added WITH PARSER syntax to CREATE/ALTER TABLE/INDEX.
        opt_fulltext_parser must allocate memory, since it will be used afterwards.
      sql/table.cc:
        Save/restore fulltext parser in extra data segment.
        Added DBUG_PRINTs.
      storage/myisam/ft_boolean_search.c:
        Split functions so they can be used by fulltext parser.
        Use fulltext parser if specified.
      storage/myisam/ft_nlq_search.c:
        Use fulltext parser.
      storage/myisam/ft_parser.c:
        Split functions so they can be used by fulltext parser.
        Use fulltext parser if specified.
      storage/myisam/ft_static.c:
        Default fulltext parser added.
      storage/myisam/ft_update.c:
        Use fulltext parser.
      storage/myisam/ftdefs.h:
        FTB_PARAM moved into plugin.h and renamed to MYSQL_FTPARSER_BOOLEAN_INFO.
      storage/myisam/mi_open.c:
        Set default parser.
      66002e45
  35. 18 Oct, 2005 1 commit