Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-25 | 1 | -0/+2 |
|\ | |||||
| * | Merge backport of WL#3771 with mysql-next-mr. | Sergey Vojtovich | 2010-01-19 | 1 | -0/+2 |
| |\ | |||||
| | * | Backport from 6.0-codebase. | Sergey Vojtovich | 2009-12-15 | 1 | -0/+2 |
* | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-18 | 1 | -26/+35 |
|\ \ \ | |/ / | |||||
| * | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -18/+28 |
| * | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -8/+7 |
| |/ | |||||
* | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-24 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-23 | 1 | -1/+1 |
| |\ | |||||
| | * | Manual merge. | Davi Arnaut | 2009-12-18 | 1 | -1/+1 |
* | | | Backport of WL#798 (MySQL IPv6 support) from 6.0. | Alexander Nozdrin | 2009-11-25 | 1 | -17/+26 |
* | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -1/+1 |
|/ / | |||||
* | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -0/+12 |
|\ \ | |||||
| * \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-22 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Backporting WL#3953 from 6.0. Original revision: | Alexander Nozdrin | 2009-10-21 | 1 | -0/+12 |
* | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-13 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -1/+1 |
* | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -1/+1 |
* | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -11/+12 |
* | | | | ---------------------------------------------------------- | Konstantin Osipov | 2009-10-14 | 1 | -0/+19 |
|/ / / | |||||
* | | | backport of | Vladislav Vaintroub | 2009-09-30 | 1 | -1/+1 |
* | | | Backport of this changeset | Vladislav Vaintroub | 2009-09-30 | 1 | -9/+0 |
* | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -2/+2 |
|/ / | |||||
* | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}: | Guilhem Bichot | 2009-08-04 | 1 | -4/+16 |
|\ \ | |/ | |||||
| * | Fix for a valgrind warning due to use of a uninitialized | Davi Arnaut | 2009-06-08 | 1 | -4/+16 |
* | | Merge MySQL 5.1.35 into MySQL 5.4 | Mikael Ronstrom | 2009-06-11 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -1/+1 |
* | | Backport of DTrace patches from 6.0 | Mikael Ronstrom | 2008-12-20 | 1 | -0/+4 |
|/ | |||||
* | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1 | gkodinov/kgeorge@magare.gmz | 2008-03-28 | 1 | -7/+16 |
|\ | |||||
| * | Fix for Bug #27944 Filtering THD::client capabilities | andrey@whirlpool.hristov.com | 2008-03-25 | 1 | -7/+16 |
* | | Fix for Bug#33507: Event scheduler creates more threads | anozdrin/alik@quad. | 2008-03-12 | 1 | -6/+7 |
|/ | |||||
* | Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 | anozdrin/alik@quad. | 2008-02-26 | 1 | -2/+2 |
|\ | |||||
| * | Rename send_ok to my_ok. Similarly to my_error, it only records the status, | kostja@dipika.(none) | 2008-02-19 | 1 | -2/+2 |
* | | Post-merge fix | vvaintroub@wva. | 2008-02-19 | 1 | -17/+2 |
|/ | |||||
* | Bug#12713 "Error in a stored function called from a SELECT doesn't | kostja@bodhi.(none) | 2007-12-12 | 1 | -23/+10 |
* | Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-main | mattiasj@mattiasj-laptop.(none) | 2007-11-12 | 1 | -0/+1 |
|\ | |||||
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines | istruewing@stella.local | 2007-11-10 | 1 | -0/+1 |
| |\ | |||||
| | * | Bug#31210 - INSERT DELAYED crashes server when used on | istruewing@stella.local | 2007-11-05 | 1 | -0/+1 |
* | | | Merge endora.local:/Users/davi/mysql/bugs/31850-5.1 | davi@endora.local | 2007-11-01 | 1 | -14/+9 |
|\ \ \ | |||||
| * | | | Bug#31850 Test crashes in "embedded" server | davi@endora.local | 2007-11-01 | 1 | -14/+9 |
* | | | | Fix a compilation warning. | kostja@bodhi.(none) | 2007-11-01 | 1 | -1/+0 |
* | | | | Remove net_printf_error(). Do not talk to network directly in | kostja@bodhi.(none) | 2007-11-01 | 1 | -84/+105 |
|/ / / | |||||
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime | kostja@bodhi.(none) | 2007-10-30 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Use an inline getter method (thd->is_error()) to query if there is an error | kostja@bodhi.(none) | 2007-10-30 | 1 | -3/+3 |
* | | | | Fix failing init_connect.test (5.1-runtime). | kostja@bodhi.(none) | 2007-10-30 | 1 | -1/+11 |
|/ / / | |||||
* | | | Rename: query_error -> is_slave_error. | kostja@bodhi.(none) | 2007-10-20 | 1 | -1/+1 |
|/ / | |||||
* | | Fix for BUG#20023: mysql_change_user() resets the value | anozdrin/alik@station. | 2007-10-10 | 1 | -2/+2 |
* | | Fix merge. | anozdrin/alik@station. | 2007-10-09 | 1 | -4/+12 |
|/ | |||||
* | Bug #30389: connection_id() always return 0 in embedded server | tsmith@ramayana.hindu.god | 2007-08-27 | 1 | -0/+5 |