summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge with 4.0 to get security fixes and latest bug fixesmonty@mashka.mysql.fi2004-02-20112-49895/+2328
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-02-199-52/+68
| |\
| | * Fixed usage of strxnmov() in recent changesetsmonty@mysql.com2004-02-196-49/+59
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-02-193-3/+9
| | |\
| | | * crease number of open files to 2048 on windowsmonty@mysql.com2004-02-192-2/+4
| | | * Added commentmonty@mysql.com2004-02-161-1/+5
| * | | Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0greg@mysql.com2004-02-1989-49781/+122
| |\ \ \ | | |/ /
| | * | Merge heikki@build.mysql.com:/home/bk/mysql-4.0heikki@hundin.mysql.fi2004-02-191-1/+1
| | |\ \
| | | * | que0que.c:heikki@hundin.mysql.fi2004-02-191-1/+1
| | * | | srv_add_path_separator_if_needed: be static; use memcpy, not sprintfmarko@hundin.mysql.fi2004-02-192-25/+10
| | * | | Remove unnecessary files and functionsmarko@hundin.mysql.fi2004-02-198-7030/+8
| | * | | Many files:marko@hundin.mysql.fi2004-02-1910-72/+72
| | * | | Remove unnecessary filesmarko@hundin.mysql.fi2004-02-1961-42628/+1
| | |/ /
| | * | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-02-197-25/+30
| | |\ \
| | | * | potential problem fixed afer some reasoningserg@serg.mylan2004-02-197-25/+30
| * | | | First round of changes to set up for Windows build automation.greg@mysql.com2004-02-1916-89/+2148
| * | | | Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0greg@mysql.com2004-02-194-2/+14
| |\ \ \ \ | | |/ / /
| | * | | - Make sure to set the correct compile flags for Mac OS X 10.3 "Panther"lenz@mysql.com2004-02-191-0/+9
| | * | | fix for the bug #2786 incorrect precedence for XOR operatorram@gw.mysql.r18.ru2004-02-163-2/+5
| * | | | Mergegreg@mysql.com2004-02-1914-96/+147
| |\ \ \ \ | | |/ / /
| | * | | Merge heikki@build.mysql.com:/home/bk/mysql-4.0heikki@hundin.mysql.fi2004-02-161-0/+4
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | ha_innodb.cc:heikki@hundin.mysql.fi2004-02-161-0/+4
| * | | | Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0greg@mysql.com2004-02-1010-85/+228
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0greg@mysql.com2004-02-0941-1829/+3456
| |\ \ \ \
| * \ \ \ \ Mergegreg@mysql.com2004-02-0947-534/+993
| |\ \ \ \ \
| * \ \ \ \ \ Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0greg@mysql.com2004-01-302-5/+8
| |\ \ \ \ \ \
| | * | | | | | Revise Windows build script, correct comment re NetWare in libmysql.cgreg@mysql.com2004-01-212-5/+8
* | | | | | | | Safety fixes (strnmov -> strmake)monty@mysql.com2004-02-203-13/+18
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mashka.mysql.fi2004-02-197-76/+341
|\ \ \ \ \ \ \ \
| * | | | | | | | Many files:heikki@hundin.mysql.fi2004-02-197-76/+341
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mashka.mysql.fi2004-02-1917-179/+224
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Max open files handling moved to my_set_max_open_files()monty@mashka.mysql.fi2004-02-1917-179/+224
* | | | | | | | | trx0sys.c:heikki@hundin.mysql.fi2004-02-191-62/+0
* | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2004-02-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | - fixed C++-style comment in strings/strtod.c which caused a compilelenz@kallisto.local2004-02-181-1/+1
* | | | | | | | | | hpux-friendly isinf-detectionserg@serg.mylan2004-02-181-18/+21
* | | | | | | | | | libtool tweaksserg@serg.mylan2004-02-172-1/+4
|/ / / / / / / / /
* | | | | | | | | missing semicolonserg@serg.mylan2004-02-172-2/+2
* | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2004-02-1720-68/+229
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | if a key length exceeds the supported maximum and it is safe to auto-decrease...serg@serg.mylan2004-02-1710-35/+66
| * | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2004-02-1610-33/+163
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ft_boolean_syntax made changeableserg@serg.mylan2004-02-1610-33/+163
* | | | | | | | | | | Fix test resultsmonty@mysql.com2004-02-171-1/+0
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1bell@sanja.is.com.ua2004-02-171-1/+6
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1wax@mysql.com2004-02-171-1/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | correct cleaning of TZwax@kishkin.ru2004-02-171-1/+6
| | |/ / / / / / / / /
* | | | | | | | | | | changed to moderm syntax (after merge fix)bell@sanja.is.com.ua2004-02-172-4/+2
* | | | | | | | | | | mergebell@sanja.is.com.ua2004-02-1715-87/+68
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-02-1715-79/+68
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its ow...bell@sanja.is.com.ua2004-02-1715-79/+68