summaryrefslogtreecommitdiff
path: root/mysql-test/r/log_tables_upgrade.result
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-5/+6
|\
| * post-merge fixesSergei Golubchik2015-04-291-3/+4
| |
* | MDEV-6984 Can't migrate from MySQL 5.6.21 to MariaDB 10Sergei Golubchik2014-11-191-4/+5
| | | | | | | | | | | | | | | | in mysql_upgrade: do FLUSH PRIVILEGES at the end, not together with mysql_fix_privilege_tables mysql-test/t/mysql_upgrade-6984.opt: use a dummy second option to force server restart after the test
* | Automatic merge from 5.5Michael Widenius2014-08-191-3/+4
|\ \ | |/ | | | | Fixed 2 failing tests by replacing result files
* | MDEV-6535 Ordering of mysql_upgrade tasks is not optimalSergei Golubchik2014-08-061-7/+8
| | | | | | | | first update system tables, then the rest
* | 10.0-base merge (roles)Sergei Golubchik2013-10-291-0/+1
|\ \
| * | Fixes for mysql-test failuresSergei Golubchik2013-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/acl_roles_show_grants.result: one can do SHOW GRANTS for himself mysql-test/t/acl_roles_set_role-table-column-priv.test: correct error message mysql-test/t/acl_roles_show_grants.test: one can SHOW GRANTS for himself sql/sql_acl.cc: bugfixing: * don't assign with && - it can shortcut and the second assignment won't be executed * correct the test in check_grant_all_columns() - want_access should not be modified * sql/sql_cmd.h.OTHER: add new commands at the end sql/sql_db.cc: don't call acl_get() if all privileges are already satisfied (crashes when run with --skip-grants, because acl data stuctures aren't initialized) sql/sql_parse.cc: * test for current_user in get_current_user() * map explicitly specified user@host to current_user
* | | 10.0-monty mergeSergei Golubchik2013-07-211-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
| * | | Fix a number of tests:Sergey Petrunya2013-07-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - MariaDB does not have mysql.slave_master_info, mysql.slave_relay_log_info ,mysql.slave_worker_info or mysql.ndb_binlog_index tables. - Some tests expected to have these tables (this was an incorrect merge from 5.6, which merged necessary tables like mysql.innodb*stats, but also got these tables)
* | | | Merge 10.0-base -> 10.0unknown2013-05-281-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | MDEV-26: Global transaction ID.unknown2013-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change of user interface to be more logical and more in line with expectations to work similar to old-style replication. User can now explicitly choose in CHANGE MASTER whether binlog position is taken into account (master_gtid_pos=current_pos) or not (master_gtid_pos= slave_pos) when slave connects to master. @@gtid_pos is replaced by three separate variables @@gtid_slave_pos (can be set by user, replicated GTIDs only), @@gtid_binlog_pos (read only), and @@gtid_current_pos (a combination of the two, most recent GTID within each domain). mysql.rpl_slave_state is renamed to mysql.gtid_slave_pos to match. This fixes MDEV-4474.
* | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-0/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | MDEV-26: Global transaction IDunknown2013-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust full test suite to work with GTID. Huge patch, mainly due to having to update .result file for all SHOW BINLOG EVENTS and mysqlbinlog outputs, where the new GTID events pop up. Everything was painstakingly checked to be still correct and valid .result file updates.
* | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-0/+3
|\ \ \ | |/ / | | | | | | | | | Also fixed a bug in sql_update.cc: the code of mysql_update() lacked a call of set_statistics_for_table().
| * | Changed the names of the system tables for statistical data:Igor Babaev2012-12-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | table_stat -> table_stats column_stat -> column_stats index_stat -> index_stats to be in line with the names of innodb statistical tables from mysql-5.6: innodb_table_stats and innodb_index_stats.
| * | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+3
| |\ \ | | |/ | |/|
| | * The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-0/+3
| | | | | | | | | | | | lp:~igorb-seattle/mysql-server/mysql-azalea-wl4777.
* | | Fixing test casesMichael Widenius2012-08-231-0/+5
|/ / | | | | | | Added missing system tables used in 5.6
* | 5.5-mergeSergei Golubchik2011-07-021-0/+1
|\ \
| * | Bug #57916: Fix the naming of the proxy_priv tableGeorgi Kodinov2010-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | mergeGeorgi Kodinov2010-10-041-6/+2
| |\ \
| | * | Bug #56494 Segfault in upgrade_shared_lock_to_exclusive() forJon Olav Hauglid2010-09-221-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-0/+1
| |/ / | | | | | | | | | | | | Merged the implementation to a new base tree.
* | | lots of post-merge changesSergei Golubchik2011-04-251-0/+1
| |/ |/|
* | Fixed build failuresMichael Widenius2010-09-061-6/+9
|/ | | | | | | | | | | | | | | | | | | | | | Cleaned up mysql_upgrade --help and mysqlcheck --help client/mysql_upgrade.c: Increased version number. Marked all options that are not used 'Not used'. Don't write 'Looking for tool' if not using --verbose client/mysqlcheck.c: Cleanup output for --help Reset not initialzed variable mysql-test/r/log_tables_upgrade.result: Updated results mysql-test/r/mysql_upgrade.result: Updated results mysql-test/r/mysqlcheck.result: Updated results mysql-test/t/log_tables_upgrade.test: mysql_upgrade is now run without --skip-verbose mysql-test/t/mysql_upgrade.test: mysql_upgrade is now run without --skip-verbose
* Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULLDavi Arnaut2010-02-261-0/+47
The problem was that the CSV storage engine does not support NULL fields, yet in some early 5.1 version the log tables (general_log and slow_log) were created with null fields. On top of this, when altering a CSV table column, all fields of the table must be NOT NULL otherwise the alteration fails. The solution is to ensure that during upgrade all columns of the log tables are NOT NULL. mysql-test/r/log_tables_upgrade.result: Add test case result for Bug#49823. mysql-test/std_data/bug49823.CSV: Sample data for test. mysql-test/std_data/bug49823.frm: Add a CSV table which mimics the general_log table, except that it contains a nullable column. mysql-test/t/log_tables_upgrade.test: Add test case for Bug#49823. scripts/mysql_system_tables_fix.sql: Ensure that all columns of the log tables are NOT NULL.