summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge abarkov@build.mysql.com:/home/bk/mysql-4.1bar@bar.mysql.r18.ru2003-09-191-1/+13
|\
| * Fixed that multibyte charsets didn't honor multibytebar@bar.mysql.r18.ru2003-09-191-1/+13
* | SCRUMhf@deer.(none)2003-09-191-1/+1
* | SCRUMhf@deer.(none)2003-09-191-0/+3
|/
* SCRUMhf@deer.(none)2003-09-182-3/+3
* SCRUM:hf@deer.(none)2003-09-181-3/+2
* SCRUMhf@deer.(none)2003-09-181-1/+1
* Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2003-09-171-1/+3
|\
| * Charset number is now stored into error.sys by comp_err and loaded by mysqld.bar@bar.mysql.r18.ru2003-09-171-1/+3
* | SCRUM:hf@deer.(none)2003-09-171-0/+2
* | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2003-09-172-8/+16
|\ \ | |/ |/|
| * SCRUMhf@deer.(none)2003-09-172-0/+8
| * Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2003-09-162-8/+8
| |\
| | * Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2003-09-162-8/+8
| | |\
| | | * SCRUMhf@deer.(none)2003-09-162-8/+7
| | | * Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2003-09-121-0/+1
| | | |\
| | | | * SCRUM:hf@deer.(none)2003-09-121-0/+1
* | | | | BUG #1305: ISAM table handler should not be compiled by default under 4.1greg@mysql.com2003-09-171-1/+0
|/ / / /
* | | | Bug fix:bar@bar.mysql.r18.ru2003-09-161-0/+3
|/ / /
* | | Manual merge after commiting START SLAVE UNTILdlenev@mysql.com2003-09-141-1/+4
|\ \ \ | |/ / |/| |
| * | Implemented support for START SLAVE UNTIL (WL#868)dlenev@dlenev.mshome2003-09-141-1/+4
* | | merge with 4.1 treemonty@mashka.mysql.fi2003-09-116-138/+93
|\ \ \ | |_|/ |/| |
| * | merge with 4.0.15monty@mashka.mysql.fi2003-09-111-0/+2
| |\ \
| | * | Remove not used define (my_strxfrm)monty@mashka.mysql.fi2003-09-111-1/+0
| | * | Cleaned up last bug fixesmonty@mashka.mysql.fi2003-09-091-0/+2
| * | | After merge fixes.monty@mashka.mysql.fi2003-09-111-2/+4
| * | | mergemonty@narttu.mysql.fi2003-09-035-136/+87
| |\ \ \
| | * \ \ merge with 4.0.15monty@narttu.mysql.fi2003-08-295-136/+87
| | |\ \ \ | | | |/ /
| | | * | Added a warning to my_print_defaults if --verbose is givenjani@rhols221.adsl.netsonic.fi2003-08-272-4/+4
| | | * | vio ssl structure renames (to get rid of ending _)monty@narttu.mysql.fi2003-08-271-103/+41
| | | * | Fixed problem with undefined assert symbolmonty@narttu.mysql.fi2003-08-201-3/+1
| | | * | Fixed some varnings from valgrindmonty@narttu.mysql.fi2003-08-201-0/+12
| | | * | Use my_b_append instead of my_b_write on a SEQ_READ_APPEND cache, when we writeguilhem@mysql.com2003-08-191-0/+2
| | | * | Cleanups to recent patchesmonty@mashka.mysql.fi2003-08-151-0/+1
* | | | | SCRUMhf@deer.(none)2003-09-111-4/+7
* | | | | mergebell@sanja.is.com.ua2003-09-098-40/+55
|\ \ \ \ \
| * | | | | fix for #1210hf@deer.(none)2003-09-081-0/+1
| |/ / / /
| * | | | C cleanupsserg@serg.mylan2003-09-031-1/+1
| * | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2003-09-033-27/+40
| |\ \ \ \
| | * \ \ \ merge commit, hope that none of bar and dlenev changes werekostja@oak.local2003-09-033-27/+40
| | |\ \ \ \
| | | * \ \ \ manual mergekostja@oak.local2003-07-313-27/+40
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | few compile-time bugs fixedkostja@oak.local2003-07-181-1/+1
| | | | * | | Style fixes, comments for 4.1.1 authorizationkostja@oak.local2003-07-182-4/+4
| | | | * | | resolved conflict with pulled changesetkostja@oak.local2003-07-093-27/+40
| | | | |\ \ \
| | | | | * \ \ Merge oak.local:/home/kostja/mysql/mysql-4.1-rootkostja@oak.local2003-07-083-27/+40
| | | | | |\ \ \
| | | | | | * | | Preliminary support for options --secure-auth, kostja@oak.local2003-07-082-4/+4
| | | | | | * | | Bug fixes for authenticationkostja@oak.local2003-07-041-1/+1
| | | | | | * | | First version of new authentification procedure: now authentification is one-...kostja@oak.local2003-07-012-26/+39
| * | | | | | | | mergedserg@serg.mylan2003-09-032-5/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | use crc32() from bundled zlib if system zlib is unavailableserg@serg.mylan2003-08-211-1/+2