summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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 with global treemonty@mysql.com2005-02-251-5/+10
|\ \ \ \
| * | | | Show all generated warnings in SHOW ERRORmonty@mysql.com2005-02-241-5/+10
* | | | | 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
|\ \ \ \ \ | |/ / / /
| * | | | 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
| * | | | compatibility fixes, crashing testsserg@serg.mylan2005-02-221-1/+6
* | | | | 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
|\ \ \ \ \ | |/ / / /
| * | | | portability fixesserg@serg.mylan2005-02-202-4/+2
* | | | | Mergebell@51.0.168.192.in-addr.arpa2005-02-205-18/+34
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | | | mergebell@sanja.is.com.ua2005-02-105-4/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 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 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