summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-256-92/+51
|\
| * merge with 5.1Sergei Golubchik2010-09-112-3/+1
| |\
| | * Merge with MySQL 5.1.50Michael Widenius2010-08-272-3/+1
| | |\
| * | \ Merge with MariaDB 5.1.49Michael Widenius2010-08-051-5/+25
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-5/+25
| | |\ \
| * | \ \ Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+8
| |\ \ \ \ | | |/ / /
| | * | | Implement an NSIS based installerBo Thorsen2010-06-251-0/+8
| * | | | merge 5.1->5.2Sergei Golubchik2010-06-011-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+1
| | |\ \ \
| * | | | | pluggable auth with plugin examplesSergei Golubchik2010-03-295-91/+37
| |/ / / /
| * | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-4/+6
| |\ \ \ \
| * \ \ \ \ Merge with MySQL 5.1.42Michael Widenius2010-01-152-15/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-302-0/+15
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-162-0/+15
| | |\ \ \ \ \ \
| * | | | | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-2/+2
| |/ / / / / / /
| * | | | | | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-2/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-2/+1
| | |\ \ \ \ \ \ \
| * | | | | | | | | Fixes for binary distribution in tar fileMichael Widenius2009-10-231-1/+2
| |/ / / / / / / /
| * | | | | | | | Fix a problem in windows build introduced a few csets ago (inSergey Petrunya2009-10-051-0/+1
| * | | | | | | | Added client functions:Michael Widenius2009-10-021-0/+12
| * | | | | | | | Fix windows build: add strmov_overlapp.c to CMakeLists.txtSergey Petrunya2009-09-101-1/+1
| * | | | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-082-3/+3
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Cherry-pick revid:psergey@askmonty.org-20090608135546-ut1yrzbah4gdw6e6unknown2009-06-151-1/+2
| * | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix two missing DBUG_RETURN.unknown2009-04-211-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-103-4/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-103-44/+103
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-283-26/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix for build failureunknown2008-02-191-1/+1
| | * | | | | | | | | | | | | Fix for build failures. Putting back "#define bool BOOL" under Windowsunknown2008-02-191-1/+1
| | * | | | | | | | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fixed compiler warnings in a lot of filesunknown2008-02-131-1/+0
| | * | | | | | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-272-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-162-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | fixes for windows buildsunknown2007-12-131-2/+2
| | | | * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-10-101-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Moved randomize and my_rnd under mysysunknown2007-10-091-1/+1
| | | | * | | | | | | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-10-081-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-072-1/+2
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-272-1/+2
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-272-1/+2
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-282-1/+2
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-202-1/+2
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | | | | | Maria - various fixes around durability of files:unknown2006-11-212-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | Fix mysql_client_test failure introduced by a patch for Bug#47485.Dmitry Shulga2010-09-091-0/+3
* | | | | | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-5.1-bugteam.Dmitry Shulga2010-09-071-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug #47485 - mysql_store_result returns a not NULL result setDmitry Shulga2010-09-071-2/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
View Lorry Controller Status