summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge with 4.0 to get fix for hpuxmonty@mysql.com2004-05-285-4/+11
|\
| * Portability fix for HPUXmonty@mysql.com2004-05-282-2/+5
| * Always enable HAVE_COMPRESS on netwaremonty@mysql.com2004-05-281-0/+4
| * Portability fix for 32 bit file systemsmonty@mysql.com2004-05-282-1/+2
* | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1monty@mysql.com2004-05-281-39/+69
|\ \ | |/
| * Merged in some patches from Novell.jani@a80-186-24-72.elisa-laajakaista.fi2004-05-272-39/+74
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-284-6/+8
|\ \
| * | Remove some code from sql_yacc.cc that doesn't do anything except produce war...monty@mysql.com2004-05-282-6/+4
| * | merge with 4.0 to get fix to VC++ project filesmonty@mysql.com2004-05-273-2/+6
| |\ \ | | |/
| | * removed reference to not existing library lib_release\dbug.libmonty@mysql.com2004-05-272-2/+2
| | * backport bug#2708 fix from 4.1serg@serg.mylan2004-05-274-17/+32
* | | Made my_snprintf() behavior snprintf() compatible when printing %x arguments ...dlenev@brandersnatch.localdomain2004-05-2720-111/+98
* | | InnoDB cleanup:marko@hundin.mysql.fi2004-05-2733-432/+516
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2004-05-2721-9/+90
|\ \ \ | |/ / |/| |
| * | Merginghf@deer.(none)2004-05-2721-9/+90
| |\ \
| | * | WL#1163 (To make spatial code optional)hf@deer.(none)2004-03-152-0/+4
| | * | WL#1163 To make spatial code optionalhf@deer.(none)2004-03-1221-9/+86
* | | | Portability fixesmonty@mysql.com2004-05-272-3/+7
* | | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1monty@mysql.com2004-05-271-0/+4
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add back wrongly deleted filemonty@mysql.com2004-05-271-0/+4
* | | Added new netware filemonty@mysql.com2004-05-271-0/+1
* | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1monty@mysql.com2004-05-274-4/+29
|\ \ \ | |/ /
| * | netware files should always be in 'make dist'monty@mysql.com2004-05-274-5/+29
* | | After merge fixesmonty@mysql.com2004-05-273-10/+10
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-2721-387/+78
|\ \ \
| * \ \ merge with 4.0 to get windows fixesmonty@mysql.com2004-05-2721-387/+78
| |\ \ \ | | |/ /
| | * | VC++ portability fixmonty@mysql.com2004-05-263-7/+3
| | * | InnoDB fixup: remove debug assertion that causes compile errormarko@hundin.mysql.fi2004-05-261-2/+0
| | * | Fix to make Windows compilation smootherhf@deer.(none)2004-05-2613-43/+65
| | * | InnoDB cleanup: Remove unused code for online backupmarko@hundin.mysql.fi2004-05-266-351/+8
* | | | logging_ok:mysqldev@mysql.com2004-05-262-1/+7
|/ / /
* | | Fixed test to not crash when ndb is not in usemonty@mysql.com2004-05-261-0/+1
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-2625-121/+387
|\ \ \
| * | | Changed prototype of killed_ptr() to make it more portablemonty@mysql.com2004-05-2624-120/+386
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-261-1/+1
| |\ \ \
| | * \ \ Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1monty@mysql.com2004-05-261-1/+1
| | |\ \ \ | | | |/ /
| | | * | Added new header filesmonty@mysql.com2004-05-261-1/+1
* | | | | Small fix, addin order by to get predicatble output from selectmagnus@neptunus.(none)2004-05-262-3/+3
* | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1magnus@neptunus.(none)2004-05-2695-742/+1345
|\ \ \ \ \ | |/ / / /
| * | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-05-251-0/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Bug#3882joreland@mysql.com2004-05-251-0/+3
| * | | | merge with 4.0 to get Netware patches and fixes for libmysqld.dllmonty@mysql.com2004-05-2568-630/+1207
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-05-259-10/+329
| | |\ \ \
| | | * \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0hf@deer.(none)2004-05-269-10/+329
| | | |\ \ \
| | | | * | | Proposed fix for bug #3818 (libmysqld.dll leads to program's crash)hf@deer.(none)2004-05-269-10/+329
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-05-2545-123/+777
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Added patches from Novellmonty@mysql.com2004-05-2545-124/+778
| | * | | | | InnoDB cleanup and possible bug-fix: Remove srv0quemarko@hundin.mysql.fi2004-05-2514-502/+103
| * | | | | | Remove not needed sql_olap.cc from Makefile.ammonty@mysql.com2004-05-252-2/+2
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-251-3/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |