Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+5 |
|\ | |||||
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -9/+12 |
| |\ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -8/+9 |
| | |\ | |||||
| | | * | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -9/+9 |
| | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | fixed bugs | Alexey Botchkov | 2011-09-22 | 1 | -3/+3 |
* | | | | gis-related tests fixes. | Alexey Botchkov | 2011-06-20 | 1 | -54/+208 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -11/+44 |
| |\ \ \ \ | |||||
| | * | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -70/+47 |
| | * | | | | lp:731124 Loss of precision on DISTINCT | Sergei Golubchik | 2011-03-08 | 1 | -1/+1 |
| | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -11/+39 |
| | | |/ / | | |/| | | |||||
| * | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -52/+173 |
| | |/ / | |/| | | |||||
* | | | | Precise GIS functions added. | Alexey Botchkov | 2011-05-04 | 1 | -12/+345 |
|/ / / | |||||
* | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
* | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -18/+8 |
|\ \ \ | |/ / | |||||
| * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -18/+8 |
* | | | Fixes after last merge of MySQL 5.1 | Michael Widenius | 2010-05-13 | 1 | -1/+4 |
* | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -15/+15 |
|\ \ \ | |/ / | |||||
| * | | Bug #49829 Many "hides virtual function" warnings with | Staale Smedseng | 2010-03-14 | 1 | -15/+15 |
* | | | Fixed random failure in test system | Michael Widenius | 2010-03-29 | 1 | -16/+16 |
* | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -259/+259 |
* | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+10 |
|\ \ \ | |/ / | |||||
| * | | BUG#49222: Mark RAND() as unsafe | Sven Sandberg | 2010-01-13 | 1 | -0/+10 |
* | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | BUG#47995: Mark system functions as unsafe | Sven Sandberg | 2009-11-18 | 1 | -0/+8 |
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | 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/+4 |
| | * | Fix mismerge. | unknown | 2008-04-10 | 1 | -1/+1 |
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build | unknown | 2008-04-02 | 1 | -3/+54 |
| | |\ | |||||
| | | * | Bug#15776: 32-bit signed int used for length of blob | unknown | 2007-08-31 | 1 | -3/+54 |
* | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | BUG#39701: Mixed binlog format does not switch to row mode on | Luis Soares | 2009-03-24 | 1 | -0/+1 |
* | | | | Fixed warnings and errors discovered by pushbuild2 | Michael Widenius | 2008-12-04 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fix merge problem. | unknown | 2008-04-10 | 1 | -1/+1 |
* | | | Bug#15776: 32-bit signed int used for length of blob | unknown | 2008-04-01 | 1 | -3/+51 |
* | | | Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2 | unknown | 2008-03-07 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Bug#27580 SPACE() function collation bug? | unknown | 2007-10-08 | 1 | -2/+2 |
| |/ | |||||
| * | Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-p... | unknown | 2007-08-02 | 1 | -1/+0 |
| * | Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect | unknown | 2007-08-01 | 1 | -1/+3 |
| * | Fixed bug #29415. | unknown | 2007-07-07 | 1 | -0/+12 |
| * | Bug #28897 UUID() returns non-unique values when query cache is enabled | unknown | 2007-06-13 | 1 | -0/+1 |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint | unknown | 2007-12-14 | 1 | -1/+6 |
|\ \ | |||||
| * | | Doxygenization of comments. | unknown | 2007-10-11 | 1 | -1/+6 |
* | | | Manual merge of 5.0-runtime to 5.1-runtime | unknown | 2007-10-16 | 1 | -0/+19 |
|/ / | |||||
* | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt | unknown | 2007-08-29 | 1 | -0/+2 |
|\ \ | |||||
| * | | Bug #30244: row_count/found_rows does not replicate well | unknown | 2007-08-29 | 1 | -0/+2 |
* | | | Fix doxygen warnings. | unknown | 2007-08-15 | 1 | -165/+165 |
|/ / | |||||
* | | Post-merge fixes (merge from the main). | unknown | 2007-07-17 | 1 | -1/+1 |