summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#...joerg@mysql.com2005-04-261-1/+1
|\
| * Step 2 of the switch to support configuration with NPTL:joerg@mysql.com2005-04-201-1/+1
* | Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable...jani@a193-229-222-105.elisa-laajakaista.fi2005-04-191-1/+2
* | Merge mysql.com:/home/cps/mysql/trees/mysql-4.1petr@mysql.com2005-04-141-9/+18
|\ \ | |/
| * post review fixpetr@mysql.com2005-04-141-9/+18
* | Proper handling of "utf8-general-cs" clollation: Missing parts in configuration.joerg@mysql.com2005-04-111-2/+2
|\ \ | |/
| * Add missing parts for the "Cybozu" custom build, to avoid future manual patches.joerg@mysql.com2005-04-081-2/+2
* | Fixed errors found during reviewmonty@mysql.com2005-04-061-1/+1
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-04-061-2/+2
|\ \
| * | Fixed errors descovered by valgrind 2.4monty@mysql.com2005-04-061-2/+2
* | | remove the rest of isam/merge referencesserg@serg.mylan2005-04-051-5/+17
|/ /
* | mergebar@mysql.com2005-03-291-0/+6
|\ \ | |/
| * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-03-291-0/+6
| |\
| | * Adding Cybozu's patch.bar@mysql.com2005-03-291-0/+6
* | | more merge fixespetr@mysql.com2005-03-291-8/+4
* | | manual mergepetr@mysql.com2005-03-291-11/+119
|\ \ \ | |/ /
| * | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1petr@mysql.com2005-03-291-14/+121
| |\ \ | | |/ | |/|
| | * Post-review fixes for "!include" patch originating from Yahoo! (the whole pat...petr@mysql.com2005-03-251-14/+121
* | | Manual mergekonstantin@mysql.com2005-03-262-1/+226
|\ \ \ | |/ /
| * | A fix for Bug#8226 "Cannot connect via shared memory": konstantin@mysql.com2005-03-262-1/+225
* | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-03-211-2/+5
|\ \ \
| * \ \ Manual merge of csets from -build tree into main 5.0 tree.dlenev@mysql.com2005-03-211-2/+5
| |\ \ \
| | * | | Eliminate warnings noticed by VC7. This includes fixing my_mmap() onjimw@mysql.com2005-03-181-2/+5
* | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-03-171-27/+48
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Field::quote_data():serg@serg.mylan2005-03-171-27/+48
| |/ / /
* | | | Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants...brian@zim.(none)2005-03-161-2/+1
|/ / /
* | | after merge fixesserg@serg.mylan2005-03-091-2/+4
* | | mergedserg@serg.mylan2005-03-092-5/+1
|\ \ \ | |/ /
| * | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-03-072-5/+3
| |\ \
| | * | Merge 4.0.24 compile changes into the 4.1 tree.joerg@mysql.com2005-03-071-37/+222
| | * | Manual merge of the 4.0.24 compile changes into the 4.1 tree.joerg@mysql.com2005-03-072-227/+40
| | |\ \ | | | |/ | | |/|
| * | | myisam/ft_parser.cserg@serg.mylan2005-03-061-1/+1
| |/ /
* | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0joerg@mysql.com2005-03-081-1/+1
|\ \ \
| * \ \ Merge changes.joerg@mysql.com2005-03-081-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Please the Sun C compiler by qualifying 'inline' as 'static inline'.joerg@mysql.com2005-03-041-2/+2
| | * | Qualify 'inline' functions as 'static inline' to please the Sun C compiler.joerg@mysql.com2005-03-041-3/+3
* | | | Fixed Bug#8922.jani@ua141d10.elisa.omakaista.fi2005-03-081-12/+4
|/ / /
* | | Clean up mergejimw@mysql.com2005-03-071-4/+12
|\ \ \
| * | | Avoid calls to my_seek() and my_tell() on log files so thatjimw@mysql.com2005-03-021-4/+12
* | | | Merge with after merge fixingo@mysql.com2005-03-041-4/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-03-041-4/+4
| |\ \ \
| | * \ \ mergeserg@serg.mylan2005-03-031-4/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2005-03-031-4/+4
| | | |\ \
| | | | * | Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)serg@serg.mylan2005-03-031-4/+4
| | | | |/
| | | * | mergeramil@mysql.com2005-02-251-2/+8
| | | |\ \ | | | | |/ | | | |/|
| | | | * A fix (bug #5056: defaults-extra-file throws no error when file is inaccessib...ram@gw.mysql.r18.ru2004-09-021-2/+8
* | | | | Merged from 4.1jimw@mysql.com2005-03-031-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8707jimw@mysql.com2005-03-031-1/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Don't try to create a symlink if the DATA DIRECTORY specified for a tablejimw@mysql.com2005-02-231-1/+6
* | | | | workaround for a bug removedserg@serg.mylan2005-03-021-7/+2