summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* Remove dead code: flush_version was never increased in the server,unknown2007-03-011-1/+1
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-141-1/+3
|\
| * Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-02-131-1/+3
| |\
| | * Post-merge fix.unknown2007-02-131-1/+1
| | * Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-131-1/+3
| | |\
| | | * Bug#24630 Subselect query crashes mysqldunknown2007-02-121-1/+2
| | | * Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records wereunknown2007-02-071-0/+1
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2007-02-131-33/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-02-131-33/+33
| |\ \ \
| | * | | Reverting previous change from 1L -> 1ULL and LL(1) -> 1ULL and unknown2007-02-021-33/+33
| * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2007-02-061-1/+2
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-311-1/+5
| |\ \ \
| * \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-01-311-0/+1
| |\ \ \ \
| * \ \ \ \ Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943unknown2007-01-291-0/+3
| |\ \ \ \ \
* | \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2007-02-061-5/+6
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-031-4/+4
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-01-291-4/+4
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.0unknown2007-01-271-4/+4
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-221-4/+4
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-151-4/+4
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:unknown2006-12-151-4/+4
| * | | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optunknown2007-02-021-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-01-311-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | | * | | | | | | | BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-joinunknown2007-01-311-1/+2
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-01-311-34/+39
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-01-311-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-01-311-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/ram/work/b19690/b19690.5.0unknown2007-01-311-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | / | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | * | | | | | | | Merge mysql.com:/home/ram/work/b19690/b19690.4.1unknown2007-01-311-0/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | fix for bug #19690: ORDER BY eliminates rows from the resultunknown2007-01-311-0/+1
| | | | | * | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rplunknown2007-01-171-0/+2
| | | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtimeunknown2007-01-151-12/+7
| | | | | |\ \ \ \ \ \ \ \
| * | | | | \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-01-291-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943unknown2007-01-291-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943unknown2007-01-291-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Bug#22943 syscall pruning in libmysqlunknown2007-01-291-0/+2
| | | | |/ / / / / / / /
| * | | | | | | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maintunknown2007-01-261-34/+35
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gcaunknown2007-01-261-33/+39
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Bug #25879: THD::options isn't set with ulonglong values and \unknown2007-01-261-33/+39
* | | | | | | | | | | Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12unknown2007-01-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-01-241-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | BUG#24127: (a,b) IN (SELECT c,d ...) can produce wrong results if a and/or b ...unknown2007-01-121-1/+1
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2007-01-231-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rplunknown2007-01-171-1/+5
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rplunknown2007-01-121-1/+5
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.0-rplunknown2006-12-081-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rplunknown2006-12-081-1/+5
| | | | |\ \ \ \ \ \ \ \ \
| * | | | \ \ \ \ \ \ \ \ \ Manual merge.unknown2007-01-151-10/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge bodhi.local:/opt/local/work/mysql-4.1-4968unknown2006-12-121-10/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | / / / / | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | A fix and test cases forunknown2006-12-081-12/+7