| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -2/+2 |
| * | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -8/+37 |
| |\ \ | |/ | |||||
| | * | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -8/+37 |
| | |\ | |||||
| | | * | Bug#53191 Lock_time in slow log is negative when logging stored routines | Kristofer Pettersson | 2010-06-08 | 1 | -8/+37 |
| * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -21/+17 |
| |\ \ \ | |/ / | |||||
| | * | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -21/+13 |
| | |\ \ | | |/ | |||||
| | | * | Bug#50755: Crash if stored routine def contains version comments | Davi Arnaut | 2010-04-01 | 1 | -21/+13 |
| | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+4 |
| | |\ \ | | |/ | |||||
| | | * | Bug#48525: trigger changes "Column 'id' cannot be null" behaviour | Tatiana A. Nurnberg | 2010-03-29 | 1 | -0/+1 |
| | | * | revert 48525 | Tatiana A. Nurnberg | 2010-02-22 | 1 | -1/+0 |
| | | * | Bug#48525: trigger changes "Column 'id' cannot be null" behaviour | Tatiana A. Nurnberg | 2010-02-18 | 1 | -0/+1 |
| | | * | Bug #47905 stored procedures with conditional statements not | Staale Smedseng | 2010-02-11 | 1 | -0/+3 |
| * | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -1/+1 |
| * | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| * | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -2/+10 |
| |\ \ \ | |/ / | |||||
| | * | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -2/+10 |
| | |\ \ | | |/ | |||||
| | | * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -0/+1 |
| | | * | Bug#47649 crash during CALL procedure | Sergey Glukhov | 2009-12-23 | 1 | -2/+9 |
| * | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -6/+18 |
| |\ \ \ | |/ / | |||||
| | * | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -6/+18 |
| | |\ \ | | |/ | |||||
| | | * | merge | Kristofer Pettersson | 2009-11-20 | 1 | -6/+18 |
| | | |\ | |||||
| | | | * | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -6/+18 |
| * | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -19/+24 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -18/+22 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -18/+22 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Bug #47412: Valgrind warnings / user can read uninitalized memory using | Georgi Kodinov | 2009-10-26 | 1 | -14/+17 |
| | | | |/ | |||||
| | | | * | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -4/+5 |
| | * | | | Fixes after comments from last push: | Michael Widenius | 2009-11-30 | 1 | -1/+1 |
| | * | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -1/+2 |
| | |/ / | |||||
| * | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -1/+4 |
| |/ / | |||||
| * | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -7/+5 |
| |\ \ | |/ |/| | |||||
| | * | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -7/+5 |
| * | | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ... | Kristofer Pettersson | 2009-07-29 | 1 | -2/+2 |
| * | | Merge from 5.0 | Gleb Shchepa | 2009-07-24 | 1 | -4/+2 |
| |\ \ | |||||
| | * | | Bug #38816: kill + flush tables with read lock + stored | Gleb Shchepa | 2009-07-24 | 1 | -4/+2 |
| | * | | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -2/+31 |
| | |\ \ | |||||
| | | * | | Pull 5.1 treatment of community features into 5.0. | Chad MILLER | 2009-05-05 | 1 | -5/+5 |
| | | * | | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -8/+13 |
| | | |\ \ | |||||
| | | * \ \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -3/+10 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -0/+4 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -1/+7 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -2/+31 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Push history-limiting code until after the code that adds new | unknown | 2007-11-14 | 1 | -0/+29 |
| | | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -2/+2 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-04-26 | 1 | -2/+2 |
| | | | | | |\ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contorted | He Zhenxing | 2009-05-30 | 1 | -1/+2 |
| * | | | | | | | | | | | | Bug#43962 "Packets out of order" calling a SHOW TABLE STATUS | Sergey Glukhov | 2009-04-30 | 1 | -0/+1 |
| * | | | | | | | | | | | | merging | Alexey Botchkov | 2009-04-29 | 1 | -13/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |