summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Remove compiler warnings and remove not used variablesmonty@mysql.com2005-02-251-4/+0
* Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0serg@serg.mylan2005-02-172-0/+0
|\
| * manually mergedserg@serg.mylan2005-02-142-0/+0
| |\
| | * query_id and my_xid -> ulonglongserg@serg.mylan2005-01-272-0/+0
* | | Merge with 4.1monty@mysql.com2005-02-151-7/+11
|\ \ \ | |/ / |/| |
| * | Fix for bug #8477 (Embedded query_cache test crashes)hf@deer.(none)2005-02-121-7/+11
* | | Precision Math implementationhf@deer.(none)2005-02-091-1/+1
* | | small Makefile.am cleanupserg@serg.mylan2005-01-282-10/+7
* | | change to Makefile.am per Serg's requestpatg@krsna.patg.net2005-01-251-1/+1
* | | fix for make error in Makefile.am of mysql_client_test.ctomas@poseidon.ndb.mysql.com2005-01-251-1/+1
* | | Mergejimw@mysql.com2005-01-241-8/+9
|\ \ \ | |/ /
| * | - fixed one missing occasion from the mysql_client_test renaminglenz@mysql.com2005-01-201-1/+1
| * | - renamed client_test -> mysql_client_testlenz@mysql.com2005-01-201-8/+9
* | | Add ha_federated.cc to libmysqld/Makefile.am so that configuring with bothjimw@mysql.com2005-01-181-1/+1
* | | Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1mwagner@here.mwagner.org2005-01-121-1/+1
|\ \ \ | |/ /
| * | libmysqld.def, libmysql.def:mwagner@here.mwagner.org2005-01-121-1/+1
* | | Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1mwagner@here.mwagner.org2005-01-121-0/+1
|\ \ \ | |/ /
| * | libmysqld.def, libmysql.def:mwagner@here.mwagner.org2005-01-121-0/+1
* | | Merging conflicts resolvedhf@deer.(none)2005-01-112-2/+6
|\ \ \ | |/ /
| * | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2005-01-111-0/+3
| |\ \
| | * | fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)hf@deer.(none)2005-01-031-0/+3
| * | | A fix for Bug#7365 "embedded server for MacOS: problem with preparedkonstantin@mysql.com2005-01-111-2/+3
| |/ /
* | | manually mergedserg@sergbook.mysql.com2004-12-311-6/+6
|\ \ \ | |/ /
| * | Tabs removedhf@deer.(none)2004-12-211-6/+6
* | | Merge with 4.1monty@mishka.local2004-12-221-26/+53
|\ \ \ | |/ / | | / | |/ |/|
| * Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2004-12-211-26/+52
| |\
| | * Fix to perform correctly with charsets in embedded serverhf@deer.(none)2004-12-211-26/+52
| * | Fix assertion failure in client_test when linked with the embedded konstantin@mysql.com2004-12-191-0/+1
| |/
* | Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; anjuta@arthur.local2004-12-142-2/+4
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2004-12-091-0/+1
|\ \
| * | Changing the default of libmysqlclient : it's now NO reconnection.guilhem@mysql.com2004-12-091-0/+1
* | | Merge with new VARCHAR codemonty@mysql.com2004-12-061-1/+1
|\ \ \ | |/ / |/| |
| * | Add support for up to VARCHAR (size up to 65535)monty@mysql.com2004-12-061-1/+1
* | | Merge with 4.1monty@mysql.com2004-12-061-3/+8
|\ \ \ | | |/ | |/|
| * | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2004-11-161-3/+8
| |\ \
| | * \ Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2004-10-051-3/+8
| | |\ \
| | | * | Fix to compile sql/examples content in embedded serverhf@deer.(none)2004-09-261-3/+8
* | | | | mergebell@sanja.is.com.ua2004-11-121-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | post-merge fixbell@sanja.is.com.ua2004-10-281-1/+1
* | | | | After merge fixesmonty@mysql.com2004-11-031-1/+1
* | | | | merge with 4.1monty@mysql.com2004-10-292-3/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | A lot of fixes for prepared statements (PS):monty@mysql.com2004-10-261-2/+3
| |/ /
| * | Fix asked by Ranger.hf@deer.(none)2004-09-251-1/+1
| |/
* | Fixed --with-embedded builds.dlenev@brandersnatch.localdomain2004-09-101-1/+1
* | Merge with 4.1monty@mysql.com2004-09-065-20/+183
|\ \ | |/
| * Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0serg@serg.mylan2004-08-262-0/+140
| |\
| | * Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0miguel@hegel.txg.br2004-08-262-0/+140
| | |\
| | | * Adding binary version information for debug/release version of libmysqld.dllmiguel@hegel.txg.br2004-08-252-0/+140
| | * | All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may con...joerg@mysql.com2004-08-241-2/+2
| | |/
| | * Fix for bug #4531(64bit embedded server crashes)hf@deer.(none)2004-07-211-6/+7