summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps.result
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2006-12-041-2/+2
|\
| * Merge amd64.:D:/src/mysql-5.1-maintunknown2006-11-171-14/+0
| |\
| | * Bug#23983 ps.test fails to open shared library.unknown2006-11-171-14/+0
| * | Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBRunknown2006-11-171-2/+2
| |/
* | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1unknown2006-11-301-0/+18
|\ \
| * \ Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-optunknown2006-11-291-0/+18
| |\ \
| | * \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-291-0/+18
| | |\ \
| | | * | Bug#20327: Marking of a wrong field leads to a wrong result on select with view,unknown2006-11-291-0/+18
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-291-14/+0
|\ \ \ \ \ | |/ / / /
| * | | | Bug#23983 ps.test fails to open shared libraryunknown2006-11-201-14/+0
| | |_|/ | |/| |
* | | | Update after merge.unknown2006-11-211-0/+6
* | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159unknown2006-11-211-49/+52
|\ \ \ \
| * | | | Fix after manual merge.unknown2006-11-211-6/+6
| * | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159unknown2006-11-211-55/+58
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | BUG#23159: prepared_stmt_count should be status variableunknown2006-11-211-49/+52
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-021-0/+97
| | |\ \ \
| | | * \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtimeunknown2006-10-101-0/+97
| | | |\ \ \
| | * | \ \ \ Merge mysql.com:/usr/home/bar/mysql-4.1.b8663unknown2006-10-031-7/+7
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Bug#8663 cant use bgint unsigned as input to castunknown2006-06-141-7/+7
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-021-0/+17
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50unknown2006-10-161-0/+17
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0unknown2006-10-191-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0unknown2006-10-101-1/+97
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-10-021-0/+47
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)unknown2006-11-161-0/+46
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge alik.:/mnt/raid/alik/MySQL/devel/5.1unknown2006-11-071-8/+40
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-021-8/+40
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update ps and show_check results to account for new -master.opt settings.unknown2006-10-171-8/+23
| | * | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50unknown2006-10-161-0/+17
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Bug #19764: SHOW commands end up in the slow log as table scansunknown2006-10-121-0/+17
| | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | BUG#21524 ER_CANT_OPEN_LIBRARY output message used to confuse mysqltest on So...unknown2006-10-111-3/+3
| | * | | | | | | | BUG#21524 ps.test updated to meet recent changes in SQL parserunknown2006-10-111-222/+239
* | | | | | | | | | Post merge fixunknown2006-11-021-2/+4
|/ / / / / / / / /
* | | | | | | | | A post-merge fix.unknown2006-11-021-98/+97
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-021-0/+98
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21856unknown2006-10-191-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | BUG#21856: Prepared Statements: crash if bad createunknown2006-10-191-0/+1
| * | | | | | | | | Fix after manual merge.unknown2006-10-101-238/+97
| * | | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21354unknown2006-10-101-0/+237
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21354unknown2006-10-101-1/+97
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | BUG#21354: (COUNT(*) = 1) not working in SELECT inside preparedunknown2006-10-101-0/+97
* | | | | | | | BUG#21524 ps.test updated to meet recent changes in SQL parserunknown2006-10-111-222/+239
|/ / / / / / /
* | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2006-10-031-0/+48
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/50unknown2006-09-291-0/+48
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Post-merge corrections.unknown2006-09-191-49/+49
| | * | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1-optunknown2006-09-191-2/+49
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | | | |_|/ / | | | |/| | |
| | | * | | | Fixed bug #22085: Crash on the execution of a prepared unknown2006-09-161-0/+47
| | | |/ / /
* | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21081unknown2006-09-271-0/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | BUG#21081: SELECT inside stored procedure returns wrong resultsunknown2006-09-271-0/+21
| |/ / /
* | | | Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemergeunknown2006-08-301-0/+15
|\ \ \ \ | |/ / /