summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-251-0/+2
|\
| * Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-191-0/+2
| |\
| | * Backport from 6.0-codebase.Sergey Vojtovich2009-12-151-0/+2
* | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-181-26/+35
|\ \ \ | |/ /
| * | WL#2360 Performance schemaMarc Alff2010-01-061-18/+28
| * | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-8/+7
| |/
* | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-1/+1
|\ \ | |/ |/|
| * Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-231-1/+1
| |\
| | * Manual merge.Davi Arnaut2009-12-181-1/+1
* | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-17/+26
* | | Backport of:Konstantin Osipov2009-11-241-1/+1
|/ /
* | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-0/+12
|\ \
| * \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-221-1/+1
| |\ \
| * | | Backporting WL#3953 from 6.0. Original revision:Alexander Nozdrin2009-10-211-0/+12
* | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-1/+1
| | |\ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-1/+1
* | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-1/+1
* | | | Backport of:Konstantin Osipov2009-10-141-11/+12
* | | | ----------------------------------------------------------Konstantin Osipov2009-10-141-0/+19
|/ / /
* | | backport of Vladislav Vaintroub2009-09-301-1/+1
* | | Backport of this changeset Vladislav Vaintroub2009-09-301-9/+0
* | | WL#2110 (SIGNAL)Marc Alff2009-09-101-2/+2
|/ /
* | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-4/+16
|\ \ | |/
| * Fix for a valgrind warning due to use of a uninitializedDavi Arnaut2009-06-081-4/+16
* | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-111-1/+1
|\ \ | |/
| * Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-1/+1
* | Backport of DTrace patches from 6.0Mikael Ronstrom2008-12-201-0/+4
|/
* Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-281-7/+16
|\
| * Fix for Bug #27944 Filtering THD::client capabilitiesandrey@whirlpool.hristov.com2008-03-251-7/+16
* | Fix for Bug#33507: Event scheduler creates more threadsanozdrin/alik@quad.2008-03-121-6/+7
|/
* Merge quad.:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@quad.2008-02-261-2/+2
|\
| * Rename send_ok to my_ok. Similarly to my_error, it only records the status,kostja@dipika.(none)2008-02-191-2/+2
* | Post-merge fixvvaintroub@wva.2008-02-191-17/+2
|/
* Bug#12713 "Error in a stored function called from a SELECT doesn't kostja@bodhi.(none)2007-12-121-23/+10
* Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-mainmattiasj@mattiasj-laptop.(none)2007-11-121-0/+1
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@stella.local2007-11-101-0/+1
| |\
| | * Bug#31210 - INSERT DELAYED crashes server when used onistruewing@stella.local2007-11-051-0/+1
* | | Merge endora.local:/Users/davi/mysql/bugs/31850-5.1davi@endora.local2007-11-011-14/+9
|\ \ \
| * | | Bug#31850 Test crashes in "embedded" serverdavi@endora.local2007-11-011-14/+9
* | | | Fix a compilation warning.kostja@bodhi.(none)2007-11-011-1/+0
* | | | Remove net_printf_error(). Do not talk to network directly inkostja@bodhi.(none)2007-11-011-84/+105
|/ / /
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimekostja@bodhi.(none)2007-10-301-2/+2
|\ \ \
| * | | Use an inline getter method (thd->is_error()) to query if there is an error kostja@bodhi.(none)2007-10-301-3/+3
* | | | Fix failing init_connect.test (5.1-runtime).kostja@bodhi.(none)2007-10-301-1/+11
|/ / /
* | | Rename: query_error -> is_slave_error.kostja@bodhi.(none)2007-10-201-1/+1
|/ /
* | Fix for BUG#20023: mysql_change_user() resets the valueanozdrin/alik@station.2007-10-101-2/+2
* | Fix merge.anozdrin/alik@station.2007-10-091-4/+12
|/
* Bug #30389: connection_id() always return 0 in embedded servertsmith@ramayana.hindu.god2007-08-271-0/+5