Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 6 | -10/+22 |
|\ | |||||
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 6 | -10/+22 |
| |\ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 6 | -10/+22 |
* | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | remove redundant declarations | Sergei Golubchik | 2011-10-04 | 1 | -1/+0 |
* | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
|\ \ \ | |/ / | |||||
| * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
* | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -2/+0 |
* | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 2 | -6/+5 |
|\ \ \ | |/ / | |||||
| * | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 2 | -6/+5 |
* | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -10/+6 |
|\ \ \ | |/ / | |||||
| * | | build dynamic plugins with the -shared libtool option to avoid | Sergei Golubchik | 2010-09-09 | 1 | -1/+1 |
| * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -10/+6 |
| |\ \ | | |/ | |||||
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -8/+4 |
| | * | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-09 | 1 | -2/+2 |
* | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+7 |
|\ \ \ | |/ / | |||||
| * | | Fixed trival bug introduced in last patch (buffer was not extended) | Michael Widenius | 2010-06-23 | 1 | -1/+5 |
| * | | Fixes for Opensolaris (to get buildbot green) | Michael Widenius | 2010-06-23 | 1 | -0/+3 |
* | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -2/+14 |
|\ \ \ | |/ / | |||||
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -2/+14 |
| |\ \ | | |/ | |||||
| | * | Bug#33717 INSERT...(default) fails for enum. Crashes CSV tables, loads spaces... | Sergey Glukhov | 2010-02-17 | 1 | -2/+14 |
* | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -1/+17 |
|/ / | |||||
* | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -2/+2 |
* | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -9/+2 |
|\ \ | |/ | |||||
| * | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -9/+2 |
* | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 4 | -38/+39 |
|\ \ | |/ | |||||
| * | compiler warning fix | Sergey Glukhov | 2009-03-24 | 4 | -33/+34 |
| * | fixed compilation warnings. addendum to the fix for bug 29125 | Georgi Kodinov | 2009-03-20 | 1 | -2/+2 |
| * | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 3 | -3/+3 |
* | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Bug#41441 repair csv table crashes debug server | Sergey Glukhov | 2008-12-29 | 1 | -0/+11 |
* | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -19/+19 |
|\ \ | |/ | |||||
| * | Bug#36638 mysqld crashes when open file limit is passed and general query log... | Sergey Glukhov | 2008-08-15 | 1 | -19/+19 |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -1/+1 |
|\ \ | |||||
| * | | Added versioning of row data | unknown | 2008-04-10 | 1 | -1/+1 |
* | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 3 | -6/+43 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/... | unknown | 2008-03-07 | 2 | -6/+42 |
| |\ | |||||
| | * | Bug#33067 | unknown | 2008-01-17 | 2 | -6/+42 |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build | unknown | 2008-02-21 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Bug#31929 Windows build fails with >=4 Parallel build threads. | unknown | 2008-01-29 | 1 | -0/+1 |
* | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 2 | -2/+14 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 2 | -2/+14 |
| |\ \ | |||||
| | * \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-07-07 | 2 | -2/+14 |
| | |\ \ | |||||
| | | * \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-07 | 2 | -2/+14 |
| | | |\ \ | |||||
| | | | * | | in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock(). | unknown | 2007-07-04 | 2 | -2/+14 |
* | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amain | unknown | 2007-12-11 | 1 | -9/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | BUG#32817 - though CSV is marked as supported create table is rejected | unknown | 2007-12-07 | 1 | -1/+4 |
| * | | | | | | BUG#32050 - table logging gone wrong. | unknown | 2007-11-27 | 1 | -8/+0 |
| | |_|_|_|/ | |/| | | | |