| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge. | Sergei Golubchik | 2010-11-25 | 3 | -3/+3 |
| |\ | |||||
| | * | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 2 | -0/+101 |
| | |\ | |||||
| | * \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 2 | -4/+5 |
| | |\ \ | |||||
| | * \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 3 | -18/+27 |
| | |\ \ \ | |||||
| | * \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -6/+6 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -2/+3 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 29 | -286/+272 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 6 | -30/+111 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 4 | -12/+27 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 2 | -2/+2 |
| | * | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 16 | -771/+459 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 2 | -3/+6 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | mysql-5.1 -> mysql-5.5 merge | Sergei Golubchik | 2010-11-05 | 1 | -138/+132 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | merged | Georgi Kodinov | 2010-10-05 | 1 | -136/+136 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Post-fix push for BUG#53452. | Alfranio Correia | 2010-08-25 | 4 | -6/+6 |
| * | | | | | | | | | | | | | | Bug#49746: Const expression caching led to NDB not using engine condition | Evgeny Potemkin | 2010-08-14 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | Follow-up for Bug 23032: update NDB result files. | Alexander Nozdrin | 2010-08-09 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | Disabling failing NDB-tests due to Bug 54850 and Bug 54851. | Alexander Nozdrin | 2010-07-02 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | BUG#53259 Unsafe statement binlogged in statement format w/MyIsam temp tables | Alfranio Correia | 2010-06-30 | 1 | -2/+0 |
| * | | | | | | | | | | | | | | BUG#50479 DDL stmt on row-only/stmt-only tables generate spurious binlog_format | Alfranio Correia | 2010-06-02 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | BUG#50670: Slave stops with error code 1644 | Sven Sandberg | 2010-04-28 | 2 | -4/+4 |
| * | | | | | | | | | | | | | | BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a | Alfranio Correia | 2010-04-20 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing | Alfranio Correia | 2010-03-31 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | BUG#51291 Unfortunate effect around variable binlog_direct_non_transactional_... | Alfranio Correia | 2010-03-31 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | Mergine from mysql-next-me | Alexander Barkov | 2010-02-27 | 5 | -40/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Bug#10143 Perror not showing error description | Marc Alff | 2010-02-23 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Patch for WL#3736: Extended Table, Column and Index Comments. | Alexander Nozdrin | 2010-02-20 | 2 | -11/+11 |
| | * | | | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-09 | 3 | -3/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 3 | -1/+104 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 4 | -2/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 6 | -42/+42 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 4 | -1/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 3 | -47/+47 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5, | Konstantin Osipov | 2009-12-05 | 3 | -29/+23 |
| * | | | | | | | | | | | | | | | | | | | | | WL#2649 Number-to-string conversions | Alexander Barkov | 2010-02-11 | 1 | -36/+36 |
| | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | 1. Disable ndb_condition_pushdown.test due to Bug 49746. | Alexander Nozdrin | 2010-02-09 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-02-09 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Fix ndb_dd_ddl.test: drop created database after use. | Alexander Nozdrin | 2010-02-09 | 2 | -0/+3 |
| * | | | | | | | | | | | | | | | | | | | | Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2010-02-02 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 2 | -0/+101 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Auto-merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 2 | -0/+101 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Bug #49132 Replication failure on temporary table + DDL | unknown | 2010-01-22 | 2 | -0/+101 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 6 | -42/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch" | Guilhem Bichot | 2010-01-06 | 6 | -42/+42 |
| | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Manual merge from next-mr. | unknown | 2010-01-12 | 5 | -48/+52 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Manual merge of WL#4738 from mysql-next-mr: | Alexey Kopytov | 2009-12-28 | 4 | -1/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |