summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2007-02-062-31/+32
|\
| * Fixed problems detected by pushbuildmonty@mysql.com/narttu.mysql.fi2007-01-301-1/+1
| * Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-272-30/+31
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-222-30/+31
| | |\
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-152-30/+31
| | | |\
| | | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-152-30/+31
* | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943msvensson@pilot.mysql.com2007-01-291-1/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943msvensson@pilot.mysql.com2007-01-291-1/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Bug#22943 syscall pruning in libmysqlmsvensson@pilot.mysql.com2007-01-291-1/+7
| | * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-281-0/+2
| | |\ \ \
| | * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-241-9/+115
| | |\ \ \ \
| | * \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-11-221-1/+4
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-312-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-312-2/+2
* | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-235-10/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-235-10/+5
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-042-10/+10
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fixed portability issue in my_thr_init.c (was added in my last push)monty@mysql.com/narttu.mysql.fi2006-11-302-10/+10
| * | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-282-14/+80
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-11-271-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-11-272-12/+76
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-11-171-2/+2
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge macbook.gmz:/Users/kgeorge/mysql/work/B19216-4.1-optgkodinov/kgeorge@macbook.gmz2006-11-131-0/+2
| | | |\ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-11-221-1/+3
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-12-041-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-11-292-14/+80
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintramil/ram@myoffice.izhnet.ru2006-11-221-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug21789/my50-bug21789ramil/ram@myoffice.izhnet.ru2006-11-221-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789ramil/ram@mysql.com/myoffice.izhnet.ru2006-11-221-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Fix for bug #21789: DATETIME with 0000-00-00 11:22:33 should be invalid, but ...ramil/ram@mysql.com/myoffice.izhnet.ru2006-10-041-1/+4
| * | | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Use same type for function declaration and definitionmsvensson@neptunus.(none)2006-11-131-1/+1
* | | | | | | | | | | | | | | Don't abort if we call my_thread_end() multiple timesmonty@mysql.com/narttu.mysql.fi2006-11-301-3/+3
* | | | | | | | | | | | | | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-302-13/+12
* | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-11-291-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Added back sql-bench directory, so that one can more easily run benchmarks on...monty@mysql.com/narttu.mysql.fi2006-11-291-1/+7
* | | | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0kent@kent-amd64.(none)2006-11-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | / / / / | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Fix my_system_gmt_sec function declaration to be same as definitionmsvensson@neptunus.(none)2006-11-231-1/+1
| | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-11-282-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@deer.(none)2006-11-171-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/mysql-5.0.cleanholyfoot/hf@deer.(none)2006-11-081-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | bug #19491 (5.0-related additional fixes)holyfoot/hf@mysql.com/deer.(none)2006-11-061-2/+2
| * | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-5.0-mrgholyfoot/hf@deer.(none)2006-11-171-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | / / / / / / | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-4.1-mrgholyfoot/hf@mysql.com/deer.(none)2006-11-161-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-11-161-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / | | | | |/| | | | | | | / | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | | * | | | | | | | Bug #19216: Client crashes on long SELECTgkodinov/kgeorge@macbook.gmz2006-11-131-0/+2
| | | * | | | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1petr/cps@outpost.site2006-11-101-9/+115
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-maintmsvensson@shellback.(none)2006-10-121-0/+2
| | | |\ \ \ \ \ \ \ \ \