summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Manual mergesergefp@mysql.com2004-06-142-0/+71
|\
| * Manual mergesergefp@mysql.com2004-05-292-0/+71
| |\
| | * * New index_merge EXPLAIN output formatsergefp@mysql.com2004-05-291-6/+16
| | * Manual mergesergefp@mysql.com2004-05-132-0/+61
| | |\
| | | * This is first cset for WL#1394 "Optimize index merge when all involved index ...sergefp@mysql.com2004-05-132-0/+61
* | | | Merging 4.1 to 5.0.pem@mysql.com2004-05-2612-28/+104
|\ \ \ \ | |/ / / |/| | |
| * | | merge with 4.0 to get Netware patches and fixes for libmysqld.dllmonty@mysql.com2004-05-255-13/+28
| |\ \ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-05-255-13/+28
| | |\ \ \
| | | * | | Added patches from Novellmonty@mysql.com2004-05-255-13/+28
| * | | | | Preparation for user-defined Unicode collations:bar@bar.intranet.mysql.r18.ru2004-05-251-1/+2
| * | | | | Support for character set conversion in binary protocol: another gokonstantin@mysql.com2004-05-254-6/+64
| * | | | | Merge with 4.0, mainly to get changes to windows project filesmonty@mysql.com2004-05-201-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'monty@mysql.com2004-05-191-1/+1
| | |/ / /
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2004-05-161-3/+3
| |\ \ \ \
| | * | | | key_cmp -> key_cmp_if_samemonty@mishka.local2004-05-161-3/+3
| * | | | | Update casts from very old my_lock.c source.ingo@mysql.com2004-05-101-4/+6
| |/ / / /
* | | | | Post-merge post-merge fix (new error codes for fparser).pem@mysql.com2004-05-141-12/+30
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | file parser for new .frmbell@sanja.is.com.ua2004-05-111-12/+30
* | | | | Merge 4.1 -> 5.0pem@mysql.com2004-05-077-36/+122
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-052-12/+22
| |\ \ \
| | * \ \ Merge with 4.0.19monty@mysql.com2004-05-052-12/+22
| | |\ \ \ | | | |/ /
| | | * | better followup fix for my_getopt (Argh!)serg@serg.mylan2004-04-301-7/+7
| | | * | followup - error fixedserg@serg.mylan2004-04-301-2/+3
| | | * | bug#3529 - my_getopt doesn't process short OPT_ARG options correctlyserg@serg.mylan2004-04-281-11/+20
| | | * | bug#3556 - soundexserg@serg.mylan2004-04-281-2/+2
| * | | | Fixes for prior commitmiguel@hegel.local2004-05-051-0/+2
| * | | | Windows fixes for VC++ compiler compabilitymiguel@hegel.local2004-05-051-5/+20
| |/ / /
| * | | WL#1700 - Properly count key_blocks_used and key_blocks_current.ingo@mysql.com2004-05-031-16/+68
| * | | Allow one to send empty strings with mysql_stmt_send_long_data()monty@mysql.com2004-04-281-0/+6
| * | | Renamed MY_LEX_COLON to MY_LEX_SEMICOLON (at Serg's request)sergefp@mysql.com2004-04-281-1/+1
| * | | Fixed results for previous patchmonty@mishka.local2004-04-271-1/+1
| * | | Fixed problems noticed with last buildmonty@mysql.com2004-04-091-1/+2
* | | | Merge 4.1 -> 5.0.pem@mysql.com2004-04-0732-614/+607
|\ \ \ \ | |/ / /
| * | | WL#775 "Add status variable identifying binlog_cache_size shortage"dlenev@jabberwock.localdomain2004-04-021-0/+2
| * | | charset2html.c:bar@bar.intranet.mysql.r18.ru2004-03-261-3/+15
| * | | Merge with 4.0monty@mysql.com2004-03-252-4/+7
| |\ \ \ | | |/ /
| | * | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-03-251-1/+2
| | |\ \
| | | * | shared IO_CACHE: protection against remove_io_share in a wrong timeserg@serg.mylan2004-03-251-1/+2
| | * | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-03-231-1/+1
| | |\ \ \ | | | |/ /
| | | * | commentserg@serg.mylan2004-03-231-1/+1
| | * | | fixed config parser to recognize correctly strings like following:bell@sanja.is.com.ua2004-03-201-2/+4
| | |/ /
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-03-253-39/+62
| |\ \ \
| | * | | BTREE-indexes in HEAP tables can now be used to optimize ORDER BYmonty@mysql.com2004-03-253-39/+62
| * | | | Unicode Collation Algorithm subset implementationbar@bar.intranet.mysql.r18.ru2004-03-241-0/+1
| * | | | .del-uca-dump.c~da786d5a909db27a:bar@bar.intranet.mysql.r18.ru2004-03-221-258/+0
| |/ / /
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-03-201-0/+4
| |\ \ \
| | * \ \ Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1monty@mysql.com2004-03-201-0/+4
| | |\ \ \ | | | |/ /
| | | * | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-03-163-12/+27
| | | |\ \
| | | * \ \ Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-03-071-0/+4
| | | |\ \ \
| | | | * | | comment clarifiedserg@serg.mylan2004-03-051-0/+4