Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -58/+31 |
|\ | |||||
| * | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -51/+15 |
| |\ | |||||
| | * | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -5/+2 |
| | |\ | |||||
| | * | | Fix test suite so that it works when doing configure --without-uca | Michael Widenius | 2009-12-27 | 1 | -46/+0 |
| | * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+13 |
| | |\ \ | |||||
| * | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge Percona microsec_process patch into MariaDB. | unknown | 2009-09-23 | 1 | -2/+4 |
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+15 |
| |\ \ \ | |||||
| * | | | | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 1 | -4/+20 |
| * | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -0/+2 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -10/+11 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -0/+145 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fixes to bugs and compiler warnings detected by pushbuild | unknown | 2008-01-12 | 1 | -1/+1 |
| | * | | | | | | | | | Fixed compiler warnings by adding casts and changing variable types | unknown | 2008-01-11 | 1 | -2/+2 |
| | * | | | | | | | | | Added maria_zerofill() | unknown | 2007-12-31 | 1 | -1/+1 |
| | * | | | | | | | | | - Clean up function for my_uuid() | unknown | 2007-12-18 | 1 | -2/+2 |
* | | | | | | | | | | | Bug#52312 lost Handler_read_last status variable | Marc Alff | 2010-08-25 | 1 | -0/+1 |
* | | | | | | | | | | | WL#5370 Keep forward-compatibility when changing | unknown | 2010-08-18 | 1 | -45/+358 |
* | | | | | | | | | | | This patch backports test coverage for: | Jon Olav Hauglid | 2010-06-11 | 1 | -0/+55 |
* | | | | | | | | | | | Bug#49193 CREATE TABLE reacts differently depending on whether | Magne Mahre | 2010-05-05 | 1 | -0/+41 |
* | | | | | | | | | | | Bug#48800 CREATE TABLE t...SELECT fails if t is a temporary | Magne Mahre | 2010-05-05 | 1 | -0/+15 |
* | | | | | | | | | | | Mergine from mysql-next-me | Alexander Barkov | 2010-02-27 | 1 | -5/+29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Patch for WL#3736: Extended Table, Column and Index Comments. | Alexander Nozdrin | 2010-02-20 | 1 | -4/+4 |
| * | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -5/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Backport of revno: 2617.76.3 | Jon Olav Hauglid | 2009-12-09 | 1 | -0/+1 |
| * | | | | | | | | | | | | | Backport of revno: 2617.76.2 | Jon Olav Hauglid | 2009-12-09 | 1 | -0/+18 |
| * | | | | | | | | | | | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -1/+6 |
* | | | | | | | | | | | | | | WL#2649 Number-to-string conversions | Alexander Barkov | 2010-02-11 | 1 | -2/+2 |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-27 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | BUG#47418 RBR fails, failure with mixup of base/temporary/view | unknown | 2010-01-16 | 1 | -5/+2 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase ... | Sergei Golubchik | 2009-12-22 | 1 | -2/+2 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Bug #43054 Assertion `!table->auto_increment_field_not_null' failed when ... | Magne Mahre | 2009-10-15 | 1 | -0/+34 |
|/ / / / / / / / / | |||||
* | | | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-09-04 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Fix for BUG#46384 - mysqld segfault when trying to create table with same | Satya B | 2009-09-04 | 1 | -0/+13 |
* | | | | | | | | | Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted,... | Guilhem Bichot | 2009-07-29 | 1 | -0/+14 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Bug 22047: Time in SHOW PROCESSLIST for SQL thread in replication seems to | Georgi Kodinov | 2009-03-17 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bug#40104 regression with table names? | Sergey Glukhov | 2008-12-23 | 1 | -0/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Bug#35789 wrong datatypes for collation and charset columns in EVENTS, ROUTIN... | Sergey Glukhov | 2008-11-13 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merging 5.1 main into 5.1-rpl | Mats Kindahl | 2008-10-23 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.0->5.1 bugteam merge | Sergey Glukhov | 2008-10-02 | 1 | -0/+2 |
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | | |||||
| | * | | | Bug#35924 DEFINER should be stored 'quoted' in I_S | Sergey Glukhov | 2008-10-02 | 1 | -0/+2 |
* | | | | | Merging 5.1 main into 5.1-rpl. | Mats Kindahl | 2008-10-06 | 1 | -0/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | After-merge fix. | Ramil Kalimullin | 2008-09-05 | 1 | -2/+2 |