Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 111 | -84/+16164 |
|\ | |||||
| * | Merge | Igor Babaev | 2009-11-09 | 64 | -1006/+1734 |
| |\ | |||||
| | * | Result file update for new FederatedX | unknown | 2009-11-07 | 1 | -3/+3 |
| | * | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 25 | -30/+1535 |
| | |\ | |||||
| | | * | After-merge fixes for MySQL 5.1.39 merge. | unknown | 2009-10-16 | 3 | -4/+4 |
| | | * | Merge with latest MariaDB 5.1 trunk. | unknown | 2009-10-15 | 41 | -770/+1302 |
| | | |\ | |||||
| | | * \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 22 | -26/+1531 |
| | | |\ \ | |||||
| | | | * | | Bug #44331 Restore of database with events produces warning in replication | unknown | 2009-08-31 | 2 | -8/+34 |
| | | | * | | Bug #44331 Restore of database with events produces warning in replication | unknown | 2009-08-29 | 5 | -8/+90 |
| | | | * | | merge mysql-5.0-bugteam --> mysql-5.1-bugteam | Alfranio Correia | 2009-08-28 | 7 | -11/+296 |
| | | | |\ \ | |||||
| | | | * | | | BUG#46864 Incorrect update of InnoDB table on slave when using trigger with m... | Alfranio Correia | 2009-08-27 | 1 | -23/+22 |
| | | | * | | | BUG#28976 Mixing trans and non-trans tables in one transaction results in inc... | Alfranio Correia | 2009-08-27 | 5 | -0/+888 |
| | | | * | | | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam | Alfranio Correia | 2009-08-24 | 2 | -8/+9 |
| | | | |\ \ \ | |||||
| | | | | * | | | BUG#46130 Slave does not correctly handle "expected errors" | Alfranio Correia | 2009-08-13 | 2 | -8/+9 |
| | | | * | | | | automerge | Georgi Kodinov | 2009-08-17 | 30 | -0/+4396 |
| | | | |\ \ \ \ | |||||
| | | | * | | | | | BUG#45574 CREATE IF NOT EXISTS is not binlogged if the object exists | unknown | 2009-08-13 | 4 | -0/+166 |
| | | | * | | | | | Manual Merge | unknown | 2009-08-12 | 2 | -0/+58 |
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | / / | | | | | | |/ / | | | | | |/| | | |||||
| | * | | | | | | Added federatedx storage engine | Michael Widenius | 2009-10-30 | 11 | -51/+40 |
| * | | | | | | | Merge of the latest 5.1 changes. | Igor Babaev | 2009-10-26 | 9 | -68/+2220 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge | Igor Babaev | 2009-10-17 | 41 | -770/+1302 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 74 | -0/+14586 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | MWL#36: Add a mysqlbinlog option to change the used database | Sergey Petrunya | 2009-11-05 | 2 | -0/+494 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | MWL#36: Add a mysqlbinlog option to change the used database. | Alexander Ivanov | 2009-10-27 | 2 | -0/+206 |
| * | | | | | | | | MWL#36: Add a mysqlbinlog option to change the used database | Sergey Petrunya | 2009-10-25 | 2 | -75/+48 |
| * | | | | | | | | MWL#36: Add a mysqlbinlog option to change the used database. | Alexander Ivanov | 2009-10-16 | 41 | -770/+1302 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | MWL#36: Add a mysqlbinlog option to change the used database. | Alexander Ivanov | 2009-10-16 | 2 | -0/+315 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge with 5.1 (Faster test cases) | Michael Widenius | 2009-10-29 | 27 | -922/+156 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Added missing 'source' command. | Michael Widenius | 2009-10-28 | 3 | -3/+3 |
| * | | | | | | | Speed up of test suite: | Michael Widenius | 2009-10-28 | 27 | -922/+156 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Automatic merge with 5.1 | Michael Widenius | 2009-10-28 | 8 | -69/+2034 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 9 | -68/+2220 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Updated test suite results with new information schemas | Michael Widenius | 2009-10-26 | 5 | -1/+606 |
|/ / / / / | |||||
* | | | | | Automatic merge with 5.1-merge | Michael Widenius | 2009-10-14 | 40 | -770/+1301 |
|\ \ \ \ \ | |||||
| * | | | | | Fix failures in the funcs_1 test suite. | unknown | 2009-10-10 | 8 | -746/+1210 |
| * | | | | | Fix many test failures in parts test suite with --embedded-server. | unknown | 2009-10-09 | 24 | -2/+69 |
| * | | | | | Implement mysqltest --enable_prepare_warnings to properly fix some test failu... | unknown | 2009-10-09 | 2 | -3/+6 |
| * | | | | | Fix pbxt test suite failures: | Sergey Petrunya | 2009-10-07 | 6 | -19/+12 |
| * | | | | | Fix test case partition_recover_myisam for --embedded-server. | unknown | 2009-10-07 | 1 | -0/+4 |
| |/ / / / | |||||
* | | | | | Force restart before maria_showlog_error to get rid of status from previous c... | Michael Widenius | 2009-10-13 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Fix test failures in innodb-index and partition_special_*: | unknown | 2009-10-06 | 3 | -2/+25 |
* | | | | Apply patch from Bug#46010. | unknown | 2009-09-30 | 4 | -1/+5 |
* | | | | Took care of mysql test suite failures on Windows. | Igor Babaev | 2009-09-24 | 2 | -0/+6 |
* | | | | Applied the fix for bug #47016 - a failure of rpl_do_grant | Igor Babaev | 2009-09-19 | 1 | -0/+3 |
* | | | | Merge | Igor Babaev | 2009-09-19 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | A change of direction for fix 10 csets ago: | Sergey Petrunya | 2009-09-18 | 1 | -2/+2 |
* | | | | | Applied the fix for bug #46931 from mysql-5.1 main trunk | Igor Babaev | 2009-09-18 | 1 | -2/+4 |
|/ / / / | |||||
* | | | | Update tests results after previous cset. 'TRANSACTIONAL=1' attribute goes | Sergey Petrunya | 2009-09-16 | 1 | -2/+2 |
* | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 47 | -289/+484 |
|\ \ \ \ | |||||
| * | | | | PBXT merge fixes. | unknown | 2009-08-31 | 6 | -4/+8 |
| * | | | | Updated all tests for RC2 | Paul McCullagh | 2009-08-17 | 41 | -223/+414 |