summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge deer.(none):/home/hf/work/mysql-4.1.9110hf@deer.(none)2005-07-271-0/+2
|\
| * Fix for bug #9110 (Max_join_size error)hf@deer.(none)2005-07-261-0/+2
* | Fixes to previous changesetmonty@mishka.local2005-07-181-1/+1
* | Mergekent@mysql.com2005-07-062-4/+4
|\ \ | |/
| * Makefile.am:kent@mysql.com2005-07-052-2/+4
* | A fix and a test case for Bug#10794 "mysql_stmt_attr_set no konstantin@mysql.com2005-06-301-1/+1
* | Rename all prepared statements COM_ commands to prefix with COM_STMT_konstantin@mysql.com2005-06-171-1/+1
* | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-06-101-0/+1
|\ \
| * | mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:kent@mysql.com2005-06-091-0/+1
* | | remove old libmysqld.a before assembling a new oneserg@serg.mylan2005-06-091-0/+1
|/ /
* | assemble libmysqld.a 5-10 times faster!serg@serg.mylan2005-06-021-16/+11
* | New file default_modify.c. Fixed a typo on mysqld.ccjani@a193-229-222-105.elisa-laajakaista.fi2005-05-181-0/+1
* | Manual merge (again)konstantin@mysql.com2005-05-141-1/+4
|\ \ | |/
| * Makefile.am, configure.in:kent@mysql.com2005-05-101-1/+4
* | Fix for bug #9632 (strict.test fails in -embedded-server mode)holyfoot@hf-ibm.(none)2005-05-091-5/+8
* | Clean up merge from 4.1jimw@mysql.com2005-05-022-21/+42
|\ \ | |/
| * Manually resolve mergejimw@mysql.com2005-04-292-21/+42
| |\
| | * Fix crash in embedded server due to incorrect storage of resultsjimw@mysql.com2005-03-312-21/+42
* | | - manual mergelenz@mysql.com2005-04-211-0/+16
|\ \ \ | |/ /
| * | - manual mergelenz@mysql.com2005-04-191-0/+16
| |\ \ | | |/ | |/|
| | * - added missing copyright headers to several Makefile.am's (noticedlenz@mysql.com2005-04-191-0/+16
* | | BUG#9391 mysqlshow prints incorrect "rows" informationmsvensson@neptunus.(none)2005-04-131-5/+0
* | | fixed conflict making embedded server with libmysqldbrian@zim.(none)2005-03-251-1/+2
|\ \ \ | |/ /
| * | Fixing blackhole support in libmysqldbrian@zim.(none)2005-03-251-1/+2
* | | mergedserg@serg.mylan2005-03-231-2/+4
|\ \ \
| * | | Fix test_libmysqld link problem on Windows.jimw@mysql.com2005-03-211-2/+4
* | | | Remove unexistent @MT_INCLUES@konstantin@mysql.com2005-03-181-1/+1
* | | | Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants...brian@zim.(none)2005-03-161-1/+1
|/ / /
* | | 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
| |/ / /