Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -97/+325 |
|\ | |||||
| * | merged | Sergei Golubchik | 2010-09-21 | 1 | -2/+1 |
| |\ | |||||
| | * | fix for MySQL Bug#44797 - plugins w/o command-line options have no disabling ... | Sergei Golubchik | 2010-09-21 | 1 | -2/+1 |
| * | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -13/+47 |
| |\ \ | | |/ | |||||
| | * | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -13/+47 |
| | |\ | |||||
| * | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -1/+6 |
| * | | | --plugin_maturity command-line option | Sergei Golubchik | 2010-06-16 | 1 | -0/+23 |
| * | | | bug in converting st_mysql_plugin to st_maria_plugin - all but the last plugi... | Sergei Golubchik | 2010-06-16 | 1 | -15/+15 |
| * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -2/+16 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -5/+26 |
| | |\ \ | |||||
| | * \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+2 |
| | |\ \ \ | |||||
| * | | | | | fixes for buildbot: | Sergei Golubchik | 2010-04-08 | 1 | -3/+4 |
| * | | | | | Merge with 5.1 | Michael Widenius | 2010-04-08 | 1 | -3/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Removed compiler warnings | Michael Widenius | 2010-04-07 | 1 | -3/+4 |
| * | | | | | Fixed compiler warning | Michael Widenius | 2010-04-08 | 1 | -1/+1 |
| * | | | | | Fied problem with of compilation without dynamic plugin loading. | unknown | 2010-04-01 | 1 | -0/+2 |
| * | | | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -87/+248 |
| * | | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -5/+18 |
| * | | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -35/+54 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 1. don't crash on failing to load a plugin with newer MYSQL_PLUGIN_INTERFACE_... | Sergei Golubchik | 2010-03-12 | 1 | -26/+30 |
| | * | | | | Automerge MySQL 5.1.44 merge into MariaDB trunk. | unknown | 2010-03-09 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | * | | | | | | do not take LOCK_plugin for built-in plugins | Sergei Golubchik | 2010-03-08 | 1 | -1/+24 |
| | * | | | | | | small code cleanup - "good ifdef is no ifdef" | Sergei Golubchik | 2010-03-08 | 1 | -10/+2 |
| | |/ / / / / | |||||
| * | | | | | | mwl:98 - libservices | Sergei Golubchik | 2010-03-03 | 1 | -64/+73 |
| * | | | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -15/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge fix for PBXT running inside embedded server (MBug#439889). | unknown | 2009-12-22 | 1 | -15/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | fixed bug #439889: Embedded server asserts on startup because of pbxt | Vladimir Kolesnikov | 2009-12-09 | 1 | -3/+3 |
| | |/ / / / / | |||||
| * | | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -16/+10 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -16/+10 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -5/+9 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Compile by default MySQL clients with libmysqldclient.a (not .so) | Michael Widenius | 2009-10-29 | 1 | -5/+9 |
| * | | | | | | | Automatic merge with 5.1 | Michael Widenius | 2009-10-28 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -2/+2 |
| * | | | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -4/+4 |
| |/ / / / / / | |||||
| * | | | | | | Temporary solution: skip PBXT (like we do e.g. for --skip-innodb) in embedded | Sergey Petrunya | 2009-10-02 | 1 | -0/+16 |
| * | | | | | | After-merge fix for MySQL 5.1.38 merge into MariaDB. | unknown | 2009-09-11 | 1 | -5/+5 |
| * | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -135/+206 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -12/+23 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -19/+21 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -20/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -2/+3 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -6/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -52/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge xiphis.org:/anubis/antony/work/p1-bug34598.2 | unknown | 2008-02-19 | 1 | -15/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -1/+1 |