Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -0/+3 |
|\ | |||||
| * | Merge latest XtraDB from lp:percona-xtradb into MariaDB. | unknown | 2009-06-11 | 1 | -0/+3 |
* | | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35. | unknown | 2009-05-22 | 1 | -0/+4 |
* | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+5 |
|\ \ | |||||
| * \ | Manual merge of patch for bug #40552 into the team tree. | Alexey Kopytov | 2009-03-16 | 1 | -2/+5 |
| |\ \ | |||||
| | * | | Fix for bug #40552: Race condition around default_directories | Alexey Kopytov | 2009-02-27 | 1 | -2/+5 |
* | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteam | He Zhenxing | 2009-03-06 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | BUG#22082 Slave hangs(holds mutex) on "disk full" | He Zhenxing | 2009-03-06 | 1 | -0/+1 |
* | | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -3/+0 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Bug#37995 Error message truncation in test "innodb" in embedded mode. | Alexey Botchkov | 2009-02-05 | 1 | -3/+0 |
* | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -1/+6 |
|\ \ \ | |/ / | |||||
| * | | merging | Alexey Botchkov | 2008-08-23 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. | Alexey Botchkov | 2008-08-22 | 1 | -0/+1 |
| * | | Fix merge problem: make sf_malloc_cur_memory definitions match in headers and... | Sergey Petrunia | 2008-08-20 | 1 | -1/+1 |
| * | | Up-merge 5.0.66a-release changes (via 5.0) into 5.1. | Timothy Smith | 2008-07-17 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnf | Timothy Smith | 2008-07-16 | 1 | -0/+1 |
| | * | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl | unknown | 2008-01-30 | 1 | -0/+6 |
| | |\ | |||||
| | * \ | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-04 | 1 | -0/+4 |
| | |\ \ | |||||
| | | * \ | Merge trift2.:/MySQL/M50/mysql-5.0 | unknown | 2007-11-14 | 1 | -0/+2 |
| | | |\ \ | |||||
| | | | * \ | Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines | unknown | 2007-10-24 | 1 | -0/+2 |
| | | | |\ \ | |||||
| | | | | * | | BUG#31159 - fulltext search on ucs2 column crashes server | unknown | 2007-10-24 | 1 | -0/+2 |
| | | * | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 | unknown | 2007-11-07 | 1 | -0/+2 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| * | | | | | | Implement some code review fixes for the fix for Bug#27430 | unknown | 2008-05-18 | 1 | -0/+3 |
* | | | | | | | proc_info_hook, mysys access to thd->proc_info | Sergei Golubchik | 2008-08-27 | 1 | -0/+3 |
* | | | | | | | After merge fixes. | unknown | 2008-04-29 | 1 | -1/+1 |
* | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -3/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2008-02-27 | 1 | -8/+17 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2008-02-08 | 1 | -8/+17 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-11-26 | 1 | -8/+17 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1 | unknown | 2007-10-11 | 1 | -8/+17 |
* | | | | | | | | | | Injecting more "const" declarations into code which does not change | unknown | 2008-04-03 | 1 | -1/+1 |
* | | | | | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> | unknown | 2008-02-18 | 1 | -6/+6 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl | unknown | 2008-01-30 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl | unknown | 2008-01-30 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | BUG#30435 loading large LOAD DATA INFILE breaks slave with | unknown | 2007-12-21 | 1 | -0/+6 |
| | | | |_|/ / / | | | |/| | | | | |||||
* | | | | | | | | cleanup | unknown | 2008-02-05 | 1 | -1/+1 |
* | | | | | | | | Windows fixes | unknown | 2008-01-10 | 1 | -0/+3 |
* | | | | | | | | Bugs fixed: | unknown | 2008-01-07 | 1 | -0/+7 |
* | | | | | | | | Added wrapper for chmod(): my_chmod() | unknown | 2008-01-03 | 1 | -0/+1 |
* | | | | | | | | - Clean up function for my_uuid() | unknown | 2007-12-18 | 1 | -0/+1 |
* | | | | | | | | Merge jani@marvel:/my/bk/mysql-maria.new | unknown | 2007-12-18 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed bug in undo_key_delete; Caused crashed key files in recovery | unknown | 2007-12-17 | 1 | -2/+4 |
* | | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -8/+38 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe... | unknown | 2007-12-04 | 1 | -0/+2 |
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-11-20 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | WL#3071 Maria checkpoint, WL#3072 Maria recovery | unknown | 2007-11-16 | 1 | -0/+3 |
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-10-20 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / |