Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
|\ | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | Merge 5.2->5.3 | unknown | 2011-09-02 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ... | Michael Widenius | 2011-09-02 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -49/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -49/+1 |
| |/ / | |||||
* | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2010-02-26 | 1 | -0/+1 |
* | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 1 | -1/+0 |
* | | | MBUG#452116: MariaDB: mysql_install_db causes server segfault | Sergey Petrunya | 2009-10-16 | 1 | -1/+2 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | Bug#43706: libmysqld segfaults when re-intialised | Davi Arnaut | 2009-04-09 | 1 | -0/+4 |
* | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 |
* | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -3/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -3/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#37995 Error message truncation in test "innodb" in embedded mode. | Alexey Botchkov | 2009-02-05 | 1 | -3/+5 |
| * | | | Fixing problems of previous 5.1-main->5.1-maria merge: | Guilhem Bichot | 2009-02-12 | 1 | -5/+5 |
| * | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -72/+77 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -75/+77 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 1 | -3/+5 |
| |\ \ | |||||
| | * | | Bug#38364: gen_lex_hash segmentation fault in debug build | Chad MILLER | 2009-01-12 | 1 | -3/+5 |
| * | | | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -2/+0 |
| |\ \ \ | | |/ / | |||||
| * | | | Fix warnings for 64 bit windows | unknown | 2008-04-22 | 1 | -2/+2 |
| * | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl | unknown | 2008-04-03 | 1 | -23/+50 |
| |\ \ \ | |||||
| * | | | | Revert change to check proper return value from QueryPerformanceFrequency | unknown | 2008-02-19 | 1 | -1/+1 |
| * | | | | Bug#33748 my_getsystime, my_micro_time and my_micro_time_and_time broken on w... | unknown | 2008-01-09 | 1 | -69/+50 |
* | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -0/+18 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fixed warnings and errors discovered by pushbuild2 | Michael Widenius | 2008-12-04 | 1 | -0/+2 |
| * | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de... | Michael Widenius | 2008-12-03 | 1 | -0/+5 |
| * | | | | Added wrapper for chmod(): my_chmod() | unknown | 2008-01-03 | 1 | -21/+24 |
| * | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -0/+13 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe... | unknown | 2007-12-04 | 1 | -1/+11 |
| | * | | | WL#3071 Maria checkpoint, WL#3072 Maria recovery | unknown | 2007-11-16 | 1 | -0/+1 |
| | * | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -0/+2 |
| | |\ \ \ | |||||
| | | * \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-04 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Fixed REPAIR/CHECK/ANALYZE TABLE for tables with new BLOCK-ROW format. | unknown | 2007-07-01 | 1 | -0/+1 |
| | | * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -0/+1 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -0/+1 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -0/+1 |
| | | | | |\ \ \ | |||||
| | | | | | * | | | amd64 atomic ops | unknown | 2006-08-10 | 1 | -0/+1 |
* | | | | | | | | | merge fix for 36279 | Vladislav Vaintroub | 2008-11-10 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Bug#36279 - mysql built with Visual Studio 2005 does not display | Vladislav Vaintroub | 2008-11-10 | 1 | -2/+0 |
* | | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-11-08 | 1 | -21/+26 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | |