summaryrefslogtreecommitdiff
path: root/include/my_sys.h
Commit message (Expand)AuthorAgeFilesLines
* Merge of Percona XtraDB into MariaDB.unknown2009-06-111-0/+3
|\
| * Merge latest XtraDB from lp:percona-xtradb into MariaDB.unknown2009-06-111-0/+3
* | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35.unknown2009-05-221-0/+4
* | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+5
|\ \
| * \ Manual merge of patch for bug #40552 into the team tree.Alexey Kopytov2009-03-161-2/+5
| |\ \
| | * | Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-271-2/+5
* | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-0/+1
|\ \ \ \ | |/ / /
| * | | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteamHe Zhenxing2009-03-061-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | BUG#22082 Slave hangs(holds mutex) on "disk full"He Zhenxing2009-03-061-0/+1
* | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-3/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Bug#37995 Error message truncation in test "innodb" in embedded mode.Alexey Botchkov2009-02-051-3/+0
* | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-1/+6
|\ \ \ | |/ /
| * | mergingAlexey Botchkov2008-08-231-0/+1
| |\ \ | | |/
| | * Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.Alexey Botchkov2008-08-221-0/+1
| * | Fix merge problem: make sf_malloc_cur_memory definitions match in headers and...Sergey Petrunia2008-08-201-1/+1
| * | Up-merge 5.0.66a-release changes (via 5.0) into 5.1.Timothy Smith2008-07-171-0/+1
| |\ \ | | |/
| | * Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnfTimothy Smith2008-07-161-0/+1
| | * Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplunknown2008-01-301-0/+6
| | |\
| | * \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-041-0/+4
| | |\ \
| | | * \ Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-11-141-0/+2
| | | |\ \
| | | | * \ Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-enginesunknown2007-10-241-0/+2
| | | | |\ \
| | | | | * | BUG#31159 - fulltext search on ucs2 column crashes serverunknown2007-10-241-0/+2
| | | * | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2007-11-071-0/+2
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| * | | | | | Implement some code review fixes for the fix for Bug#27430 unknown2008-05-181-0/+3
* | | | | | | proc_info_hook, mysys access to thd->proc_infoSergei Golubchik2008-08-271-0/+3
* | | | | | | After merge fixes.unknown2008-04-291-1/+1
* | | | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-3/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-271-8/+17
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-081-8/+17
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-261-8/+17
| | | |\ \ \ \ \ \
| | | | * | | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-8/+17
* | | | | | | | | | Injecting more "const" declarations into code which does not changeunknown2008-04-031-1/+1
* | | | | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-6/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>unknown2008-02-181-6/+6
| |/ / / / / / / /
* | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rplunknown2008-01-301-0/+5
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplunknown2008-01-301-0/+5
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | BUG#30435 loading large LOAD DATA INFILE breaks slave with unknown2007-12-211-0/+6
| | | | |_|/ / / | | | |/| | | |
* | | | | | | | cleanupunknown2008-02-051-1/+1
* | | | | | | | Windows fixesunknown2008-01-101-0/+3
* | | | | | | | Bugs fixed:unknown2008-01-071-0/+7
* | | | | | | | Added wrapper for chmod(): my_chmod()unknown2008-01-031-0/+1
* | | | | | | | - Clean up function for my_uuid()unknown2007-12-181-0/+1
* | | | | | | | Merge jani@marvel:/my/bk/mysql-maria.newunknown2007-12-181-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed bug in undo_key_delete; Caused crashed key files in recoveryunknown2007-12-171-2/+4
* | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-8/+38
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe...unknown2007-12-041-0/+2
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-11-201-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | WL#3071 Maria checkpoint, WL#3072 Maria recoveryunknown2007-11-161-0/+3
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-10-201-1/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /