summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge 4.1 -> 5.0gluh@gluh.mysql.r18.ru2005-03-171-0/+2
|\
| * Partly reverty back patch (in heap-auto-increment-key detection) to ensure th...monty@mysql.com2005-03-161-0/+2
* | sun forte does not define __sun__, only __sun and sun (gcc defines all the th...serg@serg.mylan2005-03-151-1/+1
* | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-03-152-1/+16
|\ \
| * | include/my_global.hserg@serg.mylan2005-03-152-1/+16
* | | mergingramil@mysql.com2005-03-151-1/+1
|\ \ \ | |/ / |/| / | |/
| * A fix (bug #8489: Strange auto_increment behaviour with HEAP table).ramil@mysql.com2005-03-151-1/+1
| * Manual merge of the 4.0.24 compile changes into the 4.1 tree.joerg@mysql.com2005-03-071-0/+2
| |\
| | * Prevent a collision with the system's '#define errno ...' by guarding the var...joerg@mysql.com2005-03-041-0/+2
* | | Fixed Bug#8922.jani@ua141d10.elisa.omakaista.fi2005-03-081-1/+0
* | | Clean up mergejimw@mysql.com2005-03-071-0/+1
|\ \ \
| * | | Avoid calls to my_seek() and my_tell() on log files so thatjimw@mysql.com2005-03-021-0/+1
* | | | Porting of "buffered read" patch to 5.0 and post-review fixes.konstantin@mysql.com2005-03-062-7/+15
* | | | Merge with after merge fixingo@mysql.com2005-03-041-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | mergeserg@serg.mylan2005-03-031-0/+3
| |\ \ \ | | | |/ | | |/|
| | * | Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)serg@serg.mylan2005-03-031-0/+3
| | |/
* | | Prevent a collision with the system's '#define errno ...' by guarding the var...joerg@mysql.com2005-03-031-0/+2
* | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0petr@mysql.com2005-03-011-4/+4
|\ \ \
| * \ \ Merge mysql.com:/home/cps/mysql/trees/mysql-5.0petr@mysql.com2005-02-271-4/+4
| |\ \ \
| | * \ \ Merge mysql.com:/home/cps/mysql/trees/mysql-5.0petr@mysql.com2005-02-203-9/+16
| | |\ \ \
| | * \ \ \ mergepetr@mysql.com2005-02-191-4/+4
| | |\ \ \ \
| | | * | | | made IM to work with --defaults-file smoothlypetr@mysql.com2005-02-181-4/+4
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-281-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ merge with 4.1monty@mysql.com2005-02-281-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-02-251-0/+1
| | |\ \ \ \ \
| | | * \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-02-021-0/+1
| | | |\ \ \ \ \
| | | | * | | | | A fix (bug #4802 prompt in mysql client shows wrong database after dropping d...ram@gw.mysql.r18.ru2004-10-211-0/+1
* | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-02-261-5/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge with global treemonty@mysql.com2005-02-251-5/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Show all generated warnings in SHOW ERRORmonty@mysql.com2005-02-241-5/+10
* | | | | | | | | | mergejoreland@mysql.com2005-02-241-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0bell@52.0.168.192.in-addr.arpa2005-02-233-2/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0bell@51.0.168.192.in-addr.arpa2005-02-212-4/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Mergebell@51.0.168.192.in-addr.arpa2005-02-205-18/+34
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ mergebell@sanja.is.com.ua2005-02-105-4/+29
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-01-311-0/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed problem of sending ERROR to client after OK or EOF (BUG#6804)bell@sanja.is.com.ua2005-01-201-0/+5
* | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-02-232-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Mergebar@mysql.com2005-02-232-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-02-232-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | config-win.h:bar@mysql.com2005-02-231-0/+1
| | | * | | | | | | | | | | Bug#8349 myisamchk: --set-charset does not workbar@mysql.com2005-02-221-1/+2
| | * | | | | | | | | | | | Backport my_strntod() from 5.0monty@mysql.com2005-02-221-1/+1
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivitybar@mysql.com2005-02-181-0/+1
* | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmskold@mysql.com2005-02-231-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | compatibility fixes, crashing testsserg@serg.mylan2005-02-221-1/+6
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Mergemskold@mysql.com2005-02-215-13/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | portability fixesserg@serg.mylan2005-02-202-4/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-191-4/+9
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed BUILD script to use --with-berkeley-db instead of --with-bdbmonty@mysql.com2005-02-191-4/+9