| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -3/+7 |
|\ |
|
| * | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -3/+7 |
| |\ |
|
| | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -3/+7 |
| | |\ |
|
| | | * | Backport of Bug#14171740 65562: STRING::SHRINK SHOULD BE A NO-OP WHEN ALLOCED=0 | Tor Didriksen | 2012-07-26 | 1 | -3/+7 |
* | | | | merge from 5.2 | unknown | 2012-08-24 | 1 | -0/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge from 5.1. | unknown | 2012-08-24 | 1 | -0/+1 |
| |\ \ \
| | |/ / |
|
| | * | | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -0/+1 |
* | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -4/+8 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+8 |
| |\ \ \
| | |/ / |
|
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ \
| | | |/ |
|
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -0/+3 |
| | | |\ |
|
| | | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |\ \ |
|
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 |
|\ \ \ \ \ \ |
|
| * | | | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |
* | | | | | | | Removed some alias warnings | Michael Widenius | 2011-05-18 | 1 | -2/+3 |
* | | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -0/+12 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -0/+12 |
| * | | | | | | Fixed high-impact Windows 64bit warnings (at least 4000 of them) | Vladislav Vaintroub | 2011-02-19 | 1 | -1/+1 |
| * | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -3/+7 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -0/+9 |
* | | | | | | | | fix noisy warnings in header files | Vladislav Vaintroub | 2011-05-04 | 1 | -1/+1 |
* | | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | | | | |
|
| * | | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+13 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | * | | | | | | Bug#48053 String::c_ptr has a race and/or does an invalid | Magne Mahre | 2011-02-17 | 1 | -0/+3 |
| | | |_|_|/ /
| | |/| | | | |
|
| | * | | | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail and | Martin Hansson | 2011-01-13 | 1 | -0/+10 |
| | | |_|/ /
| | |/| | | |
|
* | | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -18/+39 |
|\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | | |
|
| * | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -0/+9 |
| | |_|/ /
| |/| | | |
|
| * | | | | Make SQLString reallocation addaptive | Michael Widenius | 2010-11-08 | 1 | -18/+30 |
* | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -3/+7 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -3/+7 |
| |\ \ \
| | |/ / |
|
| | * | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-19 | 1 | -3/+7 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -1/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -1/+1 |
| |\ \ \
| | |/ / |
|
| | * | | Bug #55424: convert_tz crashes when fed invalid data | Gleb Shchepa | 2010-08-06 | 1 | -1/+1 |
* | | | | bugfix: engine defined table options were not showing up in INFORMATION_SCHEM... | Sergei Golubchik | 2010-10-24 | 1 | -1/+13 |
* | | | | MWL#36: Add a mysqlbinlog option to change the used database | Sergey Petrunya | 2009-10-24 | 1 | -0/+4 |
* | | | | MWL#36: Add a mysqlbinlog option to change the used database. | Alexander Ivanov | 2009-10-16 | 1 | -0/+4 |
|/ / / |
|
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+16 |
|\ \ \
| |/ / |
|
| * | | Bug# 30946: mysqldump silently ignores --default-character-set | Gleb Shchepa | 2009-07-31 | 1 | -0/+16 |
* | | | Fix Valgrind errors seen in buildbot. | unknown | 2009-04-08 | 1 | -0/+5 |
|/ / |
|
* | | Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam | Marc Alff | 2008-08-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Bug#38296 (low memory crash with many conditions in a query) | Marc Alff | 2008-08-11 | 1 | -1/+1 |
* | | Bug#23924 general_log truncates queries with character set introducers. | unknown | 2008-02-29 | 1 | -0/+3 |
* | | Merge mysql.com:/home/my/mysql-5.0 | unknown | 2007-01-27 | 1 | -1/+2 |
|\ \
| |/ |
|
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-01-22 | 1 | -1/+2 |
| |\ |
|
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2006-12-15 | 1 | -1/+2 |
| | |\ |
|
| | | * | Fixed compiler warnings detected by option -Wshadow and -Wunused: | unknown | 2006-12-15 | 1 | -1/+2 |
* | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0 | unknown | 2006-12-23 | 1 | -2/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | Many files: | unknown | 2006-12-23 | 1 | -2/+1 |
| |/ / |
|