summaryrefslogtreecommitdiff
path: root/mysql-test/t/union-master.opt
Commit message (Collapse)AuthorAgeFilesLines
* Merge with base Maria treeMichael Widenius2008-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Remove warnings from test logs about depricated options mysql-test/t/events_logs_tests-master.opt: Remove warnings from test logs about depricated options mysql-test/t/log_tables-big-master.opt: Remove warnings from test logs about depricated options mysql-test/t/log_tables-master.opt: Remove warnings from test logs about depricated options mysql-test/t/multi_statement-master.opt: Remove warnings from test logs about depricated options mysql-test/t/ps-master.opt: Remove warnings from test logs about depricated options mysql-test/t/show_check-master.opt: Remove warnings from test logs about depricated options mysql-test/t/slow_query_log_file_basic-master.opt: Remove warnings from test logs about depricated options mysql-test/t/slow_query_log_file_func-master.opt: Remove warnings from test logs about depricated options mysql-test/t/union-master.opt: Remove warnings from test logs about depricated options sql/mysqld.cc: Don't give warnings for empty log file names
* QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from ↵unknown2003-12-061-0/+1
thd->lex.select_lex->options to thd->server_status mysql-test/r/union.result: union and slow log tests mysql-test/t/union.test: union and slow log tests