Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -7/+7 |
|\ | |||||
| * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -0/+8 |
| |\ | |||||
| * \ | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -25/+39 |
| |\ \ | |||||
| * | | | Fixed warnings and build failures after last push | Michael Widenius | 2010-08-02 | 1 | -3/+3 |
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -2/+4 |
| |\ \ \ | |||||
| * | | | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -1/+1 |
| * | | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -9/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -5/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -14/+24 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -6/+11 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -14/+121 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -5/+19 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 |
| * | | | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -3/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -3/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -7/+7 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -26/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -5/+0 |
* | | | | | | | | | | | | | | | mysql-5.1 -> mysql-5.5 merge | Sergei Golubchik | 2010-11-05 | 1 | -6/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Bug #56709: Memory leaks at running the 5.1 test suite | Alexey Kopytov | 2010-09-22 | 1 | -7/+5 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l... | unknown | 2010-08-03 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l... | unknown | 2010-08-03 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. | Luis Soares | 2010-07-30 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Revert patch for BUG#34283. Causing lots of test failures in PB2, | Luis Soares | 2010-07-30 | 1 | -8/+0 |
* | | | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l... | unknown | 2010-07-30 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l... | unknown | 2010-07-30 | 1 | -0/+8 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-20 | 1 | -8/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -7/+6 |
* | | | | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | merge | Georgi Kodinov | 2010-07-14 | 1 | -23/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Bug #51876: crash/memory underrun when loading data with ucs2 | Georgi Kodinov | 2010-07-14 | 1 | -23/+33 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | merge | Georgi Kodinov | 2010-06-09 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge | Georgi Kodinov | 2010-06-09 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Bug #52512: Assertion `! is_set()' in Diagnostics_area::set_ok_status | Georgi Kodinov | 2010-04-07 | 1 | -0/+4 |
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | | Bug #49829 Many "hides virtual function" warnings with SunStudio | Tor Didriksen | 2010-05-31 | 1 | -3/+3 |
* | | | | | | | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2010-05-28 | 1 | -16/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-11 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Bug#53189 Table map version unused and can be removed | He Zhenxing | 2010-05-08 | 1 | -2/+0 |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-07 | 1 | -7/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Bug#50373 --secure-file-priv="" | Kristofer Pettersson | 2010-05-03 | 1 | -7/+4 |
| * | | | | | | | | | | | | Manual merge of local mysql-trunk-merge with bk-internal. | Alexey Kopytov | 2010-05-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-05-07 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-04-30 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | / / / / / / / / / / / | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | |