Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Fixed Bug#47017 rpl_timezone fails on PB-2 with mismatch error | Michael Widenius | 2009-12-04 | 1 | -5/+6 | |
* | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -47/+57 | |
|\ | ||||||
| * | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -47/+57 | |
| |\ | ||||||
| | * | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -8/+9 | |
| | * | A patch for Bug#45118 (mysqld.exe crashed in debug mode | Alexander Nozdrin | 2009-09-10 | 1 | -38/+47 | |
| | * | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-09-04 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | Fix for BUG#46384 - mysqld segfault when trying to create table with same | Satya B | 2009-09-04 | 1 | -1/+1 | |
* | | | | Added protection around usage of thd->mysys_var | Michael Widenius | 2009-11-26 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Added error handling for my_seek() & my_tell() failures | Michael Widenius | 2009-11-07 | 1 | -0/+2 | |
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -23/+29 | |
|\ \ \ | |/ / | ||||||
| * | | BUG#45574 CREATE IF NOT EXISTS is not binlogged if the object exists | unknown | 2009-08-13 | 1 | -23/+29 | |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -12/+62 | |
|\ \ \ | |/ / | ||||||
| * | | Merge from 5.0 | Gleb Shchepa | 2009-07-24 | 1 | -1/+1 | |
| |\ \ | | |/ | ||||||
| | * | Bug #38816: kill + flush tables with read lock + stored | Gleb Shchepa | 2009-07-24 | 1 | -1/+1 | |
| * | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-07-03 | 1 | -3/+29 | |
| |\ \ | | |/ | ||||||
| | * | Bug#45806 crash when replacing into a view with a join! | Sergey Glukhov | 2009-07-03 | 1 | -3/+29 | |
| * | | Merge | Martin Hansson | 2009-06-22 | 1 | -0/+3 | |
| |\ \ | ||||||
| | * | | Bug#44653: Server crash noticed when executing random queries with partitions. | Martin Hansson | 2009-06-22 | 1 | -0/+3 | |
| * | | | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam | Alfranio Correia | 2009-06-18 | 1 | -2/+1 | |
| |\ \ \ | ||||||
| | * | | | BUG#43929 binlog corruption when max_binlog_cache_size is exceeded | Alfranio Correia | 2009-06-18 | 1 | -2/+1 | |
| | |/ / | ||||||
| | | | | ||||||
| | \ \ | ||||||
| *-. \ \ | Merge from 5.0-bugteam | Staale Smedseng | 2009-06-17 | 1 | -7/+7 | |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | ||||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-17 | 1 | -4/+5 | |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-10 | 1 | -4/+5 | |
| | |/ | ||||||
| * | | auto-merge | Tatiana A. Nurnberg | 2009-06-05 | 1 | -0/+3 | |
| |\ \ | | |/ | ||||||
| | * | Bug#32149: Long semaphore wait for adaptive hash latch | Tatiana A. Nurnberg | 2009-06-05 | 1 | -0/+3 | |
| | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -19/+23 | |
| | |\ | ||||||
| | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -2/+29 | |
| | | |\ | ||||||
| | | * \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -1/+10 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -5/+23 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -1/+2 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -24/+49 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -19/+19 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -19/+19 | |
| | | | |\ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -19/+19 | |
| | | | | |\ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-04-26 | 1 | -19/+19 | |
| | | | | | |\ \ \ \ \ \ | ||||||
| | * | | | | \ \ \ \ \ \ | Auto merge | He Zhenxing | 2009-04-08 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | fixed a compilation warning | Georgi Kodinov | 2009-03-27 | 1 | -1/+3 | |
| | * | | | | | | | | | | | BUG#37145 Killing a statement doing DDL may log binlog event with error code ... | He Zhenxing | 2009-03-27 | 1 | -2/+3 | |
| | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge | Leonard Zhou | 2009-03-24 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contorted | He Zhenxing | 2009-05-30 | 1 | -5/+25 | |
* | | | | | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Fixed initialization order warining. | Georgi Kodinov | 2009-03-24 | 1 | -2/+2 | |
| * | | | | | | | | | | | | Merge | Leonard Zhou | 2009-03-24 | 1 | -1/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | BUG#41719 delayed INSERT into timestamp col needs set time_zone for concurren... | Leonard Zhou | 2009-03-24 | 1 | -1/+26 | |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -14/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -1/+1 | |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -15/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -14/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Bug#41098: Query Cache returns wrong result with concurrent insert | Davi Arnaut | 2009-02-19 | 1 | -14/+0 | |
| | |/ / / / / / / / / / |