Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+5 |
|\ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+6 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+6 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+6 |
| | | |\ | |||||
* | | | | | move safemalloc out of dbug. | Sergei Golubchik | 2011-12-12 | 1 | -11/+15 |
* | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -6/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -6/+6 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+5 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | BUG#12695969 | Luis Soares | 2011-07-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | 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 | 1 | -5/+14 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -28/+177 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 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 |
| * | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -2/+2 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -3/+11 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -3/+11 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -3/+11 |
| | | |\ \ \ \ \ | |||||
| * | | \ \ \ \ \ | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 1 | -7/+27 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -7/+27 |
| * | | | | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -13/+136 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -5/+10 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Make mysqlbinlog omit redundant `use` around BEGIN/SAVEPOINT/COMMIT/ROLLBACK ... | unknown | 2011-01-13 | 1 | -2/+13 |
| | * | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -11/+123 |
| * | | | | | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+2 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | MBug#702303: Spurious `use` statements in output from mysqlbinlog --rewrite-d... | unknown | 2011-01-13 | 1 | -5/+10 |
| |/ / / / / / / | |||||
* | | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -14/+16 |
* | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -13/+43 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Fixed cast warnings in introducing the pluggable authentication client | Georgi Kodinov | 2011-06-06 | 1 | -2/+2 |
| * | | | | | | | 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 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merged BUG#11766427, BUG#59539 from 5.1 to 5.5. | Sven Sandberg | 2011-03-25 | 1 | -3/+11 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | BUG#11766427, BUG#59539: Filter by server id in mysqlbinlog fails | Sven Sandberg | 2011-03-25 | 1 | -3/+11 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Bug#58139 : default-auth option not recognized in MySQL standard | Nirbhay Choubey | 2011-01-16 | 1 | -0/+15 |
| * | | | | | wL#5625: Deprecate mysqlbinlog options --base64-output=always and --base64-ou... | Sven Sandberg | 2010-10-29 | 1 | -4/+12 |
| * | | | | | Fix for Bug#57094 (Copyright notice incorrect?). | Alexander Nozdrin | 2010-10-06 | 1 | -5/+3 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+3 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -8/+142 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -34/+33 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -34/+33 |
| | |\ \ \ | |||||
| * | \ \ \ | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -16/+19 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -15/+18 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | merged | Sergei Golubchik | 2010-03-15 | 1 | -2/+6 |
| |\ \ \ \ \ \ | | |/ / / / / |