summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@a88-113-38-195.elisa-laajakaista.fi2007-04-132-221/+17
|\
| * my_memmem.c:kent@mysql.com/kent-amd64.(none)2007-04-111-1/+17
| * Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-04-071-220/+0
| |\
| | * Merge mysql.com:/home/kent/bk/sotest/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-04-051-220/+0
| | |\
| | | * Deleted reject files accidently checked inkent@mysql.com/kent-amd64.(none)2007-04-051-220/+0
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2007-04-125-96/+64
|\ \ \ \ | |/ / /
| * | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-04-025-96/+64
| |\ \ \ | | |/ / | |/| |
| | * | Merge polly.local:/tmp/maint/bug26844/my50-bug26844kaa@polly.local2007-03-282-3/+3
| | |\ \
| | | * | Fix for bug #26844 "Memory allocation failures ignored by slave IO thread".kaa@polly.local2007-03-262-3/+3
| | * | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-233-93/+61
| | |\ \ \
| | | * \ \ Merge pilot.blaudden:/home/msvensson/mysql/bug26233/my50-bug26233msvensson@pilot.blaudden2007-03-233-93/+61
| | | |\ \ \
| | | | * | | Bug#26233 very suspect code in mf_tempfile.c, in function create_temp_file()msvensson@pilot.blaudden2007-03-233-93/+61
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelserg@janus.mylan2007-04-025-16/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-mainjani@ua141d10.elisa.omakaista.fi2007-03-285-16/+15
| |\ \ \ \ \ \
| | * | | | | | Fixes for 4.1 to be as in 5.0 and above.jani@ua141d10.elisa.omakaista.fi2007-03-271-1/+2
| | * | | | | | Fixed compiler warnings.jani@ua141d10.elisa.omakaista.fi2007-03-2227-94/+107
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-enginessvoj@mysql.com/april.(none)2007-03-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | BUG#25521 - optimize table, delete, show table status leads to tablesvoj@mysql.com/april.(none)2007-03-281-1/+1
* | | | | | | Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1serg@sergbook.mysql.com2007-03-231-0/+4
|\ \ \ \ \ \ \
| * | | | | | | reverted linuxthreads thr_client_alarm fix (not future-proof)serg@sergbook.mysql.com2007-03-231-0/+4
* | | | | | | | Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1serg@sergbook.mysql.com2007-03-231-4/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1serg@sergbook.mysql.com2007-03-231-4/+0
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | move thr_client_alarm initialization to mysqld.ccserg@sergbook.mysql.com2007-03-231-4/+0
* | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-03-231-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-03-221-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Bug#23736 Pointer free error in mysqlbinlogiggy@recycle.(none)2007-03-202-11/+6
| |_|_|/ / / |/| | | | |
* | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50tsmith@quadxeon.mysql.com2007-03-194-512/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Makefile.am, CMakeLists.txt:kent@mysql.com/kent-amd64.(none)2007-03-122-2/+2
| * | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-03-123-510/+1
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.0kent@mysql.com/kent-amd64.(none)2007-03-123-511/+1
| | |\ \ \
| | | * | | Makefile.am, configure.in, mysys.dsp:kent@mysql.com/kent-amd64.(none)2007-03-123-511/+1
| | * | | | After-merge fix:joerg@trift2.2007-02-201-0/+1
| | * | | | Merge trift2.:/MySQL/M40/clone-4.0joerg@trift2.2007-02-201-1/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix a linkage problem with the previous patch for "thr_client_alarm".joerg@trift2.2007-02-122-1/+1
| | | * | | Break a double declare of "uint thr_client_alarm" between "mysys/thr_alarm.c"...joerg@trift2.2007-02-121-1/+0
| | | * | | Compile error on Windows: Signal names are undefined. Fix by hiding the whole...joerg@trift2.2007-02-121-0/+3
| | * | | | Merge siva.hindu.god:/home/tsmith/m/bk/41tsmith@siva.hindu.god2007-02-081-1/+0
| | |\ \ \ \
| | | * \ \ \ Merge 192.168.0.10:mysql/mysql-4.1-maintmsvensson@pilot.mysql.com2007-02-061-1/+0
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintcmiller@zippy.cornsilk.net2007-01-311-1/+0
| | | | |\ \ \
| | | | | * | | User visible change - breaks some environments, per Paul DuBois. Reverting in...mtaylor@qualinost.(none)2007-01-261-1/+0
| | * | | | | | Test and bug fixes and removed unneccessary files.jani@a88-113-38-195.elisa-laajakaista.fi2007-02-051-0/+1
| | |/ / / / /
* | | | | | | Merge naruto.:C:/cpp/bug25042/my50-bug25042Kristofer.Pettersson@naruto.2007-03-091-38/+111
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bug#25042 OPTIMIZE TABLE cause race condition in IO CACHE SHAREKristofer.Pettersson@naruto.2007-02-151-38/+111
* | | | | | | Bug#25222 Win32 HANDLE leak in my_sopen()iggy@recycle.(none)2007-03-071-1/+6
* | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-03-0110-50/+57
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-226-7/+13
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-215-43/+44
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-225-43/+44
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-155-43/+44
| | | |\ \ \ \ \ \
| | | | * | | | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-155-43/+44