| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge. | Sergei Golubchik | 2010-11-25 | 1 | -5/+10 |
| |\ | |||||
| | * | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -1/+1 |
| | * | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -1/+6 |
| | * | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+3 |
| | |\ | |||||
| | * | | Removed compiler warnings | Michael Widenius | 2010-04-07 | 1 | -2/+3 |
| | * | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -15/+28 |
| | |\ \ | |||||
| | * \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -5/+5 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -1/+37 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -2/+1 |
| | * | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -24/+35 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -1/+1 |
| | * | | | | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de... | Michael Widenius | 2008-12-03 | 1 | -1/+6 |
| | * | | | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -2/+7 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -1/+0 |
| * | | | | | | | | | | Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime. | Jon Olav Hauglid | 2010-08-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | merge | Georgi Kodinov | 2010-08-05 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | | Bug #54105 assert in MDL_context::release_locks_stored_before | Jon Olav Hauglid | 2010-08-13 | 1 | -3/+0 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -12/+2 |
| * | | | | | | | | | | Manual merge of mysql-5.1-bugteam to | Alexey Kopytov | 2010-04-19 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+10 |
| * | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Bug #50095 Multi statement including CREATE EVENT causes rotten binlog entry | unknown | 2010-03-28 | 1 | -1/+3 |
| * | | | | | | | | | | Bug #51160 Deadlock around SET GLOBAL EVENT_SCHEDULER = ON|OFF | Jon Olav Hauglid | 2010-03-15 | 1 | -12/+15 |
| * | | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -10/+18 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mr | Luis Soares | 2010-02-10 | 1 | -0/+4 |
| | * | | | | | | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mr | Luis Soares | 2010-02-09 | 1 | -10/+14 |
| * | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -7/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-03 | 1 | -39/+40 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-02-03 | 1 | -39/+40 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | Revert a patch for Bug#48231, which introduced valgrind warnings. | Alexander Nozdrin | 2010-02-02 | 1 | -39/+40 |
| | | * | | | | | | | | | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -40/+39 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -40/+39 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; | unknown | 2010-01-30 | 1 | -40/+39 |
| | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Manual merge with Conflicts: | unknown | 2010-01-25 | 1 | -5/+4 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -3/+3 |
| | * | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 1 | -6/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Auto-merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -6/+17 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | | * | | | | | | | | | Bug #49132 Replication failure on temporary table + DDL | unknown | 2010-01-22 | 1 | -6/+17 |
| | | * | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -6/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Bug#49501 Inefficient information_schema check (system collation), addon | Sergey Glukhov | 2010-01-22 | 1 | -2/+1 |
| | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-28 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Bug#49501 Inefficient information_schema check (system collation) | Sergey Glukhov | 2010-01-19 | 1 | -6/+9 |
| | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -26/+72 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -150/+9 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |