summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121msvensson@pilot.blaudden2007-03-291-1/+1
|\
| * Bug#24121 Incorrect test for SSL_VERIFY_SERVER_CERTmsvensson@pilot.blaudden2007-03-271-1/+1
* | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-261-5/+2
|\ \ | |/ |/|
| * Merge mysql.com:/home/ram/work/b25301/b25301.4.1ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-02-081-5/+2
| |\
| | * Fix for bug #25301: Non-zero dates with year 0000 are invalidramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-02-081-4/+1
* | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-051-1/+1
|\ \ \
| * \ \ Merge mysql.com:/home/ram/work/b23616/b23616.4.1ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-021-1/+1
| |\ \ \
| | * | | Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2006-12-261-1/+1
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-212-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/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
| |\ \ \ \ \
* | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-312-2/+2
* | | | | | | 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
| |\ \ \ \ \
| | * | | | | 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.0gkodinov@dl145s.mysql.com2006-11-272-12/+76
| |\ \ \ \ \ \
| | * | | | | | Added some missing DBUG_RETURNmonty@mysql.com/nosik.monty.fi2006-11-231-6/+70
| | * | | | | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-202-6/+6
| | |/ / / / /
| * | | | | | 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
| | |\ \ \ \ \ \
| | * | | | | | | 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-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
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintkaa@polly.local2006-10-111-22/+69
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Merge polly.local:/tmp/maint/bug11655/my41-bug11655kaa@polly.local2006-10-111-22/+69
| | | |\ \ \ \ \
* | | | \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/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
* | | | | | | | | | Use same type for function declaration and definitionmsvensson@neptunus.(none)2006-11-131-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rtanozdrin/alik@alik.2006-11-072-21/+71
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@shellback.(none)2006-10-121-21/+69
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug11655/my50-bug11655kaa@polly.local2006-10-121-21/+69
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | | * | | | | | | | Merge polly.local:/tmp/maint/bug11655/my41-bug11655kaa@polly.local2006-10-111-21/+69
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | | * | | | | | | Fixes a number of problems with time/datetime <-> string conversion functions:kaa@polly.local2006-10-041-22/+69
| | | | | |/ / / / / | | | | |/| | | | |
| * | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@shellback.(none)2006-10-121-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is calledmsvensson@shellback.(none)2006-10-121-0/+2
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191petr/cps@mysql.com/owlet.local2006-11-011-10/+115
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1"petr/cps@mysql.com/owlet.local2006-11-011-9/+115
| |/ / / / /