Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6 | Alexander Barkov | 2013-10-23 | 1 | -25/+3 |
* | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -15/+19 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -1/+2 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+2 |
| | |\ | |||||
* | | \ | merge | Sergei Golubchik | 2011-11-03 | 1 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -8/+8 |
* | | | | | 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/+3 |
| | |\ \ \ | |||||
* | | \ \ \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -4/+4 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+2 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -3/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Flush DBUG log in case of DBUG_ASSERT() | Michael Widenius | 2011-01-30 | 1 | -3/+2 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -2/+1 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merging Copyright update from 5.1 | Alexander Barkov | 2011-01-19 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Updating Copyright information | Alexander Barkov | 2011-01-19 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -16/+17 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -73/+3 |
| |\ \ \ | | |/ / | |||||
| * | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 1 | -25/+25 |
* | | | | Merging from mysql-5.1-bugteam | Alexander Barkov | 2010-07-26 | 1 | -74/+3 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Bug#45012 my_like_range_cp932 generates invalid string | Alexander Barkov | 2010-07-26 | 1 | -73/+3 |
| |/ / | |||||
* | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -4/+4 |
* | | | WL#3090 Japanese Character Set adjustments | Alexander Barkov | 2010-02-15 | 1 | -4974/+32853 |
* | | | WL#4583 Case conversion in Asian character sets | Alexander Barkov | 2010-01-14 | 1 | -2/+1508 |
|/ / | |||||
* | | Bug#44352 UPPER/LOWER function doesn't work correctly | Alexander Barkov | 2009-05-05 | 1 | -4/+4 |
* | | Merge mysql.com:/home/ram/work/b32726/b32726.5.0 | unknown | 2007-11-29 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Fix for bug #32726: crash with cast in order by clause and cp932 charset | unknown | 2007-11-28 | 1 | -2/+2 |
* | | Merge mysql.com:/home/bar/mysql-work/mysql-5.0-rpl | unknown | 2007-07-05 | 1 | -3/+11 |
|\ \ | |/ | |||||
| * | Bug#29333 myisam corruption with character set cp932 collate cp932_japanese_ci | unknown | 2007-07-04 | 1 | -3/+11 |
* | | WL#3817: Simplify string / memory area types and make things more consistent ... | unknown | 2007-05-10 | 1 | -24/+27 |
* | | Merge mysql.com:/home/my/mysql-5.0 | unknown | 2007-01-27 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-01-22 | 1 | -2/+2 |
| |\ | |||||
| | * | Fixed compiler warnings detected by option -Wshadow and -Wunused: | unknown | 2006-12-15 | 1 | -2/+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 |
| |/ | |||||
* | | After merge fix | unknown | 2006-10-03 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Bug#6147: Traditional: Assigning a string to a numeric column has unexpected ... | unknown | 2006-07-20 | 1 | -0/+1 |
* | | Merge mysql.com:/usr/home/bar/mysql-5.0 | unknown | 2006-03-23 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Bug#15376: Unassigned multibyte codes are converted to U+0000 | unknown | 2006-03-23 | 1 | -3/+3 |
* | | WL#1386 - CTYPE table for unicode character sets | unknown | 2006-02-02 | 1 | -0/+1 |
|/ | |||||
* | Merge mysql.com:/usr/home/bar/mysql-5.0.b12547 | unknown | 2005-10-14 | 1 | -0/+2 |
|\ | |||||
| * | type_binary.result, type_binary.test: | unknown | 2005-10-13 | 1 | -0/+2 |
* | | Bug#12547: Inserting long string into varchar causes table crash in cp932 | unknown | 2005-10-11 | 1 | -1/+1 |
|/ | |||||
* | Fix wrong auto-merge. | unknown | 2005-08-19 | 1 | -0/+2 |
* | fixes for windows 64-bit compiler warnings | unknown | 2005-06-13 | 1 | -1/+1 |
* | Bug#8610: The ucs2_turkish_ci collation fails with upper('i') | unknown | 2005-06-06 | 1 | -0/+6 |
* | Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci | unknown | 2005-05-05 | 1 | -0/+1 |
* | after merge fix | unknown | 2005-04-06 | 1 | -1/+3 |