Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 1 | -7/+16 |
|\ | |||||
| * | MDEV-339, LP1001340 - system_time_zone is wrong on Windows | Vladislav Vaintroub | 2012-06-15 | 1 | -7/+16 |
* | | Merge with 5.5 | Michael Widenius | 2012-06-08 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MDEV-329: MariaDB 5.5 does not use fdatasync(). | unknown | 2012-06-08 | 1 | -1/+1 |
* | | Increased the version number to 10.0 | Michael Widenius | 2012-05-31 | 1 | -3/+3 |
|/ | |||||
* | c | Sergei Golubchik | 2012-05-21 | 1 | -9/+12 |
|\ | |||||
| * | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2012-04-12 | 1 | -1/+6 |
| |\ | |||||
| | * | BUG#13917335 - ASSERTION `REPORT_PORT != 0' FAILED IN NETWORK_INIT () | Manish Kumar | 2012-04-10 | 1 | -1/+6 |
| * | | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2012-04-10 | 1 | -34/+77 |
| |\ \ | | |/ | |||||
| | * | Bug#12762885: 61713: MYSQL WILL NOT BIND TO "LOCALHOST" IF LOCALHOST IS BOTH | Praveenkumar Hulakund | 2012-04-04 | 1 | -34/+77 |
| * | | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2012-03-08 | 1 | -5/+6 |
| |\ \ | | |/ | |||||
| * | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ... | Tatjana Azundris Nuernberg | 2012-02-19 | 1 | -8/+8 |
| |\ \ | |||||
| | * | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ... | Tatjana Azundris Nuernberg | 2012-02-17 | 1 | -8/+8 |
* | | | | MDEV-220 MariaDB server 5.5 GA candidate has default storage engine MyISAM | Sergei Golubchik | 2012-04-19 | 1 | -3/+3 |
* | | | | typo fixed: space in the status variable name | Sergei Golubchik | 2012-04-17 | 1 | -1/+1 |
* | | | | Fixed some simple warnings on Windows. | Vladislav Vaintroub | 2012-04-13 | 1 | -1/+1 |
* | | | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -5/+6 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge 5.1 => 5.5 | Tor Didriksen | 2012-03-06 | 1 | -4/+0 |
| |\ \ \ | |||||
| | * | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2012-03-06 | 1 | -4/+0 |
| | | |/ | | |/| | |||||
| * | | | BUG#13333431 - INCORRECT DEFAULT PORT IN 'SHOW SLAVE HOSTS' OUTPUT | Manish Kumar | 2012-02-28 | 1 | -1/+6 |
| |\ \ \ | | |_|/ | |/| | | |||||
* | | | | mdev-208 thread pool breaks the server on XP | Sergei Golubchik | 2012-04-05 | 1 | -0/+8 |
* | | | | Merge with 5.3 | Michael Widenius | 2012-04-03 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | Don't disable core on signal just becasue platform doesn't handle stack traces | Michael Widenius | 2012-04-03 | 1 | -4/+0 |
* | | | | | Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE... | Michael Widenius | 2012-04-03 | 1 | -74/+73 |
* | | | | | Merge of compatibility fixes | Michael Widenius | 2012-04-02 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Compatibility fixes by U Orsini | Michael Widenius | 2012-03-30 | 1 | -0/+2 |
* | | | | | automatic merge | Michael Widenius | 2012-04-02 | 1 | -40/+68 |
|\ \ \ \ \ | |||||
| * | | | | | Applied patch for guard stack for PPC/IA64 by Maarten Vanraes (lp:886368) | Michael Widenius | 2012-03-28 | 1 | -40/+68 |
* | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Print a deprecation warning when ignore-builtin-innodb is used | Vasil Dimov | 2012-02-17 | 1 | -0/+4 |
| * | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
* | | | | | MDEV-15 Log all sql errors. | Alexey Botchkov | 2012-03-24 | 1 | -3/+0 |
* | | | | | Cleanups: | Michael Widenius | 2012-03-20 | 1 | -57/+68 |
* | | | | | MDEV-15 Log all SQL errors. | Alexey Botchkov | 2012-03-14 | 1 | -0/+3 |
* | | | | | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -2/+17 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed bug#11753187 (formerly known as bug 44585): SP_CACHE BEHAVES AS | Dmitry Shulga | 2012-01-25 | 1 | -0/+5 |
| * | | | | BUG#11752315 - 43460: STOP SLAVE UNABLE TO COMPLETE WHEN SLAVE THREAD IS TRYI... | Manish Kumar | 2012-01-23 | 1 | -0/+8 |
| * | | | | merged bug #11754014 | Georgi Kodinov | 2012-01-17 | 1 | -2/+4 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Bug #11754014: 45549: udf plugin_dir path separator inconsistency | Georgi Kodinov | 2012-01-16 | 1 | -2/+4 |
* | | | | | Merge MWL#234: @@skip_replication, into latest MariaDB 5.5 for push | unknown | 2012-03-02 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge MWL#234: @@skip_replication feature to MariaDB 5.5. | unknown | 2012-03-01 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | MWL#234: Implement option to switch between master-side and client-side filte... | unknown | 2011-08-16 | 1 | -7/+21 |
| | * | | | | | MWL#234: After-review fixes, including better names for the new system variab... | unknown | 2011-08-12 | 1 | -8/+9 |
| | * | | | | | MWL#234: Support for marking binlog events to not be replicated, and for tell... | unknown | 2011-08-11 | 1 | -1/+9 |
* | | | | | | | Make Tc_log_page_size status variable use SHOW_LONG_NOFLUSH. | Sergei Golubchik | 2012-02-29 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Update copyright notices | Vladislav Vaintroub | 2012-02-28 | 1 | -1/+1 |
* | | | | | | merge 5.5 | Vladislav Vaintroub | 2012-02-27 | 1 | -17/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | because of the high cost associated with fake symdir resolution, disable sym... | Vladislav Vaintroub | 2012-02-27 | 1 | -1/+3 |
| * | | | | | | Merge MWL#192: non-blocking client library into MariaDB. | unknown | 2012-02-26 | 1 | -7/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | MWL#192 after-merge fixes. | unknown | 2012-02-23 | 1 | -7/+3 |