Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -2/+2 |
|\ | |||||
| * | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-10-27 | 1 | -2/+2 |
| |\ | |||||
* | \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -16/+16 |
|\ \ \ | |||||
| * | | | Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def" | Sergey Glukhov | 2009-10-23 | 1 | -16/+16 |
| |/ / | |||||
* | | | Backporting patches for Bug#38347 (ALTER ROUTINE privilege | Alexander Nozdrin | 2009-10-22 | 1 | -0/+687 |
* | | | Automerge | Kristofer Pettersson | 2009-10-19 | 1 | -6/+30 |
|\ \ \ | |||||
| * | | | A backporting patch for WL#4300 (Define privileges for tablespaces). | Alexander Nozdrin | 2009-10-10 | 1 | -6/+7 |
| * | | | Bug #25863 No database selected error, but documentation | Jon Olav Hauglid | 2009-10-09 | 1 | -0/+23 |
| |/ / | |||||
* | | | Bug#27145 EXTRA_ACL troubles | Kristofer Pettersson | 2009-10-19 | 1 | -2/+2 |
|/ / | |||||
* | | Bug#44658 Create procedure makes server crash when user does not have ALL pri... | Kristofer Pettersson | 2009-05-29 | 1 | -0/+55 |
* | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-02-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Bug#30305 Create routine in wrong context in SHOW PRIVILEGES | Sergey Glukhov | 2009-02-25 | 1 | -1/+1 |
* | | Merge 5.0 -> 5.1 | Matthias Leich | 2009-02-09 | 1 | -17/+17 |
|\ \ | |/ | |||||
| * | 2. Slice of fix for Bug#42003 tests missing the disconnect of connections <> ... | Matthias Leich | 2009-02-05 | 1 | -16/+16 |
* | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 1 | -0/+5 |
|\ \ | |||||
| * \ | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-12-24 | 1 | -0/+5 |
| |\ \ | | |/ | |||||
| | * | Bug#41456 SET PASSWORD hates CURRENT_USER() | Sergey Glukhov | 2008-12-24 | 1 | -0/+5 |
| | * | Patch clean up. | davi@mysql.com/endora.local | 2008-03-27 | 1 | -2/+2 |
* | | | BUG#37975: wait_for_slave_* should increase the timeout | Sven Sandberg | 2008-07-10 | 1 | -1/+2 |
|/ / | |||||
* | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 | anozdrin/alik@quad.opbmk | 2008-03-28 | 1 | -0/+39 |
|\ \ | |||||
| * \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug#33464/my51-bug#33464 | cmiller@zippy.cornsilk.net | 2008-03-05 | 1 | -0/+39 |
| |\ \ | |||||
| | * | | Move test that has more to do with grants than DROP. We shouldn't have | cmiller@zippy.cornsilk.net | 2008-03-05 | 1 | -0/+39 |
* | | | | Corrected result-file merge error. | thek@adventure.(none) | 2008-03-26 | 1 | -0/+6 |
|/ / / | |||||
* | | | Patch clean up. | thek@adventure.(none) | 2008-02-04 | 1 | -2/+3 |
* | | | * Manual merge fix. | thek@adventure.(none) | 2008-02-01 | 1 | -23/+23 |
* | | | Merge adventure.(none):/home/thek/Development/cpp/bug33201/my50-bug33201 | thek@adventure.(none) | 2008-02-01 | 1 | -1/+23 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Bug#33201 Crash occurs when granting update privilege on one column of a view | thek@adventure.(none) | 2008-02-01 | 1 | -0/+22 |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime | kostja@bodhi.(none) | 2007-12-12 | 1 | -3/+1 |
|\ \ | |||||
| * | | Bug#12713 "Error in a stored function called from a SELECT doesn't | kostja@bodhi.(none) | 2007-12-12 | 1 | -3/+1 |
* | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 | tsmith@ramayana.hindu.god | 2007-12-07 | 1 | -0/+41 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 | tsmith@ramayana.hindu.god | 2007-12-07 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | Make tests more robust (clean up better after grant.test) | tsmith@ramayana.hindu.god | 2007-12-07 | 1 | -0/+2 |
| * | | Move the test case for bug #20901 from create.test to grant.test, so | tsmith@ramayana.hindu.god | 2007-12-07 | 1 | -0/+39 |
* | | | Error number increased; fixing broken number. | thek@adventure.(none) | 2007-11-28 | 1 | -1/+1 |
* | | | Merge adventure.(none):/home/thek/Development/cpp/bug16470/my51-bug16470 | thek@adventure.(none) | 2007-11-26 | 1 | -0/+19 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bug#16470 crash on grant if old grant tables | thek@adventure.(none) | 2007-11-26 | 1 | -0/+19 |
* | | | Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS | evgen@moonbone.local | 2007-11-13 | 1 | -1/+1 |
* | | | Merge sin.intern.azundris.com:/home/tnurnberg/19828/50-19828 | tnurnberg@sin.intern.azundris.com | 2007-10-05 | 1 | -0/+3 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Bug#19828: Case sensitivity in hostname leads to inconsistent behavior | tnurnberg@sin.intern.azundris.com | 2007-09-20 | 1 | -0/+3 |
| * | grant.result, grant.test: | evgen@moonbone.local | 2007-05-12 | 1 | -1/+1 |
* | | Patch for the following bugs: | anozdrin/alik@ibm. | 2007-06-28 | 1 | -12/+12 |
* | | Post-merge fix | igor@olga.mysql.com | 2007-05-11 | 1 | -1/+1 |
* | | merging fix | holyfoot/hf@mysql.com/hfmain.(none) | 2007-05-12 | 1 | -2/+88 |
* | | Merge mysql.com:/home/hf/work/27957/my50-27957 | holyfoot/hf@hfmain.(none) | 2007-05-12 | 1 | -88/+21 |
|\ \ | |/ | |||||
| * | Bug#27878: Unchecked privileges on a view referring to a table from another | evgen@moonbone.local | 2007-05-11 | 1 | -0/+19 |
| * | Merge mysql.com:/home/ram/work/mysql-5.0-maint | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru | 2007-04-24 | 1 | -0/+11 |
| |\ | |||||
| | * | after-merge fix | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru | 2007-04-24 | 1 | -0/+11 |
* | | | after-merge fix | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru | 2007-04-24 | 1 | -2/+14 |
* | | | Avoid resetting a variable. Fixed grant.test. | jani@a88-113-38-195.elisa-laajakaista.fi | 2007-04-13 | 1 | -0/+1 |
* | | | Merged from 5.0 | jani@a88-113-38-195.elisa-laajakaista.fi | 2007-04-13 | 1 | -10/+10 |