Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -8/+11 |
|\ | |||||
| * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -7/+8 |
| |\ | |||||
| | * | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -8/+9 |
| * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| |\ \ | | |/ | |/| | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | * | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -1/+1 |
* | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -4/+10 |
|\ \ \ | |/ / | |||||
| * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -4/+10 |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | BUG#46483 - drop table of partitioned table may leave | Sergey Vojtovich | 2009-09-02 | 1 | -4/+4 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | bug#44166 | Sergei Golubchik | 2009-05-04 | 1 | -2/+1 |
* | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -9/+8 |
|\ \ \ | |/ / | |||||
| * | | Bug#41465: confusing error message when comment is too long | Davi Arnaut | 2009-03-05 | 1 | -9/+8 |
* | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -10/+20 |
|\ \ \ | |/ / | |||||
| * | | Merge fix for bug 38145 from 5.0. | Chad MILLER | 2009-01-26 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Merge from dev tree. | Chad MILLER | 2009-01-14 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Fix comment. Boolean function returns true/false, not zero/one. | Chad MILLER | 2009-01-14 | 1 | -2/+2 |
| * | | | manual merge | Tatiana A. Nurnberg | 2008-12-01 | 1 | -8/+18 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#39591: Crash if table comment is longer than 62 characters | Tatiana A. Nurnberg | 2008-11-20 | 1 | -8/+18 |
| | |/ | |||||
| | * | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | unknown | 2007-12-17 | 1 | -0/+8 |
| | |\ | |||||
* | | \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -3/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2008-03-28 | 1 | -2/+4 |
| |\ \ \ | |||||
| | * \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2008-02-08 | 1 | -2/+4 |
| | |\ \ \ | |||||
| | | * \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-11-08 | 1 | -2/+4 |
| | | |\ \ \ | |||||
| | | | * | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1 | unknown | 2007-10-11 | 1 | -2/+4 |
| * | | | | | | Fix for Bug#34274: Invalid handling of 'DEFAULT 0' | unknown | 2008-03-22 | 1 | -3/+1 |
| |/ / / / / | |||||
* | | | | | | Add warning of TRANSACTIONAL=1 is used with handler that doesn't support it | unknown | 2008-02-11 | 1 | -2/+1 |
* | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -2/+10 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge ibm.:/home/alik/Documents/MySQL/devel/5.1 | unknown | 2008-01-19 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | A pre-requisite for the fix for Bug#12713 "Error in a stored function | unknown | 2007-12-20 | 1 | -2/+2 |
| * | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt | unknown | 2007-12-17 | 1 | -0/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Merge mysql.com:/misc/mysql/31752_/50-31752_ | unknown | 2007-12-17 | 1 | -0/+5 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Merge mysql.com:/misc/mysql/31752_/41-31752_ | unknown | 2007-12-17 | 1 | -0/+5 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Bug#31752: check strmake() bounds | unknown | 2007-12-06 | 1 | -0/+5 |
| | * | | | | | | Merge mysql.com:/misc/mysql/31752_/50-31752_ | unknown | 2007-11-26 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | Merge mysql.com:/misc/mysql/31752_/41-31752_ | unknown | 2007-11-26 | 1 | -0/+3 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Bug#31752: check strmake() bounds | unknown | 2007-11-26 | 1 | -0/+3 |
* | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -3/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fixed errors found by valgrind | unknown | 2007-11-21 | 1 | -1/+1 |
| * | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -2/+4 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -2/+4 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -2/+4 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -2/+4 |
| | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-18 | 1 | -2/+4 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * | | | | | Maria - post-review fixes about my_sync_dir(): | unknown | 2006-11-22 | 1 | -5/+4 |
| | | | | | * | | | | | Maria - various fixes around durability of files: | unknown | 2006-11-21 | 1 | -3/+6 |
* | | | | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51 | unknown | 2007-12-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge mysql.com:/home/ram/work/mysql-5.0-maint | unknown | 2007-11-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | compiler warnings fixed. | unknown | 2007-11-10 | 1 | -1/+1 |
| | | |_|_|_|_|/ / | | |/| | | | | | |