summaryrefslogtreecommitdiff
path: root/include/my_global.h
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Bug#57210: remove pstackDavi Arnaut2010-10-041-1/+0
| * | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-1/+11
| |/ / / / /
* | | | | | lots of post-merge changesSergei Golubchik2011-04-251-0/+7
* | | | | | merge.Sergei Golubchik2010-11-251-34/+99
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | merge with 5.1Sergei Golubchik2010-09-111-21/+21
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | to simpliy and unify the codeSergei Golubchik2010-09-111-27/+17
| | * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-23/+33
| | |\ \ \ | | | |/ /
| * | | | Automerge with 5.1Michael Widenius2010-08-251-4/+4
| |\ \ \ \ | | |/ / /
| | * | | Automatic mergeMichael Widenius2010-08-241-4/+4
| | |\ \ \
| | | * | | Increase some very old limits.Michael Widenius2010-08-241-2/+2
| | |/ / /
| * | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-2/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-2/+6
| | |\ \ \
| * | \ \ \ Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixes for Opensolaris (to get buildbot green)Michael Widenius2010-06-231-0/+3
| * | | | | merge 5.1->5.2Sergei Golubchik2010-06-011-7/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Added macros to inform valgrind that memory is uninitializedMichael Widenius2010-05-261-6/+2
| | * | | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-1/+1
| | |\ \ \ \
| * | | | | | fixes for windows buildsSergei Golubchik2010-04-021-1/+4
| * | | | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-2/+12
| |/ / / / /
| * | | | | Fix some compiler warnings seen in Buildbot.unknown2010-03-101-3/+3
| * | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+19
| |\ \ \ \ \ \
| * | | | | | | MWL#17: Table elimination: fixes for windowsSergey Petrunya2009-09-161-0/+1
| * | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-2/+1
| |\ \ \ \ \ \ \
| | * | | | | | | MWL#17: Table-eliminationSergey Petrunya2009-09-011-2/+1
| * | | | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-38/+62
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Fixed problems in mergeMichael Widenius2009-05-191-8/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-8/+8
| * | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-4/+36
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-3/+36
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-1/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-0/+6
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix Valgrind errors seen in buildbot.unknown2009-04-081-0/+6
| * | | | | | | | | | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | | |/ / / / / / / / / /
| * | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-27/+61
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | wt needs to use its own implementation of rwlocks withSergei Golubchik2008-10-241-0/+9
| | * | | | | | | | | | | typedef is better than __attribute__ ((unused))Sergei Golubchik2008-10-221-2/+1
| | * | | | | | | | | | | mergedSergei Golubchik2008-10-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix for bug#39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TA...Michael Widenius2008-10-121-1/+1
| | * | | | | | | | | | | | win32: compilation failures, maria.test failureSergei Golubchik2008-10-211-1/+1
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | proc_info_hook, mysys access to thd->proc_infoSergei Golubchik2008-08-271-1/+20
| | * | | | | | | | | | | Fix for BUG#36319 "Maria: table is not empty but DELETE and SELECT find no ro...Guilhem Bichot2008-06-101-3/+8
| | * | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Injecting more "const" declarations into code which does not changeunknown2008-04-031-15/+15
| | * | | | | | | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Bugs fixed:unknown2008-01-071-0/+1
| | * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-12-301-4/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | UNDO of rows now puts back all part of the row on their original pages and po...unknown2007-12-301-4/+2
| | * | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-12-161-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | include sys/stat.hunknown2007-12-151-0/+3