Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MySQL 5.1.42mariadb-merge-mysql-5.1.42 | Michael Widenius | 2010-01-15 | 1 | -14/+0 |
|\ | |||||
| * | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an... | Davi Arnaut | 2009-11-24 | 1 | -14/+0 |
* | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -0/+14 |
|\ \ | |||||
| * \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+14 |
| |\ \ | | |/ | |||||
| | * | Automerge. | Davi Arnaut | 2009-11-03 | 1 | -6/+8 |
| | |\ | |||||
| | | * | Fix compiler warnings -- tag unused parameters. | Davi Arnaut | 2009-11-03 | 1 | -6/+8 |
| | * | | Automerge. | Davi Arnaut | 2009-11-02 | 1 | -0/+12 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#41728: Dropped symbol but no soname change | Davi Arnaut | 2009-09-29 | 1 | -0/+12 |
* | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -2/+1 |
|\ \ \ | |||||
| * \ \ | Merge MySQL 5.1.39 into MariaDB 5.1.mariadb-merge-mysql-5.1.39 | unknown | 2009-10-15 | 1 | -2/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -2/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -2/+1 |
| | | * | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -2/+2 |
| | | |\ | |||||
* | | | | | Fixes for binary distribution in tar file | Michael Widenius | 2009-10-23 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Added client functions: | Michael Widenius | 2009-10-02 | 1 | -0/+12 |
* | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -3/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -3/+3 |
* | | | | | bzr merge from guilhem's maria tree to our local 5.1mariadb-merge-mysql-5.1.34plus | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge into dev tree. | Alexey Kopytov | 2009-02-10 | 1 | -2/+2 |
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | |||||
| | | * | | Fix for bug #21205: Different number of digits for float/double/real in --ps-... | Alexey Kopytov | 2009-01-28 | 1 | -2/+2 |
| | | |/ | |||||
| | | * | fixed warnings and compile errors from the fix for bug 26243 | unknown | 2008-03-29 | 1 | -1/+1 |
| | | * | Merge amd64.(none):/src/mysql-5.0-bugteam | unknown | 2008-03-28 | 1 | -4/+0 |
| | | |\ | |||||
| | | | * | Bug#26243 mysql command line crash after control-c | unknown | 2008-03-28 | 1 | -4/+0 |
| | | * | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0 | unknown | 2008-03-18 | 1 | -5/+12 |
| | | |\ \ | | | | |/ | | | |/| | |||||
* | | | | | Fix two missing DBUG_RETURN. | unknown | 2009-04-21 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -1/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -43/+88 |
| |\ \ \ | |||||
| * \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -24/+31 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -1/+0 |
* | | | | | | | Bug#38522: 5 seconds delay when closing application using embedded server | Vladislav Vaintroub | 2008-12-04 | 1 | -3/+1 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Bug#27430 "Crash in subquery code when in PS and table DDL changed after | unknown | 2008-05-20 | 1 | -43/+88 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 | unknown | 2008-03-18 | 1 | -5/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Post-merge fixes for Bug 35103 | unknown | 2008-03-17 | 1 | -1/+1 |
| * | | | | | Merge buzz.(none):/home/davi/mysql-5.0-runtime | unknown | 2008-03-17 | 1 | -5/+12 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures | unknown | 2008-03-14 | 1 | -5/+12 |
* | | | | | | Merge kaamos.(none):/data/src/mysql-5.1 | unknown | 2008-03-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge mysql.com:/home/hf/work/25097/my50-25097 | unknown | 2008-02-27 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. | unknown | 2008-02-27 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | Bug#34655 Compile error | unknown | 2008-02-28 | 1 | -18/+18 |
| |_|/ |/| | | |||||
* | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> | unknown | 2008-02-18 | 1 | -2/+2 |
|/ / | |||||
* | | Bug#12713 "Error in a stored function called from a SELECT doesn't | unknown | 2007-12-12 | 1 | -18/+22 |
* | | Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0 | unknown | 2007-11-26 | 1 | -72/+0 |
|\ \ | |/ | |||||
| * | Bug#29592 SQL Injection issue | unknown | 2007-11-26 | 1 | -72/+0 |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime | unknown | 2007-10-31 | 1 | -86/+66 |
|\ \ | |||||
| * | | Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT. | unknown | 2007-10-31 | 1 | -86/+66 |