Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -363/+1880 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -12/+23 |
| |\ | |||||
| | * | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -4/+4 |
| | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -6/+17 |
| | |\ | |||||
| * | | | old_password_plugin is used even in embedded builds | Sergei Golubchik | 2010-07-23 | 1 | -1/+1 |
| * | | | Fixed compiler and valgrind warnings | Michael Widenius | 2010-07-19 | 1 | -0/+2 |
| * | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -4/+12 |
| * | | | handle a case when a user connects with a password to a passwordless account | Sergei Golubchik | 2010-06-02 | 1 | -2/+4 |
| * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -5/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -5/+5 |
| | |\ \ | |||||
| | * | | | After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and... | unknown | 2010-04-28 | 1 | -0/+2 |
| * | | | | crash on --with-embedded-privilege-control builds: | Sergei Golubchik | 2010-05-14 | 1 | -9/+28 |
| * | | | | don't hide old_password_plugin from embedded, it may be compiled with grant s... | Sergei Golubchik | 2010-04-14 | 1 | -2/+0 |
| * | | | | keep acl_user->auth_string and acl_user->salt always in sync | Sergei Golubchik | 2010-04-06 | 1 | -14/+35 |
| * | | | | fixed a bug in handling mysql_native_password specified explicitly: | Sergei Golubchik | 2010-04-05 | 1 | -20/+42 |
| * | | | | embedded builds used to refer to undefined functions inside if(0) { } | Sergei Golubchik | 2010-04-02 | 1 | -0/+1 |
| * | | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+32 |
| * | | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -8/+11 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Fixed some compiler warnings | Michael Widenius | 2010-03-31 | 1 | -1/+4 |
| * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -296/+1697 |
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -19/+93 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -19/+93 |
| | |\ \ \ | |||||
| * | \ \ \ | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -14/+35 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -14/+35 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -34/+60 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -34/+60 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -33/+36 |
| |/ / / / / / | |||||
| * | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -53/+67 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -36/+87 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -17/+16 |
| * | | | | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -27/+42 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -36/+115 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -2/+0 |
* | | | | | | | | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-07-29 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-20 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -2/+0 |
* | | | | | | | | | | | | Fix a failing assert when running funcs_1.innodb_trig_03 test. | Konstantin Osipov | 2010-07-28 | 1 | -1/+1 |
* | | | | | | | | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -25/+21 |
* | | | | | | | | | | | | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-07-19 | 1 | -12/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-09 | 1 | -6/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -6/+4 |
| * | | | | | | | | | | | Manul merge | unknown | 2010-07-04 | 1 | -6/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | The following statements support the CURRENT_USER() where a user is needed. | unknown | 2010-07-04 | 1 | -6/+17 |
| * | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-28 | 1 | -17/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Revert Bug#48321 due to build breakage and failing tests. | Davi Arnaut | 2010-06-28 | 1 | -17/+6 |
| * | | | | | | | | | | | Manual merge | unknown | 2010-06-27 | 1 | -6/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | The following statements support the CURRENT_USER() where a user is needed. | unknown | 2010-06-27 | 1 | -6/+17 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
* | | | | | | | | | | | A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATE | Jon Olav Hauglid | 2010-07-01 | 1 | -52/+45 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2010-05-28 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-04-30 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / |