summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
* | windows compilation fixesserg@serg.mylan2005-02-192-1/+5
* | Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0serg@serg.mylan2005-02-172-4/+4
|\ \
| * \ manually mergedserg@serg.mylan2005-02-142-4/+4
| |\ \ | | |/ | |/|
| | * query_id and my_xid -> ulonglongserg@serg.mylan2005-01-272-2/+2
| | * XA (not completely polished out yet)serg@serg.mylan2005-01-161-2/+2
* | | Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1acurtis@pcgem.rdg.cyberkinetica.com2005-02-161-8/+15
|\ \ \ | |/ / |/| |
| * | Mergeacurtis@pcgem.rdg.cyberkinetica.com2005-02-161-8/+15
| |\ \
| | * | Bug#4445acurtis@pcgem.rdg.cyberkinetica.com2005-02-161-8/+15
* | | | Mergeingo@mysql.com2005-02-111-1/+1
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-02-111-1/+1
| |\ \ \
| | * | | Bug#8391 - "merge" fails on Linux/IA64ingo@mysql.com2005-02-101-1/+1
| * | | | Applied a patch for Netware.jani@ua141d10.elisa.omakaista.fi2005-02-082-0/+3
| |/ / /
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1guilhem@mysql.com2005-02-051-0/+11
| |\ \ \
| | * | | Backport of ChangeSet 1.1845 05/02/04 13:53:16 guilhem@mysql.com +1 -0 from 5.0.guilhem@mysql.com2005-02-041-0/+11
* | | | | Precision Math implementationhf@deer.(none)2005-02-092-3/+11
* | | | | Merge changesjimw@mysql.com2005-02-041-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-02-041-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | indexless boolean fulltext search was depending on default_charset_info - Bug...serg@serg.mylan2005-02-041-1/+1
* | | | | Proposal to fix this problem: when using libmysqlclient, you must call mysql_...guilhem@mysql.com2005-02-041-0/+11
* | | | | corrected automerge errormysqldev@mysql.com2005-02-031-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | backported configure flag from 5.0tulin@mysql.com2005-02-021-0/+6
| |/ / /
* | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-01-281-7/+2
|\ \ \ \
| * | | | small Makefile.am cleanupserg@serg.mylan2005-01-281-7/+2
* | | | | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-01-271-0/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2005-01-261-0/+4
| |\ \ \ \
| | * \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2005-01-241-0/+4
| | |\ \ \ \
| | | * | | | Stick FN_REFLEN to PATH_MAX.ram@gw.mysql.r18.ru2005-01-241-0/+4
* | | | | | | timed_mutexes moved to include/my_sys.h and mysys/my_static.cram@gw.mysql.r18.ru2005-01-261-0/+2
* | | | | | | CSC#4385: slow sorting for UTF8 large table:bar@mysql.com2005-01-261-1/+3
| |_|_|/ / / |/| | | | |
* | | | | | Mergejimw@mysql.com2005-01-241-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | my_global.h:kent@mysql.com2005-01-241-1/+1
| |/ / / /
* | | | | Merge of fix for BUG#4258 from 4.1.timour@mysql.com2005-01-211-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Final patch for BUG#4285.timour@mysql.com2005-01-191-1/+4
| |/ / /
* | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-01-181-1/+1
|\ \ \ \
| * | | | Fixes in opt_range.cc: ROR plan choice codesergefp@mysql.com2005-01-171-1/+1
* | | | | Merge with global treemonty@mysql.com2005-01-153-4/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge with 4.1monty@mysql.com2005-01-152-3/+5
| |\ \ \ \ | | |/ / /
| | * | | Mergemonty@mysql.com2005-01-151-0/+1
| | |\ \ \ | | | |/ /
| | | * | Fixed possible access to unintialized memory in filesort when using many buffersmonty@mysql.com2005-01-151-0/+1
| | * | | limit HEAP table size with max_heap_table_size, better estimation for mem_per...serg@serg.mylan2005-01-141-3/+4
| * | | | Changed interface for my_strntod() to make it more general and more portablemonty@mysql.com2005-01-151-1/+1
* | | | | A patch for Netware.jani@ua141d10.elisa.omakaista.fi2005-01-133-0/+4
|/ / / /
* | | | renamed charset name 'eucjp_ms' to 'eucjpms'shuichi@mysql.com2005-01-121-2/+2
* | | | added new character set - cp932, eucjp_msshuichi@mysql.com2005-01-111-0/+4
* | | | Merging conflicts resolvedhf@deer.(none)2005-01-111-0/+2
|\ \ \ \ | |/ / /
| * | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2005-01-111-0/+2
| |\ \ \
| | * | | fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)hf@deer.(none)2005-01-031-0/+2
* | | | | Merge mysql.com:/home/kostja/work/mysql-4.1-7428konstantin@mysql.com2005-01-111-1/+1
|\ \ \ \ \ | |/ / / /