Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -42/+50 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | | | ||||||
| | * | | | | | | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -5/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -5/+10 | |
| * | | | | | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Added TRASH() to table->record[0] to find out if we access not initialzed data. | Michael Widenius | 2010-11-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -5/+10 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -53/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | auto-merge | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -6/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | merge from 5.1 | Guilhem Bichot | 2011-04-26 | 1 | -5/+4 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Fix for Bug#11765141 - "58072: LOAD DATA INFILE: LEAKS IO CACHE MEMORY WHEN E... | Guilhem Bichot | 2011-04-07 | 1 | -5/+4 | |
| | * | | | | | | | | | 5.1 -> 5.5 merge | Sergey Glukhov | 2011-04-15 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| | | * | | | | | | | Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS ... | Sergey Glukhov | 2011-04-15 | 1 | -1/+1 | |
| | | | |_|/ / / / | | | |/| | | | | | ||||||
| | | * | | | | | | merge | Georgi Kodinov | 2010-12-17 | 1 | -0/+7 | |
| | | |\ \ \ \ \ \ | ||||||
| * | | \ \ \ \ \ \ | auto-merge | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -3/+2 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | Bug#11902767/Bug#60580: Statement improperly replicated crashes slave SQL thread | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -3/+2 | |
| * | | | | | | | | | bug#59085 recommit | Mattias Jonsson | 2011-02-10 | 1 | -4/+3 | |
| * | | | | | | | | | BUG#59267 LOAD DATA LOCAL INFILE not executed on slave with SBR | Alfranio Correia | 2011-01-12 | 1 | -1/+3 | |
| * | | | | | | | | | merge | Georgi Kodinov | 2010-12-17 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | BUG#46166 | Luis Soares | 2010-12-07 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | ||||||
| | | * | | | | | | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error | Luis Soares | 2010-11-30 | 1 | -0/+7 | |
| | | | |_|/ / / / | | | |/| | | | | | ||||||
| * | | | | | | | | merge 5.1-security => 5.5-security | Kristofer Pettersson | 2010-12-16 | 1 | -42/+41 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Bug58747 57359 patch: breaks secure_file_priv+not secure yet+still accesses o... | Kristofer Pettersson | 2010-12-16 | 1 | -42/+43 | |
| | |/ / / / / | ||||||
| * | | | | | | Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam. | Alexey Kopytov | 2010-10-02 | 1 | -6/+5 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
* | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -0/+8 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -25/+39 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -5/+3 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -14/+24 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -6/+11 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -14/+121 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -5/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -3/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -3/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -7/+7 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -26/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -5/+0 | |
* | | | | | | | | | | | | | | | | | | mysql-5.1 -> mysql-5.5 merge | Sergei Golubchik | 2010-11-05 | 1 | -6/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Bug #56709: Memory leaks at running the 5.1 test suite | Alexey Kopytov | 2010-09-22 | 1 | -7/+5 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l... | unknown | 2010-08-03 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |