Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 2 | -3/+48 |
|\ | |||||
| * | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 2 | -3/+48 |
* | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 17 | -61/+127 |
|\ \ | |/ | |||||
| * | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -3/+18 |
| |\ | |||||
| | * | Fixed compiler warnings and other bugs found by buildbot. | Michael Widenius | 2011-11-30 | 1 | -3/+18 |
| * | | Fix testcases: | Vladislav Vaintroub | 2011-11-29 | 1 | -1/+1 |
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 17 | -58/+110 |
| |\ \ | | |/ | |||||
| | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 3 | -8/+28 |
| | |\ | |||||
| | | * | Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build. | Tor Didriksen | 2011-11-01 | 1 | -1/+2 |
| | | * | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED | Raghav Kapoor | 2011-09-28 | 1 | -1/+1 |
| | | * | merge from 5.1 main | Bjorn Munch | 2011-09-26 | 1 | -2/+4 |
| | | |\ | |||||
| | | | * | Manual merge from mysql-5.1. | Ramil Kalimullin | 2011-08-09 | 9 | -46/+29 |
| | | | |\ | |||||
| | | | * \ | merge 5.0-security => 5.1-security | Tor Didriksen | 2011-07-15 | 1 | -2/+4 |
| | | | |\ \ | |||||
| | | | | * | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REAL | Tor Didriksen | 2011-07-15 | 1 | -2/+4 |
| | | * | | | | Bug #12793118 MYSQLTEST: --ERROR AND --DISABLE_ABORT_ON_ERROR DO NOT WORK FOR... | Bjorn Munch | 2011-09-14 | 1 | -5/+22 |
| | | | |_|/ | | | |/| | | |||||
| | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 17 | -49/+80 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Manual merge from mysql-5.0. | Alexander Nozdrin | 2011-07-22 | 8 | -42/+27 |
| | | |\ \ \ | |||||
| | | | * | | | For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT | Alexander Nozdrin | 2011-07-22 | 8 | -53/+36 |
| | | * | | | | BUG#12695969 | Luis Soares | 2011-07-11 | 1 | -4/+2 |
| | | |\ \ \ \ | | | | |/ / / | | | | | / / | | | | |/ / | | | |/| | | |||||
| | | | * | | BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTION | Luis Soares | 2011-07-11 | 1 | -7/+3 |
| | | | |/ | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 6 | -26/+49 |
| | | |\ \ | |||||
| | | | * \ | BUG#12354268 | Luis Soares | 2011-05-06 | 1 | -1/+2 |
| | | | |\ \ | |||||
| | | | | * | | BUG#12354268: MYSQLBINLOG --BASE64-OUTPUT=DECODE-ROWS DOES NOT | Luis Soares | 2011-05-05 | 1 | -1/+2 |
| | | | * | | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 1 | -2/+2 |
| | | | |/ / | |||||
| | | | * | | Remove soft links in the build directory, not the source directory (Bug#43312) | Kent Boortz | 2011-05-03 | 1 | -2/+2 |
| | | | * | | Merge mysql-5.1 -> mysql-5.1-innodb | Vasil Dimov | 2011-04-21 | 2 | -3/+9 |
| | | | |\ \ | |||||
| | | | * | | | Bug #11766513 - 59641: Prepared XA transaction in system after hard crash | Marko Mäkelä | 2011-04-07 | 1 | -5/+7 |
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 17 | -33/+65 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 15 | -29/+64 |
| | * | | | | | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -1/+2 |
* | | | | | | | Added handler and temporary table usage to mytop | Michael Widenius | 2011-12-03 | 1 | -0/+2 |
* | | | | | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -1/+2 |
* | | | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -6/+6 |
* | | | | | | | Added MariaDB executable comment syntax: /*M!##### */ | Michael Widenius | 2011-08-29 | 1 | -2/+2 |
* | | | | | | | Automatic merge with 5.2 | Michael Widenius | 2011-08-15 | 1 | -3/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fixes MySQL bug#48972: mysqldump --insert-ignore leaves set unique_checks=0. | Michael Widenius | 2011-08-10 | 1 | -3/+12 |
* | | | | | | | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 3 | -11/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix warnings | Vladislav Vaintroub | 2011-06-13 | 1 | -8/+8 |
| * | | | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 3 | -3/+3 |
* | | | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 2 | -3/+55 |
* | | | | | | | | Merge 5.2 -> 5.3 | Sergey Petrunya | 2011-06-24 | 2 | -5/+26 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Fixes BUG#60976 "Crash, valgrind warning and memory leak with partitioned arc... | Michael Widenius | 2011-06-11 | 2 | -5/+26 |
| |/ / / / / / | |||||
* | | | | | | | Merge with Sergei's tree to get in latest microsecond patches and also fixes ... | Michael Widenius | 2011-06-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -1/+1 |
* | | | | | | | | | Fixed compile failure when we don't use system zlib | Michael Widenius | 2011-06-09 | 1 | -0/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | 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 | 4 | -6/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 2 | -2/+2 |
| * | | | | | | | many changes to my_getsystime.c: | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |