Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -12/+16 |
|\ | |||||
| * | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| |\ | |||||
| | * | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -11/+15 |
| |\ \ | | |/ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -11/+15 |
| | |\ | |||||
| | | * | BUG#11878104: FIXES OF BUG 11752963 - 44312 TO BACKPORT TO MYSQL-5.1 | Rohit Kalhans | 2011-08-26 | 1 | -5/+6 |
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -3/+3 |
| | | |\ | |||||
| | | | * | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 1 | -3/+3 |
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |\ \ | | | | |/ | | | |/| | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | Fixed test case that changed when max_user_connections was made signed. | Michael Widenius | 2011-09-27 | 1 | -0/+1 |
* | | | | | Automatic merge | Michael Widenius | 2011-09-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -1/+1 |
* | | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -3/+3 |
|/ / / / / | |||||
* | | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -0/+1 |
* | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | lp:705210 Compiling with BUILD/compile-pentium64-debug fails | Sergei Golubchik | 2011-03-26 | 1 | -1/+1 |
| * | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -1/+5 |
* | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -12/+13 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -12/+13 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -12/+13 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Postfix BUG#58546 | unknown | 2011-01-24 | 1 | -1/+1 |
| | | * | | | Bug#58546 test rpl_packet timeout failure sporadically on PB | Libing Song | 2011-01-19 | 1 | -11/+11 |
* | | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -12/+293 |
* | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -5/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -5/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -5/+6 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error | Luis Soares | 2010-11-30 | 1 | -5/+6 |
| | | |/ / | |||||
| | | * | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 1 | -1/+1 |
* | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -15/+48 |
|/ / / / | |||||
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -7/+71 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -7/+71 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#56118 STOP SLAVE does not wait till trx with CREATE TMP TABLE ends, | unknown | 2010-10-16 | 1 | -1/+10 |
| | * | | BUG 55263: automerged bzr bundle from bug report into | Luis Soares | 2010-10-13 | 1 | -5/+59 |
| | |\ \ | |||||
| | | * | | BUG#55263: assert in check_binlog_magic | Luis Soares | 2010-09-24 | 1 | -5/+59 |
| | * | | | Bug#55375 Transaction bigger than max_binlog_cache_size crashes slave | unknown | 2010-10-09 | 1 | -1/+2 |
| | |/ / | |||||
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -5/+2 |
| | * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -3/+3 |
* | | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | BUG#53657: Slave crashed with error 22 when trying to lock mutex | Luis Soares | 2010-05-24 | 1 | -2/+2 |
* | | | Fixed compiler warnings | Michael Widenius | 2010-05-27 | 1 | -1/+2 |
* | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -0/+28 |
|\ \ \ | |/ / | |||||
| * | | BUG#43407 SET GLOBAL SQL_SLAVE_SKIP_COUNTER should log previous state in erro... | Alfranio Correia | 2010-05-04 | 1 | -0/+31 |
* | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -2/+30 |
|\ \ \ | |/ / | |||||
| * | | Bug #51648 DBUG_SYNC_POINT is not defined on all platforms and mtr cant pre-... | Andrei Elkin | 2010-03-19 | 1 | -3/+30 |
| * | | Bug #51089 SHOW STATUS LIKE 'Slave_running' is not compatible with `SHOW SL... | Andrei Elkin | 2010-02-25 | 1 | -0/+1 |