summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_1general.result
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5.5' into 10.0Sergei Golubchik2016-07-121-0/+2
|\
| * MDEV-10318 unset params in --ps --embeddedSergei Golubchik2016-07-121-0/+2
* | 10.0-monty mergeSergei Golubchik2013-07-211-2/+2
|\ \
| * | ps_1general fixed.unknown2013-07-031-2/+2
| * | merge with 5.5Sergei Golubchik2012-11-031-0/+11
| |\ \ | | |/
* | | remove dd_frm_type(), dd_frm_storage_engine(), dd_check_storage_engine_flag()Sergei Golubchik2013-04-091-1/+1
* | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-0/+11
|\ \ \ | |/ / |/| / | |/
| * MDEV-3804:unknown2012-10-111-0/+11
* | Fixes after Serg's review of %M extenstionsMichael Widenius2012-06-171-1/+1
* | Added text for errno in error messages by:Michael Widenius2012-05-301-1/+1
|/
* after merge changes:Sergei Golubchik2011-12-121-12/+12
* 5.3->5.5 mergeSergei Golubchik2011-11-271-2/+2
|\
| * Made the optimizer switch for index condition pushdown set to 'on' by default. Igor Babaev2011-11-211-2/+2
* | merge with 5.3Sergei Golubchik2011-10-191-4/+4
|\ \ | |/
| * Set the default to be mrr=off,mrr_sort_keys=off:Sergey Petrunya2011-07-081-2/+2
| * Make EXPLAIN better at displaying MRR/BKA:Sergey Petrunya2011-04-021-2/+2
* | merge.Sergei Golubchik2010-11-251-4/+4
|\ \ | |/
| * Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-2/+2
| * Merge MySQL->MariaDBSergey Petrunya2009-09-081-4/+4
| |\
| * | Added some changes inspired by Zardosht Kasheff:Michael Widenius2009-06-301-2/+2
* | | Patch for WL#3736: Extended Table, Column and Index Comments.Alexander Nozdrin2010-02-201-3/+3
* | | WL#2360 Performance schemaMarc Alff2010-01-111-0/+1
* | | Manual resolving for the following filesAndrei Elkin2009-12-011-2/+0
|\ \ \
| * | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-2/+0
| | |/ | |/|
* | | This is a backport of the two patches for Bug #28299: Staale Smedseng2009-10-091-0/+3
|/ /
* | Bug 43355 Prepared for commit on 5.1 gcaBernt M. Johnsen2009-04-011-4/+4
|\ \ | |/ |/|
| * Bug 43355 Prepared for commit on 5.0 gca Bernt M. Johnsen2009-03-311-4/+4
* | Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-061-2/+2
|\ \
| * \ Merge from 5.0-bugteam.Chad MILLER2008-08-151-2/+2
| |\ \ | | |/
| | * Bug#37301 Length and Max_length differ with no obvious reason(2nd version)Chad MILLER2008-08-151-2/+2
* | | Merge 5.1->5.1-rplMagnus Svensson2008-05-301-9/+10
|\ \ \ | |/ /
| * | Tentative implementation ofunknown2008-04-081-9/+10
* | | Add mtr databaseunknown2008-04-021-0/+1
|/ /
* | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optunknown2007-09-201-3/+3
|\ \ | |/
| * Bug#27747 database metadata doesn't return sufficient column default infounknown2007-09-201-3/+3
* | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-07-021-2/+2
|\ \ | |/
| * Follow up to the patch for the BUG#10491.unknown2007-06-291-2/+2
* | Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846unknown2007-06-221-0/+2
|\ \ | |/
| * Bug#28846 Use of undocumented Prepared Statements crashes serverunknown2007-06-221-0/+2
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-151-3/+3
|\ \
| * \ Merge vajra.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-05-111-3/+3
| |\ \ | | |/
| | * Cleanup: now that we have Lex_input_stream, finish the transitionunknown2007-05-111-3/+3
| * | Bug#24392 (SHOW ENGINE MUTEX STATUS is a synonym for SHOW INNODB STATUS)unknown2007-01-231-1/+3
* | | WL#2936unknown2007-03-021-1/+2
|/ /
* | Added --debug-info to most clients to detect memory leaks in mysql-test-rununknown2006-11-211-1/+0
* | Fix for bug #20665 All commands supported in Stored Proceduresunknown2006-08-231-12/+0
* | Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_mergeunknown2006-08-101-1/+1
|\ \ | |/
| * Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-08-021-1/+1
| |\
| | * bug 20317 (test fails in embedded for different number of threads isunknown2006-07-031-1/+1
| | * Bug#12817 SHOW STATUS now blob fieldsunknown2005-09-091-6/+6
View Lorry Controller Status