Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -11/+11 |
|\ | |||||
| * | Fix compile errors and warnings and test errors introduced by microseconds push. | Vladislav Vaintroub | 2011-05-28 | 1 | -2/+2 |
| * | 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 |
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -4/+37 |
| |\ \ | |||||
| | * \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -4/+37 |
| | |\ \ | |||||
| * | | | | Make SQLString reallocation addaptive | Michael Widenius | 2010-11-08 | 1 | -9/+9 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -6/+39 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#11753363 (bug#44793) CHARACTER SETS: CASE CLAUSE, UCS2 OR UTF32, FAILURE | Alexander Barkov | 2011-03-01 | 1 | -2/+2 |
| * | | | | | Merge of fix for Bug#58165. | Martin Hansson | 2011-01-13 | 1 | -4/+37 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail and | Martin Hansson | 2011-01-13 | 1 | -4/+37 |
| | | |_|/ | | |/| | | |||||
| | * | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -2/+3 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -58/+0 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -7/+69 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | bugfix: engine defined table options were not showing up in INFORMATION_SCHEM... | Sergei Golubchik | 2010-10-24 | 1 | -2/+2 |
| * | | | MWL#36: Add a mysqlbinlog option to change the used database | Sergey Petrunya | 2009-10-24 | 1 | -0/+3 |
| * | | | After merge | Alexander Ivanov | 2009-10-17 | 1 | -4/+0 |
| * | | | MWL#36: Add a mysqlbinlog option to change the used database. | Alexander Ivanov | 2009-10-16 | 1 | -0/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Removed not used declarations | Michael Widenius | 2009-10-13 | 1 | -8/+0 |
| * | | | MWL#36: Add a mysqlbinlog option to change the used database. | Alexander Ivanov | 2009-10-16 | 1 | -9/+0 |
| |/ / | |||||
| * | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -1/+86 |
| |\ \ | | |/ | |||||
| * | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 1 | -4/+64 |
| * | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| |\ \ | |||||
| * \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -11/+8 |
| |\ \ \ | |||||
| * | | | | Fixed wrong test for extra_ip_sock that caused mysqld to die on Mac if --extr... | Michael Widenius | 2009-04-08 | 1 | -2/+2 |
* | | | | | Bug#55077: Assertion failed: width > 0 && to != ((void *)0), | Alexey Kopytov | 2010-08-25 | 1 | -2/+8 |
* | | | | | Backport: Remove unused and ancient files, functions, and facilities. | Davi Arnaut | 2010-05-28 | 1 | -7/+0 |
* | | | | | A fix for Bug#11918 "SP does not accept variables in LIMIT clause" | Konstantin Osipov | 2010-04-14 | 1 | -0/+10 |
* | | | | | Backporting WL#1213 | Alexander Barkov | 2010-02-24 | 1 | -3/+35 |
* | | | | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 1 | -73/+7 |
* | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -1/+1 |
* | | | | | Bug #33544 UDF_INIT member decimals initialized wrong with | Magne Mahre | 2009-11-11 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Bug #33544: UDF_INIT member decimals initialized wrong with | unknown | 2008-03-05 | 1 | -0/+1 |
* | | | | | | Backport of Bug#45767 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -16/+0 |
* | | | | | | Backporting WL#3759 Optimize identifier conversion in client-server protocol | Alexander Barkov | 2009-09-30 | 1 | -4/+64 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Bug# 30946: mysqldump silently ignores --default-character-set | Gleb Shchepa | 2009-07-31 | 1 | -0/+73 |
* | | | | | Bug#45168: assertion with convert() and empty set value | Martin Hansson | 2009-06-16 | 1 | -3/+12 |
* | | | | | Fix for bug#44743: Join in combination with concat does not always work | Ramil Kalimullin | 2009-05-21 | 1 | -0/+3 |
| |_|_|/ |/| | | | |||||
* | | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -11/+8 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge from dev tree. | Alexey Kopytov | 2009-02-14 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge into dev tree. | Alexey Kopytov | 2009-02-10 | 1 | -2/+2 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Fix for bug #21205: Different number of digits for float/double/real in --ps-... | Alexey Kopytov | 2009-01-28 | 1 | -2/+2 |
| * | | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam. | Alexey Kopytov | 2009-02-13 | 1 | -9/+6 |
| |\ \ \ \ | |||||
| | * | | | | Fix for bug #41868: crash or memory overrun with concat + upper, | Alexey Kopytov | 2009-02-10 | 1 | -9/+6 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam. | Alexey Kopytov | 2009-02-06 | 1 | -10/+10 |
| |\ \ \ \ | |||||
| | * | | | | Temporarily reverted patch for bug #41868 as it was causing problems in PB. | Alexey Kopytov | 2009-02-06 | 1 | -10/+10 |
| * | | | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam. | Alexey Kopytov | 2009-02-05 | 1 | -10/+10 |
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | |||||
| | * | | | Fix for bug #41868: crash or memory overrun with concat + upper, date_format | Alexey Kopytov | 2009-02-03 | 1 | -10/+10 |
| | |/ / | |||||
* | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -2/+2 |
| |/ / |