| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+3 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+3 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+3 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -3/+8 |
| | | | |\ | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| * | | | | | fix warnings | Vladislav Vaintroub | 2011-06-13 | 1 | -8/+8 |
| * | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -11/+19 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -11/+19 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Bug#11765157 - 58090: mysqlslap drops schema specified in | Nirbhay Choubey | 2011-04-08 | 1 | -3/+8 |
| | | |/ | |||||
| | | * | Bug#59109 : mysqlslap crashes on mysql_fetch_row after ignoring | Nirbhay Choubey | 2011-01-13 | 1 | -5/+15 |
| * | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+2 |
| |/ / | |||||
| * | | This patch fixes LP#613408 Memory corruption with (M)aria storage engine and... | Michael Widenius | 2010-08-07 | 1 | -1/+1 |
| * | | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar... | Michael Widenius | 2010-08-06 | 1 | -6/+6 |
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -58/+55 |
| |\ \ | |/ | |||||
| | * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -55/+51 |
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -6/+6 |
| |\ \ | |/ | |||||
| | * | Recommit of Bug#49447. | Staale Smedseng | 2010-02-04 | 1 | -6/+6 |
| * | | Patch set contributed by Alex Budovski (MCA) | Michael Widenius | 2010-01-29 | 1 | -15/+22 |
| * | | Merge | Michael Widenius | 2009-12-03 | 1 | -10/+8 |
| |\ \ | |||||
| | * \ | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable... | Michael Widenius | 2009-12-03 | 1 | -10/+8 |
| | |\ \ | |||||
| | | * \ | Merge with MySQL 5.1, with following additions: | Michael Widenius | 2009-11-11 | 1 | -5/+11 |
| | | |\ \ | | | |/ | |||||
| * | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -5/+11 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -5/+11 |
| | |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | | * | automerge | Georgi Kodinov | 2009-10-04 | 1 | -2/+2 |
| | | |\ | |||||
| | | | * | Fix bug#46980 | Joerg Bruehe | 2009-09-17 | 1 | -2/+2 |
| | | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -2/+7 |
| | | |/ | |||||
| * | | | Fixed typos of --engine help text. | Hakan Kuecuekyilmaz | 2009-11-11 | 1 | -2/+2 |
| |/ / | |||||
| * | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -2/+2 |
| * | | Merge MySQL-5.1.38 and XtraDB-7 into MariaDB. | unknown | 2009-09-25 | 1 | -2/+8 |
| |\ \ | |||||
| | * \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -2/+8 |
| | |\ \ | | |/ | |||||
| | | * | Merge in bug fixes for client tools | Jim Winstead | 2009-07-14 | 1 | -2/+6 |
| | | |\ | |||||
| | | | * | mysqlslap didn't correctly handle --csv with no argument. (Bug #44412) | Jim Winstead | 2009-05-18 | 1 | -2/+6 |
| | | * | | Fix compilation failures: get rid of C++ specifics in C-code. | Alexander Nozdrin | 2009-06-03 | 1 | -1/+1 |
| | | |/ | |||||
| | | * | Various command-line utilities, including mysqlbinlog and mysqldump, don't | Jim Winstead | 2009-05-07 | 1 | -0/+2 |
| * | | | Fix for | Hakan Kuecuekyilmaz | 2009-09-18 | 1 | -27/+57 |
| |/ / | |||||
| * | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -1/+1 |
| * | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -3/+1 |
| |\ \ | |/ | |||||
| | * | mysql-test/r/partition.result | Build Team | 2008-11-25 | 1 | -3/+1 |
| * | | compilation warnings | Sergei Golubchik | 2008-12-05 | 1 | -1/+1 |
| * | | dbug fix: only do safemalloc checks if a function is selected | Sergei Golubchik | 2008-12-02 | 1 | -4/+11 |
| |/ | |||||
| * | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2008-02-08 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-11-08 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-10-01 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Removed extra spaces | unknown | 2007-10-01 | 1 | -1/+1 |
| * | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch | unknown | 2007-12-20 | 1 | -31/+38 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | client_priv.h: | unknown | 2007-12-20 | 1 | -25/+24 |
| | * | | | Fix for bug#31704 | unknown | 2007-10-18 | 1 | -7/+15 |
| | |/ / | |||||
| * | | | Fixed bug #29985. | unknown | 2007-09-17 | 1 | -7/+11 |
| |/ / | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |