Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -55/+34 | |
* | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -1/+1 | |
* | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -11/+13 | |
|\ | ||||||
| * | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -9/+9 | |
| |\ | ||||||
| | * | weave merge of mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-05-10 | 1 | -6/+5 | |
| | |\ | ||||||
| | * \ | Merged 5.0-security->5.1-security | Georgi Kodinov | 2011-05-04 | 1 | -9/+9 | |
| | |\ \ | ||||||
| | | * | | Bug #11764517: 57359: POSSIBLE TO CIRCUMVENT SECURE_FILE_PRIV | Georgi Kodinov | 2011-04-28 | 1 | -24/+24 | |
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -7/+6 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 | |
| | | |/ | | |/| | ||||||
* | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -11/+6 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Fix for Bug#11765141 - "58072: LOAD DATA INFILE: LEAKS IO CACHE MEMORY WHEN E... | Guilhem Bichot | 2011-04-07 | 1 | -5/+4 | |
| * | | | Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS ... | Sergey Glukhov | 2011-04-15 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -42/+50 | |
|\ \ \ | |/ / | ||||||
| * | | merge | Georgi Kodinov | 2010-12-17 | 1 | -0/+7 | |
| |\ \ | ||||||
| | * | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error | Luis Soares | 2010-11-30 | 1 | -0/+7 | |
| * | | | Bug58747 57359 patch: breaks secure_file_priv+not secure yet+still accesses o... | Kristofer Pettersson | 2010-12-16 | 1 | -42/+43 | |
| |/ / | ||||||
* | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -1/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Bug #56709: Memory leaks at running the 5.1 test suite | Alexey Kopytov | 2010-09-22 | 1 | -7/+5 | |
* | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -0/+8 | |
|\ \ \ | |/ / | ||||||
| * | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l... | unknown | 2010-08-03 | 1 | -0/+8 | |
| * | | Revert patch for BUG#34283. Causing lots of test failures in PB2, | Luis Soares | 2010-07-30 | 1 | -8/+0 | |
| * | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l... | unknown | 2010-07-30 | 1 | -0/+8 | |
* | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -25/+39 | |
|\ \ \ | |/ / | ||||||
| * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -7/+6 | |
| * | | Bug #51876: crash/memory underrun when loading data with ucs2 | Georgi Kodinov | 2010-07-14 | 1 | -23/+33 | |
* | | | Fixed warnings and build failures after last push | Michael Widenius | 2010-08-02 | 1 | -3/+3 | |
* | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -2/+4 | |
|\ \ \ | |/ / | ||||||
| * | | Merge | Georgi Kodinov | 2010-06-09 | 1 | -0/+4 | |
| |\ \ | ||||||
| | * | | Bug #52512: Assertion `! is_set()' in Diagnostics_area::set_ok_status | Georgi Kodinov | 2010-04-07 | 1 | -0/+4 | |
| * | | | Bug#53189 Table map version unused and can be removed | He Zhenxing | 2010-05-08 | 1 | -2/+0 | |
* | | | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -1/+1 | |
* | | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -9/+4 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Bug#50373 --secure-file-priv="" | Kristofer Pettersson | 2010-05-03 | 1 | -7/+4 | |
| * | | | Automerge | Kristofer Pettersson | 2010-04-16 | 1 | -5/+3 | |
| |\ \ \ | | |/ / | ||||||
| * | | | Bug#50373 --secure-file-priv="" | Kristofer Pettersson | 2010-04-16 | 1 | -3/+1 | |
* | | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -5/+3 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Bug#51377 Crash in information_schema / processlist on concurrent DDL wo... | Alexey Botchkov | 2010-03-09 | 1 | -5/+3 | |
| |/ / | ||||||
* | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -14/+24 | |
|\ \ \ | |/ / | ||||||
| * | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -14/+18 | |
| * | | BUG#49479: Slave stops with syntax error: LOAD DATA event without | Luis Soares | 2009-12-06 | 1 | -0/+6 | |
* | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -6/+11 | |
|\ \ \ | |/ / | ||||||
| * | | Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with ... | unknown | 2009-11-28 | 1 | -6/+11 | |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -14/+121 | |
|\ \ \ | |/ / | ||||||
| * | | BUG#48297: Schema name is ignored when LOAD DATA is written into | Luis Soares | 2009-10-27 | 1 | -5/+25 | |
| * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -5/+4 | |
| * | | Bug#43746: YACC return wrong query string when parse 'load data infile' sql s... | Tatiana A. Nurnberg | 2009-09-28 | 1 | -13/+101 | |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -5/+19 | |
|\ \ \ | |/ / | ||||||
| * | | Bug# 30946: mysqldump silently ignores --default-character-set | Gleb Shchepa | 2009-07-31 | 1 | -0/+11 | |
| | | | ||||||
| | \ | ||||||
| *-. \ | Merge from 5.0-bugteam | Staale Smedseng | 2009-06-17 | 1 | -4/+4 | |
| |\ \ \ | | | |/ |