Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 7 | -23/+37 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 3 | -11/+23 |
| |\ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2013-01-25 | 2 | -3/+6 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-01-25 | 2 | -3/+6 |
| | | |\ | |||||
| | | | * | MDEV-4040 Replace deprecated SET OPTION syntax in mysqldump | Sergei Golubchik | 2013-01-25 | 1 | -2/+2 |
| | | | * | MDEV-3915 COM_CHANGE_USER allows fast password brute-forcing | Sergei Golubchik | 2013-01-25 | 1 | -1/+4 |
| | * | | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 1 | -4/+6 |
| | * | | | Fixed problem with failing mysql_upgrade when proc table was not correct. | Michael Widenius | 2013-01-11 | 1 | -1/+8 |
| | * | | | MDEV-3883 Show global status not in order | Sergei Golubchik | 2013-01-08 | 1 | -3/+3 |
| * | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 6 | -11/+11 |
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 6 | -14/+16 |
* | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -0/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed some compiler warnings | Michael Widenius | 2012-12-19 | 1 | -0/+4 |
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 11 | -54/+66 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -1/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 11 | -49/+67 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 11 | -49/+67 |
| | | | |\ | |||||
| | | | | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 11 | -47/+67 |
| | | | | |\ | |||||
| | | | * | \ | Merge into latest 5.2. | unknown | 2012-08-24 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | * | \ \ \ | Merge into latest 5.3 | unknown | 2012-08-24 | 1 | -1/+1 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 3 | -14/+88 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||||
| | | | * | | | | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 3 | -14/+88 |
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | | | |||||
| | | | | * | | | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 3 | -14/+88 |
| | | | | |\ \ \ \ | |||||
* | | | | | \ \ \ \ | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 11 | -53/+63 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 11 | -53/+64 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | upmerge from mysql-5.1=>mysql-5.5 | Rohit Kalhans | 2012-08-08 | 1 | -1/+12 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | | * | | | | | | | | BUG#11757312: MYSQLBINLOG DOES NOT ACCEPT INPUT FROM STDIN | Rohit Kalhans | 2012-08-08 | 1 | -1/+12 |
| | * | | | | | | | | | Merge of patch for Bug#13928675 from mysql-5.1. | Nirbhay Choubey | 2012-08-07 | 10 | -23/+20 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 10 | -20/+20 |
| | * | | | | | | | | | merge 5.1 => 5.5 | Tor Didriksen | 2012-07-26 | 1 | -3/+7 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Backport of Bug#14171740 65562: STRING::SHRINK SHOULD BE A NO-OP WHEN ALLOCED=0 | Tor Didriksen | 2012-07-26 | 1 | -3/+7 |
| | * | | | | | | | | | Bug #12615411 - server side help doesn't work as first statement | Venkata Sidagam | 2012-07-19 | 1 | -3/+11 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Bug #12615411 - server side help doesn't work as first statement | Venkata Sidagam | 2012-07-19 | 1 | -3/+11 |
| | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
* | | | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 6 | -49/+220 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -3/+22 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -3/+22 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | MWL#182: Explain running statements: merge with 5.5-main | Sergey Petrunya | 2012-08-12 | 1 | -3/+22 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge 5.5-main -> 5.5-show-explain | Sergey Petrunya | 2012-07-25 | 3 | -21/+91 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | MWL#182: Explain running statements | Sergey Petrunya | 2012-06-15 | 1 | -3/+22 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5 | Sergey Petrunya | 2012-05-16 | 1 | -3/+22 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ | MWL#182: Explain running statements: merge with 5.3-main (needs fixing) | Sergey Petrunya | 2012-01-03 | 1 | -3/+22 |
| | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ \ \ | MWL#182: Explain running statements | Sergey Petrunya | 2011-10-27 | 1 | -3/+22 |
| | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | * | | | | | | | | | MWL#182: Explain running statements | Sergey Petrunya | 2011-09-24 | 1 | -3/+22 |
| * | | | | | | | | | | | | | | | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-10-04 | 2 | -17/+80 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-09-28 | 1 | -11/+31 |
| |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Automatic merge | Michael Widenius | 2012-09-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Automatic merge | Michael Widenius | 2012-09-22 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | Added function last_value() which returns the last value but evalutes all arg... | Michael Widenius | 2012-09-05 | 1 | -0/+1 |