Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+11 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ | |||||
* | | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -0/+3 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -0/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Fixed some compiler warnings | Michael Widenius | 2010-11-30 | 1 | -0/+2 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -7/+13 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Bug #59884: setting charset to 2048 crashes | Georgi Kodinov | 2011-02-10 | 1 | -7/+13 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -39/+36 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 1 | -2/+2 |
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -0/+8 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+8 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -54/+28 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -53/+27 |
| | |\ \ \ | |||||
| * | | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 1 | -38/+35 |
| |/ / / / | |||||
| * | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -16/+27 |
| |\ \ \ \ | |||||
| * | | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 1 | -0/+3 |
* | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -2/+2 |
* | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -12/+74 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Backporting WL#1213 | Alexander Barkov | 2010-02-24 | 1 | -4/+65 |
| * | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 1 | -8/+8 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -8/+8 |
| * | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -53/+27 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Bug#47756 Setting 2byte collation ID with 'set names' crashes the server | Alexander Barkov | 2009-12-07 | 1 | -0/+3 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-03-22 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Bug #51976 LDML collations issue | Alexander Barkov | 2010-03-22 | 1 | -0/+2 |
* | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-03-07 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Workaround the pthread_once_t static initialization. Per the | Davi Arnaut | 2010-02-26 | 1 | -1/+2 |
| * | | | | | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2010-02-26 | 1 | -0/+5 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-19 | 1 | -53/+27 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -53/+27 |
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | | | |||||
| | * | | | | Bug#49134 5.1 server segfaults with 2byte collation file | Alexander Barkov | 2009-12-15 | 1 | -1/+2 |
| | * | | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 1 | -52/+25 |
| | | |/ / | | |/| | | |||||
* | | | | | Backporting patch for Bug#47756 | Alexander Nozdrin | 2009-12-15 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | Backporting WL#4164 Two-byte collation IDs | Alexander Barkov | 2009-10-15 | 1 | -5/+5 |
* | | | | Backporting WL#3759 Optimize identifier conversion in client-server protocol | Alexander Barkov | 2009-09-30 | 1 | -0/+3 |
|/ / / | |||||
* | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -1/+1 |
* | | | Bug#42649 THR_LOCK_charset global mutex abused by InnoDB | Alexander Barkov | 2009-04-07 | 1 | -15/+26 |
|/ / | |||||
* | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines | unknown | 2007-10-24 | 1 | -0/+40 |
| |\ | |||||
| | * | BUG#31159 - fulltext search on ucs2 column crashes server | unknown | 2007-10-24 | 1 | -0/+40 |
* | | | Bug#41084 full-text index added to custom UCA collation not working | Alexander Barkov | 2009-02-02 | 1 | -2/+2 |
* | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> | unknown | 2008-02-18 | 1 | -6/+6 |