summaryrefslogtreecommitdiff
path: root/mysql-test/r/system_mysql_db_fix40123.result
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-14013 : sql_mode=EMPTY_STRING_IS_NULLhalfspawn2017-10-141-2/+2
|
* store/show vcols as item->print()Sergei Golubchik2016-12-121-7/+7
| | | | | | | | | | otherwise we'd need to store sql_mode *per vcol* (consider CREATE INDEX...) and how SHOW CREATE TABLE would support that? Additionally, get rid of vcol::expr_str, just to make sure the string is always generated and never leaked in the original form.
* do not quote numbers in the DEFAULT clause in SHOW CREATESergei Golubchik2016-08-271-7/+7
|
* Part of MDEV-10134 Add full support for DEFAULTMichael Widenius2016-06-301-2/+2
| | | | | | | Print default values for BLOB's. This is a part commit for automatic changes to make the real commit smaller. All changes here are related to that we now print DEFAULT NULL for blob and text fields, like we do for all other fields.
* Merge branch '10.0' into 10.1Sergei Golubchik2015-11-191-2/+2
|\
| * Fixed buildbot failures with system_mysql_db_fixMonty2015-11-141-2/+2
| |
* | Revert "MDEV-6069: Remove old logic for 3.23-to-higher upgrades from upgrade ↵Nirbhay Choubey2015-11-031-0/+314
| | | | | | | | | | | | SQL scripts" This reverts commit f8381d9382b02a53fc3a9fd0f8457c5668e9491c.
* | MDEV-6069: Remove old logic for 3.23-to-higher upgrades from upgrade SQL scriptsNirbhay Choubey2015-03-191-314/+0
| | | | | | | | | | | | | | | | Fix for failing tests. * Update mysql_system_tables_fix.sql to makeup the differences in system tables in 5.1.17 (main.system_mysql_db_fix50117) * Removed system_mysql_db tests for versions 5.0.30 & 4.1.23.
* | update result filesSergei Golubchik2014-12-011-1/+2
| |
* | MDEV 4427: query timeoutsMonty2014-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added MAX_STATEMENT_TIME user variable to automaticly kill queries after a given time limit has expired. - Added timer functions based on pthread_cond_timedwait - Added kill_handlerton() to signal storage engines about kill/timeout - Added support for GRANT ... MAX_STATEMENT_TIME=# - Copy max_statement_time to current user, if stored in mysql.user - Added status variable max_statement_time_exceeded - Added KILL_TIMEOUT - Removed digest hash from performance schema tests as they change all the time. - Updated test results that changed because of the new user variables or new fields in mysql.user This functionallity is inspired by work done by Davi Arnaut at twitter. Test case is copied from Davi's work. Documentation can be found at https://kb.askmonty.org/en/how-to-limittimeout-queries/ mysql-test/r/mysqld--help.result: Updated for new help message mysql-test/suite/perfschema/r/all_instances.result: Added new mutex mysql-test/suite/sys_vars/r/max_statement_time_basic.result: Added testing of max_statement_time mysql-test/suite/sys_vars/t/max_statement_time_basic.test: Added testing of max_statement_time mysql-test/t/max_statement_time.test: Added testing of max_statement_time mysys/CMakeLists.txt: Added thr_timer mysys/my_init.c: mysys/mysys_priv.h: Added new mutex and condition variables Added new mutex and condition variables mysys/thr_timer.c: Added timer functions based on pthread_cond_timedwait() This can be compiled with HAVE_TIMER_CREATE to benchmark agains timer_create()/timer_settime() sql/lex.h: Added MAX_STATEMENT_TIME sql/log_event.cc: Safety fix (timeout should be threated as an interrupted query) sql/mysqld.cc: Added support for timers Added status variable max_statement_time_exceeded sql/share/errmsg-utf8.txt: Added ER_QUERY_TIMEOUT sql/signal_handler.cc: Added support for KILL_TIMEOUT sql/sql_acl.cc: Added support for GRANT ... MAX_STATEMENT_TIME=# Copy max_statement_time to current user sql/sql_class.cc: Added timer functionality to THD. Added thd_kill_timeout() sql/sql_class.h: Added timer functionality to THD. Added KILL_TIMEOUT Added max_statement_time variable in similar manner as long_query_time was done. sql/sql_connect.cc: Added handling of max_statement_time_exceeded sql/sql_parse.cc: Added starting and stopping timers for queries. sql/sql_show.cc: Added max_statement_time_exceeded for user/connects status in MariaDB 10.0 sql/sql_yacc.yy: Added support for GRANT ... MAX_STATEMENT_TIME=# syntax, to be enabled in 10.0 sql/structs.h: Added max_statement_time user resource sql/sys_vars.cc: Added max_statement_time variables mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test Removed test as we require all fields in mysql.user table. scripts/mysql_system_tables.sql scripts/mysql_system_tables_data.sql scripts/mysql_system_tables_fix.sql Updated mysql.user with new max_statement_time field
* | cleanup and updated test resultsSergei Golubchik2014-07-231-0/+1
|/
* MDEV-5275 Problems upgrading from MySQL 5.1 to MariaDBSergei Golubchik2013-11-131-11/+14
| | | | | correct bugs in mysql_system_tables_fix.sql. Update system_mysql_db_fix* tests
* merge 10.0-base into 10.0Sergei Golubchik2013-11-041-4/+4
|\
| * MDEV-4332 Increase username length from 16 charactersSergei Golubchik2013-11-031-4/+4
| | | | | | | | 10.0 part of the task, fix system tables
* | 10.0-base merge (roles)Sergei Golubchik2013-10-291-0/+2
|\ \ | |/
| * fix mysql_upgrade to preserve the collation of mysql.user.is_role Sergei Golubchik2013-10-181-1/+1
| |
| * Fixes for mysql-test failuresSergei Golubchik2013-10-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-6/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | MDEV-4757 Change mysql.slow_log.event_time from TIMESTAMP to TIMESTAMP(6)Sergei Golubchik2013-07-151-1/+1
| | |
| * | Fix a number of tests:Sergey Petrunya2013-07-051-7/+5
| | | | | | | | | | | | | | | | | | | | | - 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/+34
|\ \ | |/ | | | | | | Also fixed a bug in sql_update.cc: the code of mysql_update() lacked a call of set_statistics_for_table().
| * Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+34
| |\
| | * Changed the names of the system tables for statistical data:Igor Babaev2012-12-051-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+34
| | |
* | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-2/+2
|\ \ \ | |/ /
| * | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalized support for auto-updated and/or auto-initialized timestamp and datetime columns. This patch is a reimplementation of MySQL's "WL#5874: CURRENT_TIMESTAMP as DEFAULT for DATETIME columns". In order to ease future merges, this implementation reused few function and variable names from MySQL's patch, however the implementation is quite different. TODO: The only unresolved problem in this patch is the semantics of LOAD DATA for TIMESTAMP and DATETIME columns in the cases when there are missing or NULL columns. I couldn't fully comprehend the logic behind MySQL's behavior and its relationship with their own documentation, so I left the results to be more consistent with all other LOAD cases. The problematic test cases can be seen by running the test file function_defaults, and observing the test case differences. Those were left on purpose for discussion.
* | Fixing test casesMichael Widenius2012-08-231-0/+5
|/ | | | Added missing system tables used in 5.6
* remove few obscure, unused, or misused mtr featuresSergei Golubchik2012-02-061-0/+268
View Lorry Controller Status