2011-07-04 01:25:49 +02:00
|
|
|
/*
|
2012-02-15 17:21:38 +01:00
|
|
|
Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
|
2007-02-23 12:13:55 +01:00
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
2011-07-04 01:25:49 +02:00
|
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
|
*/
|
2007-02-23 12:13:55 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Functions to autenticate and handle reqests for a connection
|
|
|
|
|
*/
|
|
|
|
|
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "my_global.h"
|
2010-04-07 13:58:40 +02:00
|
|
|
#include "sql_priv.h"
|
2010-03-31 16:05:33 +02:00
|
|
|
#ifndef __WIN__
|
|
|
|
|
#include <netdb.h> // getservbyname, servent
|
|
|
|
|
#endif
|
2009-12-15 20:52:47 +01:00
|
|
|
#include "sql_audit.h"
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "sql_connect.h"
|
|
|
|
|
#include "my_global.h"
|
2008-12-20 11:01:41 +01:00
|
|
|
#include "probes_mysql.h"
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "unireg.h" // REQUIRED: for other includes
|
|
|
|
|
#include "sql_parse.h" // sql_command_flags,
|
|
|
|
|
// execute_init_command,
|
|
|
|
|
// do_command
|
|
|
|
|
#include "sql_db.h" // mysql_change_db
|
|
|
|
|
#include "hostname.h" // inc_host_errors, ip_to_hostname,
|
|
|
|
|
// reset_host_errors
|
|
|
|
|
#include "sql_acl.h" // acl_getroot, NO_ACCESS, SUPER_ACL
|
2010-06-07 16:01:39 +02:00
|
|
|
#include "sql_callback.h"
|
2007-02-23 12:13:55 +01:00
|
|
|
|
Backport of:
ChangeSet@1.2703, 2007-12-07 09:35:28-05:00, cmiller@zippy.cornsilk.net +40 -0
Bug#13174: SHA2 function
Patch contributed from Bill Karwin, paper unnumbered CLA in Seattle
Implement SHA2 functions.
Chad added code to make it work with YaSSL. Also, he removed the
(probable) bug of embedded server never using SSL-dependent
functions. (libmysqld/Makefile.am didn't read ANY autoconf defs.)
Function specification:
SHA2( string cleartext, integer hash_length )
-> string hash, or NULL
where hash_length is one of 224, 256, 384, or 512. If either is
NULL or a length is unsupported, then the result is NULL. The
resulting string is always the length of the hash_length parameter
or is NULL.
Include the canonical hash examples from the NIST in the test
results.
---
Polish and address concerns of reviewers.
2010-04-13 17:04:45 +02:00
|
|
|
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
|
2007-02-23 12:13:55 +01:00
|
|
|
/*
|
|
|
|
|
Without SSL the handshake consists of one packet. This packet
|
|
|
|
|
has both client capabilites and scrambled password.
|
|
|
|
|
With SSL the handshake might consist of two packets. If the first
|
|
|
|
|
packet (client capabilities) has CLIENT_SSL flag set, we have to
|
|
|
|
|
switch to SSL and read the second packet. The scrambled password
|
|
|
|
|
is in the second packet and client_capabilites field will be ignored.
|
|
|
|
|
Maybe it is better to accept flags other than CLIENT_SSL from the
|
|
|
|
|
second packet?
|
|
|
|
|
*/
|
|
|
|
|
#define SSL_HANDSHAKE_SIZE 2
|
|
|
|
|
#define NORMAL_HANDSHAKE_SIZE 6
|
|
|
|
|
#define MIN_HANDSHAKE_SIZE 2
|
|
|
|
|
#else
|
|
|
|
|
#define MIN_HANDSHAKE_SIZE 6
|
Backport of:
ChangeSet@1.2703, 2007-12-07 09:35:28-05:00, cmiller@zippy.cornsilk.net +40 -0
Bug#13174: SHA2 function
Patch contributed from Bill Karwin, paper unnumbered CLA in Seattle
Implement SHA2 functions.
Chad added code to make it work with YaSSL. Also, he removed the
(probable) bug of embedded server never using SSL-dependent
functions. (libmysqld/Makefile.am didn't read ANY autoconf defs.)
Function specification:
SHA2( string cleartext, integer hash_length )
-> string hash, or NULL
where hash_length is one of 224, 256, 384, or 512. If either is
NULL or a length is unsupported, then the result is NULL. The
resulting string is always the length of the hash_length parameter
or is NULL.
Include the canonical hash examples from the NIST in the test
results.
---
Polish and address concerns of reviewers.
2010-04-13 17:04:45 +02:00
|
|
|
#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
|
2007-02-23 12:13:55 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Get structure for logging connection data for the current user
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
|
|
|
static HASH hash_user_connections;
|
|
|
|
|
|
2010-08-09 10:32:50 +02:00
|
|
|
int get_or_create_user_conn(THD *thd, const char *user,
|
|
|
|
|
const char *host,
|
|
|
|
|
const USER_RESOURCES *mqh)
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
|
|
|
|
int return_val= 0;
|
2009-02-13 17:41:47 +01:00
|
|
|
size_t temp_len, user_len;
|
2007-02-23 12:13:55 +01:00
|
|
|
char temp_user[USER_HOST_BUFF_SIZE];
|
|
|
|
|
struct user_conn *uc;
|
|
|
|
|
|
|
|
|
|
DBUG_ASSERT(user != 0);
|
|
|
|
|
DBUG_ASSERT(host != 0);
|
|
|
|
|
|
|
|
|
|
user_len= strlen(user);
|
|
|
|
|
temp_len= (strmov(strmov(temp_user, user)+1, host) - temp_user)+1;
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&LOCK_user_conn);
|
2009-10-14 18:37:38 +02:00
|
|
|
if (!(uc = (struct user_conn *) my_hash_search(&hash_user_connections,
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
(uchar*) temp_user, temp_len)))
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
|
|
|
|
/* First connection for user; Create a user connection object */
|
|
|
|
|
if (!(uc= ((struct user_conn*)
|
|
|
|
|
my_malloc(sizeof(struct user_conn) + temp_len+1,
|
|
|
|
|
MYF(MY_WME)))))
|
|
|
|
|
{
|
2007-10-31 22:10:58 +01:00
|
|
|
/* MY_WME ensures an error is set in THD. */
|
2007-02-23 12:13:55 +01:00
|
|
|
return_val= 1;
|
|
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
uc->user=(char*) (uc+1);
|
|
|
|
|
memcpy(uc->user,temp_user,temp_len+1);
|
|
|
|
|
uc->host= uc->user + user_len + 1;
|
|
|
|
|
uc->len= temp_len;
|
|
|
|
|
uc->connections= uc->questions= uc->updates= uc->conn_per_hour= 0;
|
|
|
|
|
uc->user_resources= *mqh;
|
2007-07-30 10:33:50 +02:00
|
|
|
uc->reset_utime= thd->thr_create_utime;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_hash_insert(&hash_user_connections, (uchar*) uc))
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
2007-10-31 22:10:58 +01:00
|
|
|
/* The only possible error is out of memory, MY_WME sets an error. */
|
Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Essentially, the problem is that safemalloc is excruciatingly
slow as it checks all allocated blocks for overrun at each
memory management primitive, yielding a almost exponential
slowdown for the memory management functions (malloc, realloc,
free). The overrun check basically consists of verifying some
bytes of a block for certain magic keys, which catches some
simple forms of overrun. Another minor problem is violation
of aliasing rules and that its own internal list of blocks
is prone to corruption.
Another issue with safemalloc is rather the maintenance cost
as the tool has a significant impact on the server code.
Given the magnitude of memory debuggers available nowadays,
especially those that are provided with the platform malloc
implementation, maintenance of a in-house and largely obsolete
memory debugger becomes a burden that is not worth the effort
due to its slowness and lack of support for detecting more
common forms of heap corruption.
Since there are third-party tools that can provide the same
functionality at a lower or comparable performance cost, the
solution is to simply remove safemalloc. Third-party tools
can provide the same functionality at a lower or comparable
performance cost.
The removal of safemalloc also allows a simplification of the
malloc wrappers, removing quite a bit of kludge: redefinition
of my_malloc, my_free and the removal of the unused second
argument of my_free. Since free() always check whether the
supplied pointer is null, redudant checks are also removed.
Also, this patch adds unit testing for my_malloc and moves
my_realloc implementation into the same file as the other
memory allocation primitives.
2010-07-08 23:20:08 +02:00
|
|
|
my_free(uc);
|
2007-02-23 12:13:55 +01:00
|
|
|
return_val= 1;
|
|
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
thd->user_connect=uc;
|
|
|
|
|
uc->connections++;
|
|
|
|
|
end:
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&LOCK_user_conn);
|
2007-02-23 12:13:55 +01:00
|
|
|
return return_val;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
check if user has already too many connections
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
check_for_max_user_connections()
|
|
|
|
|
thd Thread handle
|
|
|
|
|
uc User connect object
|
|
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
|
If check fails, we decrease user connection count, which means one
|
|
|
|
|
shouldn't call decrease_user_connections() after this function.
|
|
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
|
0 ok
|
|
|
|
|
1 error
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int check_for_max_user_connections(THD *thd, USER_CONN *uc)
|
|
|
|
|
{
|
|
|
|
|
int error=0;
|
|
|
|
|
DBUG_ENTER("check_for_max_user_connections");
|
|
|
|
|
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&LOCK_user_conn);
|
2009-12-22 10:35:56 +01:00
|
|
|
if (global_system_variables.max_user_connections &&
|
|
|
|
|
!uc->user_resources.user_conn &&
|
|
|
|
|
global_system_variables.max_user_connections < (uint) uc->connections)
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
2007-10-31 22:10:58 +01:00
|
|
|
my_error(ER_TOO_MANY_USER_CONNECTIONS, MYF(0), uc->user);
|
2007-02-23 12:13:55 +01:00
|
|
|
error=1;
|
|
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
time_out_user_resource_limits(thd, uc);
|
|
|
|
|
if (uc->user_resources.user_conn &&
|
|
|
|
|
uc->user_resources.user_conn < uc->connections)
|
|
|
|
|
{
|
2007-10-31 22:10:58 +01:00
|
|
|
my_error(ER_USER_LIMIT_REACHED, MYF(0), uc->user,
|
|
|
|
|
"max_user_connections",
|
|
|
|
|
(long) uc->user_resources.user_conn);
|
2007-02-23 12:13:55 +01:00
|
|
|
error= 1;
|
|
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
if (uc->user_resources.conn_per_hour &&
|
|
|
|
|
uc->user_resources.conn_per_hour <= uc->conn_per_hour)
|
|
|
|
|
{
|
2007-10-31 22:10:58 +01:00
|
|
|
my_error(ER_USER_LIMIT_REACHED, MYF(0), uc->user,
|
|
|
|
|
"max_connections_per_hour",
|
|
|
|
|
(long) uc->user_resources.conn_per_hour);
|
2007-02-23 12:13:55 +01:00
|
|
|
error=1;
|
|
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
uc->conn_per_hour++;
|
|
|
|
|
|
2007-10-31 22:10:58 +01:00
|
|
|
end:
|
2007-02-23 12:13:55 +01:00
|
|
|
if (error)
|
2009-10-13 22:16:41 +02:00
|
|
|
{
|
2007-02-23 12:13:55 +01:00
|
|
|
uc->connections--; // no need for decrease_user_connections() here
|
2009-10-13 22:16:41 +02:00
|
|
|
/*
|
|
|
|
|
The thread may returned back to the pool and assigned to a user
|
|
|
|
|
that doesn't have a limit. Ensure the user is not using resources
|
|
|
|
|
of someone else.
|
|
|
|
|
*/
|
|
|
|
|
thd->user_connect= NULL;
|
|
|
|
|
}
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&LOCK_user_conn);
|
2007-02-23 12:13:55 +01:00
|
|
|
DBUG_RETURN(error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Decrease user connection count
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
decrease_user_connections()
|
|
|
|
|
uc User connection object
|
|
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
|
If there is a n user connection object for a connection
|
|
|
|
|
(which only happens if 'max_user_connections' is defined or
|
|
|
|
|
if someone has created a resource grant for a user), then
|
|
|
|
|
the connection count is always incremented on connect.
|
|
|
|
|
|
|
|
|
|
The user connect object is not freed if some users has
|
|
|
|
|
'max connections per hour' defined as we need to be able to hold
|
|
|
|
|
count over the lifetime of the connection.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void decrease_user_connections(USER_CONN *uc)
|
|
|
|
|
{
|
|
|
|
|
DBUG_ENTER("decrease_user_connections");
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&LOCK_user_conn);
|
2007-02-23 12:13:55 +01:00
|
|
|
DBUG_ASSERT(uc->connections);
|
|
|
|
|
if (!--uc->connections && !mqh_used)
|
|
|
|
|
{
|
|
|
|
|
/* Last connection for user; Delete it */
|
2009-10-14 18:37:38 +02:00
|
|
|
(void) my_hash_delete(&hash_user_connections,(uchar*) uc);
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&LOCK_user_conn);
|
2007-02-23 12:13:55 +01:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Reset per-hour user resource limits when it has been more than
|
|
|
|
|
an hour since they were last checked
|
|
|
|
|
|
|
|
|
|
SYNOPSIS:
|
|
|
|
|
time_out_user_resource_limits()
|
|
|
|
|
thd Thread handler
|
|
|
|
|
uc User connection details
|
|
|
|
|
|
|
|
|
|
NOTE:
|
|
|
|
|
This assumes that the LOCK_user_conn mutex has been acquired, so it is
|
|
|
|
|
safe to test and modify members of the USER_CONN structure.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void time_out_user_resource_limits(THD *thd, USER_CONN *uc)
|
|
|
|
|
{
|
2007-07-30 10:33:50 +02:00
|
|
|
ulonglong check_time= thd->start_utime;
|
2007-02-23 12:13:55 +01:00
|
|
|
DBUG_ENTER("time_out_user_resource_limits");
|
|
|
|
|
|
|
|
|
|
/* If more than a hour since last check, reset resource checking */
|
2007-07-30 10:33:50 +02:00
|
|
|
if (check_time - uc->reset_utime >= LL(3600000000))
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
|
|
|
|
uc->questions=1;
|
|
|
|
|
uc->updates=0;
|
|
|
|
|
uc->conn_per_hour=0;
|
2007-07-30 10:33:50 +02:00
|
|
|
uc->reset_utime= check_time;
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Check if maximum queries per hour limit has been reached
|
|
|
|
|
returns 0 if OK.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
bool check_mqh(THD *thd, uint check_command)
|
|
|
|
|
{
|
|
|
|
|
bool error= 0;
|
|
|
|
|
USER_CONN *uc=thd->user_connect;
|
|
|
|
|
DBUG_ENTER("check_mqh");
|
|
|
|
|
DBUG_ASSERT(uc != 0);
|
|
|
|
|
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&LOCK_user_conn);
|
2007-02-23 12:13:55 +01:00
|
|
|
|
|
|
|
|
time_out_user_resource_limits(thd, uc);
|
|
|
|
|
|
|
|
|
|
/* Check that we have not done too many questions / hour */
|
|
|
|
|
if (uc->user_resources.questions &&
|
|
|
|
|
uc->questions++ >= uc->user_resources.questions)
|
|
|
|
|
{
|
2007-10-31 22:10:58 +01:00
|
|
|
my_error(ER_USER_LIMIT_REACHED, MYF(0), uc->user, "max_questions",
|
|
|
|
|
(long) uc->user_resources.questions);
|
2007-02-23 12:13:55 +01:00
|
|
|
error=1;
|
|
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
if (check_command < (uint) SQLCOM_END)
|
|
|
|
|
{
|
|
|
|
|
/* Check that we have not done too many updates / hour */
|
|
|
|
|
if (uc->user_resources.updates &&
|
|
|
|
|
(sql_command_flags[check_command] & CF_CHANGES_DATA) &&
|
|
|
|
|
uc->updates++ >= uc->user_resources.updates)
|
|
|
|
|
{
|
2007-10-31 22:10:58 +01:00
|
|
|
my_error(ER_USER_LIMIT_REACHED, MYF(0), uc->user, "max_updates",
|
|
|
|
|
(long) uc->user_resources.updates);
|
2007-02-23 12:13:55 +01:00
|
|
|
error=1;
|
|
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
end:
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&LOCK_user_conn);
|
2007-02-23 12:13:55 +01:00
|
|
|
DBUG_RETURN(error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Check for maximum allowable user connections, if the mysqld server is
|
|
|
|
|
started with corresponding variable that is greater then 0.
|
|
|
|
|
*/
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
extern "C" uchar *get_key_conn(user_conn *buff, size_t *length,
|
2007-02-23 12:13:55 +01:00
|
|
|
my_bool not_used __attribute__((unused)))
|
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
*length= buff->len;
|
|
|
|
|
return (uchar*) buff->user;
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
extern "C" void free_user(struct user_conn *uc)
|
|
|
|
|
{
|
Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Essentially, the problem is that safemalloc is excruciatingly
slow as it checks all allocated blocks for overrun at each
memory management primitive, yielding a almost exponential
slowdown for the memory management functions (malloc, realloc,
free). The overrun check basically consists of verifying some
bytes of a block for certain magic keys, which catches some
simple forms of overrun. Another minor problem is violation
of aliasing rules and that its own internal list of blocks
is prone to corruption.
Another issue with safemalloc is rather the maintenance cost
as the tool has a significant impact on the server code.
Given the magnitude of memory debuggers available nowadays,
especially those that are provided with the platform malloc
implementation, maintenance of a in-house and largely obsolete
memory debugger becomes a burden that is not worth the effort
due to its slowness and lack of support for detecting more
common forms of heap corruption.
Since there are third-party tools that can provide the same
functionality at a lower or comparable performance cost, the
solution is to simply remove safemalloc. Third-party tools
can provide the same functionality at a lower or comparable
performance cost.
The removal of safemalloc also allows a simplification of the
malloc wrappers, removing quite a bit of kludge: redefinition
of my_malloc, my_free and the removal of the unused second
argument of my_free. Since free() always check whether the
supplied pointer is null, redudant checks are also removed.
Also, this patch adds unit testing for my_malloc and moves
my_realloc implementation into the same file as the other
memory allocation primitives.
2010-07-08 23:20:08 +02:00
|
|
|
my_free(uc);
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void init_max_user_conn(void)
|
|
|
|
|
{
|
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
2009-10-14 18:37:38 +02:00
|
|
|
(void)
|
|
|
|
|
my_hash_init(&hash_user_connections,system_charset_info,max_connections,
|
|
|
|
|
0,0, (my_hash_get_key) get_key_conn,
|
|
|
|
|
(my_hash_free_key) free_user, 0);
|
2007-02-23 12:13:55 +01:00
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void free_max_user_conn(void)
|
|
|
|
|
{
|
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
2009-10-14 18:37:38 +02:00
|
|
|
my_hash_free(&hash_user_connections);
|
2007-02-23 12:13:55 +01:00
|
|
|
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void reset_mqh(LEX_USER *lu, bool get_them= 0)
|
|
|
|
|
{
|
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&LOCK_user_conn);
|
2007-02-23 12:13:55 +01:00
|
|
|
if (lu) // for GRANT
|
|
|
|
|
{
|
|
|
|
|
USER_CONN *uc;
|
|
|
|
|
uint temp_len=lu->user.length+lu->host.length+2;
|
|
|
|
|
char temp_user[USER_HOST_BUFF_SIZE];
|
|
|
|
|
|
|
|
|
|
memcpy(temp_user,lu->user.str,lu->user.length);
|
|
|
|
|
memcpy(temp_user+lu->user.length+1,lu->host.str,lu->host.length);
|
|
|
|
|
temp_user[lu->user.length]='\0'; temp_user[temp_len-1]=0;
|
2009-10-14 18:37:38 +02:00
|
|
|
if ((uc = (struct user_conn *) my_hash_search(&hash_user_connections,
|
|
|
|
|
(uchar*) temp_user,
|
|
|
|
|
temp_len)))
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
|
|
|
|
uc->questions=0;
|
|
|
|
|
get_mqh(temp_user,&temp_user[lu->user.length+1],uc);
|
|
|
|
|
uc->updates=0;
|
|
|
|
|
uc->conn_per_hour=0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* for FLUSH PRIVILEGES and FLUSH USER_RESOURCES */
|
|
|
|
|
for (uint idx=0;idx < hash_user_connections.records; idx++)
|
|
|
|
|
{
|
2009-10-14 18:37:38 +02:00
|
|
|
USER_CONN *uc=(struct user_conn *)
|
|
|
|
|
my_hash_element(&hash_user_connections, idx);
|
2007-02-23 12:13:55 +01:00
|
|
|
if (get_them)
|
|
|
|
|
get_mqh(uc->user,uc->host,uc);
|
|
|
|
|
uc->questions=0;
|
|
|
|
|
uc->updates=0;
|
|
|
|
|
uc->conn_per_hour=0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&LOCK_user_conn);
|
2007-02-23 12:13:55 +01:00
|
|
|
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-18 10:46:55 +01:00
|
|
|
/**
|
|
|
|
|
Set thread character set variables from the given ID
|
|
|
|
|
|
|
|
|
|
@param thd thread handle
|
|
|
|
|
@param cs_number character set and collation ID
|
|
|
|
|
|
|
|
|
|
@retval 0 OK; character_set_client, collation_connection and
|
|
|
|
|
character_set_results are set to the new value,
|
|
|
|
|
or to the default global values.
|
|
|
|
|
|
|
|
|
|
@retval 1 error, e.g. the given ID is not supported by parser.
|
|
|
|
|
Corresponding SQL error is sent.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
bool thd_init_client_charset(THD *thd, uint cs_number)
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
2011-02-18 10:46:55 +01:00
|
|
|
CHARSET_INFO *cs;
|
2007-02-23 12:13:55 +01:00
|
|
|
/*
|
|
|
|
|
Use server character set and collation if
|
|
|
|
|
- opt_character_set_client_handshake is not set
|
|
|
|
|
- client has not specified a character set
|
|
|
|
|
- client character set is the same as the servers
|
|
|
|
|
- client character set doesn't exists in server
|
|
|
|
|
*/
|
|
|
|
|
if (!opt_character_set_client_handshake ||
|
2011-02-18 10:46:55 +01:00
|
|
|
!(cs= get_charset(cs_number, MYF(0))) ||
|
2007-02-23 12:13:55 +01:00
|
|
|
!my_strcasecmp(&my_charset_latin1,
|
|
|
|
|
global_system_variables.character_set_client->name,
|
2011-02-18 10:46:55 +01:00
|
|
|
cs->name))
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
|
|
|
|
thd->variables.character_set_client=
|
|
|
|
|
global_system_variables.character_set_client;
|
|
|
|
|
thd->variables.collation_connection=
|
|
|
|
|
global_system_variables.collation_connection;
|
|
|
|
|
thd->variables.character_set_results=
|
|
|
|
|
global_system_variables.character_set_results;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2011-02-18 10:46:55 +01:00
|
|
|
if (!is_supported_parser_charset(cs))
|
|
|
|
|
{
|
|
|
|
|
/* Disallow non-supported parser character sets: UCS2, UTF16, UTF32 */
|
|
|
|
|
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), "character_set_client",
|
|
|
|
|
cs->csname);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2007-02-23 12:13:55 +01:00
|
|
|
thd->variables.character_set_results=
|
|
|
|
|
thd->variables.collation_connection=
|
2011-02-18 10:46:55 +01:00
|
|
|
thd->variables.character_set_client= cs;
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
2011-02-18 10:46:55 +01:00
|
|
|
return false;
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Initialize connection threads
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
bool init_new_connection_handler_thread()
|
|
|
|
|
{
|
|
|
|
|
pthread_detach_this_thread();
|
|
|
|
|
if (my_thread_init())
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
Backport of:
ChangeSet@1.2703, 2007-12-07 09:35:28-05:00, cmiller@zippy.cornsilk.net +40 -0
Bug#13174: SHA2 function
Patch contributed from Bill Karwin, paper unnumbered CLA in Seattle
Implement SHA2 functions.
Chad added code to make it work with YaSSL. Also, he removed the
(probable) bug of embedded server never using SSL-dependent
functions. (libmysqld/Makefile.am didn't read ANY autoconf defs.)
Function specification:
SHA2( string cleartext, integer hash_length )
-> string hash, or NULL
where hash_length is one of 224, 256, 384, or 512. If either is
NULL or a length is unsupported, then the result is NULL. The
resulting string is always the length of the hash_length parameter
or is NULL.
Include the canonical hash examples from the NIST in the test
results.
---
Polish and address concerns of reviewers.
2010-04-13 17:04:45 +02:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2007-02-23 12:13:55 +01:00
|
|
|
/*
|
|
|
|
|
Perform handshake, authorize client and update thd ACL variables.
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
check_connection()
|
|
|
|
|
thd thread handle
|
|
|
|
|
|
|
|
|
|
RETURN
|
2010-08-09 10:32:50 +02:00
|
|
|
0 success, thd is updated.
|
|
|
|
|
1 error
|
2007-02-23 12:13:55 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static int check_connection(THD *thd)
|
|
|
|
|
{
|
|
|
|
|
uint connect_errors= 0;
|
|
|
|
|
NET *net= &thd->net;
|
|
|
|
|
|
|
|
|
|
DBUG_PRINT("info",
|
|
|
|
|
("New connection received on %s", vio_description(net->vio)));
|
|
|
|
|
#ifdef SIGNAL_WITH_VIO_CLOSE
|
|
|
|
|
thd->set_active_vio(net->vio);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (!thd->main_security_ctx.host) // If TCP/IP connection
|
|
|
|
|
{
|
2009-11-25 11:53:23 +01:00
|
|
|
char ip[NI_MAXHOST];
|
2007-02-23 12:13:55 +01:00
|
|
|
|
2009-11-25 11:53:23 +01:00
|
|
|
if (vio_peer_addr(net->vio, ip, &thd->peer_port, NI_MAXHOST))
|
2007-10-31 22:10:58 +01:00
|
|
|
{
|
Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.
In sql_class.cc, 'row_count', of type 'ha_rows', was used as last argument for
ER_TRUNCATED_WRONG_VALUE_FOR_FIELD which is
"Incorrect %-.32s value: '%-.128s' for column '%.192s' at row %ld".
So 'ha_rows' was used as 'long'.
On SPARC32 Solaris builds, 'long' is 4 bytes and 'ha_rows' is 'longlong' i.e. 8 bytes.
So the printf-like code was reading only the first 4 bytes.
Because the CPU is big-endian, 1LL is 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x01
so the first four bytes yield 0. So the warning message had "row 0" instead of
"row 1" in test outfile_loaddata.test:
-Warning 1366 Incorrect string value: '\xE1\xE2\xF7' for column 'b' at row 1
+Warning 1366 Incorrect string value: '\xE1\xE2\xF7' for column 'b' at row 0
All error-messaging functions which internally invoke some printf-life function
are potential candidate for such mistakes.
One apparently easy way to catch such mistakes is to use
ATTRIBUTE_FORMAT (from my_attribute.h).
But this works only when call site has both:
a) the format as a string literal
b) the types of arguments.
So:
func(ER(ER_BLAH), 10);
will silently not be checked, because ER(ER_BLAH) is not known at
compile time (it is known at run-time, and depends on the chosen
language).
And
func("%s", a va_list argument);
has the same problem, as the *real* type of arguments is not
known at this site at compile time (it's known in some caller).
Moreover,
func(ER(ER_BLAH));
though possibly correct (if ER(ER_BLAH) has no '%' markers), will not
compile (gcc says "error: format not a string literal and no format
arguments").
Consequences:
1) ATTRIBUTE_FORMAT is here added only to functions which in practice
take "string literal" formats: "my_error_reporter" and "print_admin_msg".
2) it cannot be added to the other functions: my_error(),
push_warning_printf(), Table_check_intact::report_error(),
general_log_print().
To do a one-time check of functions listed in (2), the following
"static code analysis" has been done:
1) replace
my_error(ER_xxx, arguments for substitution in format)
with the equivalent
my_printf_error(ER_xxx,ER(ER_xxx), arguments for substitution in
format),
so that we have ER(ER_xxx) and the arguments *in the same call site*
2) add ATTRIBUTE_FORMAT to push_warning_printf(),
Table_check_intact::report_error(), general_log_print()
3) replace ER(xxx) with the hard-coded English text found in
errmsg.txt (like: ER(ER_UNKNOWN_ERROR) is replaced with
"Unknown error"), so that a call site has the format as string literal
4) this way, ATTRIBUTE_FORMAT can effectively do its job
5) compile, fix errors detected by ATTRIBUTE_FORMAT
6) revert steps 1-2-3.
The present patch has no compiler error when submitted again to the
static code analysis above.
It cannot catch all problems though: see Field::set_warning(), in
which a call to push_warning_printf() has a variable error
(thus, not replacable by a string literal); I checked set_warning() calls
by hand though.
See also WL 5883 for one proposal to avoid such bugs from appearing
again in the future.
The issues fixed in the patch are:
a) mismatch in types (like 'int' passed to '%ld')
b) more arguments passed than specified in the format.
This patch resolves mismatches by changing the type/number of arguments,
not by changing error messages of sql/share/errmsg.txt. The latter would be wrong,
per the following old rule: errmsg.txt must be as stable as possible; no insertions
or deletions of messages, no changes of type or number of printf-like format specifiers,
are allowed, as long as the change impacts a message already released in a GA version.
If this rule is not followed:
- Connectors, which use error message numbers, will be confused (by insertions/deletions
of messages)
- using errmsg.sys of MySQL 5.1.n with mysqld of MySQL 5.1.(n+1)
could produce wrong messages or crash; such usage can easily happen if
installing 5.1.(n+1) while /etc/my.cnf still has --language=/path/to/5.1.n/xxx;
or if copying mysqld from 5.1.(n+1) into a 5.1.n installation.
When fixing b), I have verified that the superfluous arguments were not used in the format
in the first 5.1 GA (5.1.30 'bteam@astra04-20081114162938-z8mctjp6st27uobm').
Had they been used, then passing them today, even if the message doesn't use them
anymore, would have been necessary, as explained above.
2011-05-16 22:04:01 +02:00
|
|
|
my_error(ER_BAD_HOST_ERROR, MYF(0));
|
2007-10-31 22:10:58 +01:00
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (!(thd->main_security_ctx.ip= my_strdup(ip,MYF(MY_WME))))
|
|
|
|
|
return 1; /* The error is set by my_strdup(). */
|
2007-02-23 12:13:55 +01:00
|
|
|
thd->main_security_ctx.host_or_ip= thd->main_security_ctx.ip;
|
|
|
|
|
if (!(specialflag & SPECIAL_NO_RESOLVE))
|
|
|
|
|
{
|
2009-11-25 11:53:23 +01:00
|
|
|
if (ip_to_hostname(&net->vio->remote, thd->main_security_ctx.ip,
|
|
|
|
|
&thd->main_security_ctx.host, &connect_errors))
|
|
|
|
|
{
|
2011-05-21 10:21:08 +02:00
|
|
|
my_error(ER_BAD_HOST_ERROR, MYF(0));
|
2009-11-25 11:53:23 +01:00
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2007-02-23 12:13:55 +01:00
|
|
|
/* Cut very long hostnames to avoid possible overflows */
|
|
|
|
|
if (thd->main_security_ctx.host)
|
|
|
|
|
{
|
|
|
|
|
if (thd->main_security_ctx.host != my_localhost)
|
|
|
|
|
thd->main_security_ctx.host[min(strlen(thd->main_security_ctx.host),
|
|
|
|
|
HOSTNAME_LENGTH)]= 0;
|
|
|
|
|
thd->main_security_ctx.host_or_ip= thd->main_security_ctx.host;
|
|
|
|
|
}
|
|
|
|
|
if (connect_errors > max_connect_errors)
|
2007-10-31 22:10:58 +01:00
|
|
|
{
|
|
|
|
|
my_error(ER_HOST_IS_BLOCKED, MYF(0), thd->main_security_ctx.host_or_ip);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
|
|
|
|
DBUG_PRINT("info",("Host: %s ip: %s",
|
|
|
|
|
(thd->main_security_ctx.host ?
|
|
|
|
|
thd->main_security_ctx.host : "unknown host"),
|
|
|
|
|
(thd->main_security_ctx.ip ?
|
|
|
|
|
thd->main_security_ctx.ip : "unknown ip")));
|
|
|
|
|
if (acl_check_host(thd->main_security_ctx.host, thd->main_security_ctx.ip))
|
2007-10-31 22:10:58 +01:00
|
|
|
{
|
|
|
|
|
my_error(ER_HOST_NOT_PRIVILEGED, MYF(0),
|
|
|
|
|
thd->main_security_ctx.host_or_ip);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
|
|
|
|
else /* Hostname given means that the connection was on a socket */
|
|
|
|
|
{
|
|
|
|
|
DBUG_PRINT("info",("Host: %s", thd->main_security_ctx.host));
|
|
|
|
|
thd->main_security_ctx.host_or_ip= thd->main_security_ctx.host;
|
|
|
|
|
thd->main_security_ctx.ip= 0;
|
|
|
|
|
/* Reset sin_addr */
|
2009-11-25 11:53:23 +01:00
|
|
|
bzero((char*) &net->vio->remote, sizeof(net->vio->remote));
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
|
|
|
|
vio_keepalive(net->vio, TRUE);
|
2008-03-25 17:18:58 +01:00
|
|
|
|
2007-02-23 12:13:55 +01:00
|
|
|
if (thd->packet.alloc(thd->variables.net_buffer_length))
|
2007-10-31 22:10:58 +01:00
|
|
|
return 1; /* The error is set by alloc(). */
|
2007-02-23 12:13:55 +01:00
|
|
|
|
2010-08-09 10:32:50 +02:00
|
|
|
return acl_authenticate(thd, connect_errors, 0);
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Setup thread to be used with the current thread
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
bool setup_connection_thread_globals()
|
|
|
|
|
thd Thread/connection handler
|
|
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
|
0 ok
|
|
|
|
|
1 Error (out of memory)
|
|
|
|
|
In this case we will close the connection and increment status
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
bool setup_connection_thread_globals(THD *thd)
|
|
|
|
|
{
|
|
|
|
|
if (thd->store_globals())
|
|
|
|
|
{
|
2010-12-15 23:59:21 +01:00
|
|
|
close_connection(thd, ER_OUT_OF_RESOURCES);
|
2007-02-23 12:13:55 +01:00
|
|
|
statistic_increment(aborted_connects,&LOCK_status);
|
2010-06-07 16:01:39 +02:00
|
|
|
MYSQL_CALLBACK(thread_scheduler, end_thread, (thd, 0));
|
2007-02-23 12:13:55 +01:00
|
|
|
return 1; // Error
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Autenticate user, with error reporting
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
login_connection()
|
|
|
|
|
thd Thread handler
|
|
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
|
Connection is not closed in case of errors
|
|
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
|
0 ok
|
|
|
|
|
1 error
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2010-06-07 16:01:39 +02:00
|
|
|
bool login_connection(THD *thd)
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
|
|
|
|
NET *net= &thd->net;
|
2007-12-12 16:21:01 +01:00
|
|
|
int error;
|
2007-02-23 12:13:55 +01:00
|
|
|
DBUG_ENTER("login_connection");
|
2007-10-10 15:57:01 +02:00
|
|
|
DBUG_PRINT("info", ("login_connection called by thread %lu",
|
2007-02-23 12:13:55 +01:00
|
|
|
thd->thread_id));
|
|
|
|
|
|
|
|
|
|
/* Use "connect_timeout" value during connection phase */
|
2007-05-24 20:57:10 +02:00
|
|
|
my_net_set_read_timeout(net, connect_timeout);
|
|
|
|
|
my_net_set_write_timeout(net, connect_timeout);
|
2007-02-23 12:13:55 +01:00
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
error= check_connection(thd);
|
Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,
2630.39.1, 2630.28.29, 2630.34.3, 2630.34.2, 2630.34.1, 2630.29.29,
2630.29.28, 2630.31.1, 2630.28.13, 2630.28.10, 2617.23.14 and
some other minor revisions.
This patch implements:
WL#4264 "Backup: Stabilize Service Interface" -- all the
server prerequisites except si_objects.{h,cc} themselves (they can
be just copied over, when needed).
WL#4435: Support OUT-parameters in prepared statements.
(and all issues in the initial patches for these two
tasks, that were discovered in pushbuild and during testing).
Bug#39519: mysql_stmt_close() should flush all data
associated with the statement.
After execution of a prepared statement, send OUT parameters of the invoked
stored procedure, if any, to the client.
When using the binary protocol, send the parameters in an additional result
set over the wire. When using the text protocol, assign out parameters to
the user variables from the CALL(@var1, @var2, ...) specification.
The following refactoring has been made:
- Protocol::send_fields() was renamed to Protocol::send_result_set_metadata();
- A new Protocol::send_result_set_row() was introduced to incapsulate
common functionality for sending row data.
- Signature of Protocol::prepare_for_send() was changed: this operation
does not need a list of items, the number of items is fully sufficient.
The following backward incompatible changes have been made:
- CLIENT_MULTI_RESULTS is now enabled by default in the client;
- CLIENT_PS_MULTI_RESUTLS is now enabled by default in the client.
2009-10-21 22:02:06 +02:00
|
|
|
thd->protocol->end_statement();
|
2007-12-12 16:21:01 +01:00
|
|
|
|
|
|
|
|
if (error)
|
2007-02-23 12:13:55 +01:00
|
|
|
{ // Wrong permissions
|
2009-09-30 22:10:22 +02:00
|
|
|
#ifdef _WIN32
|
2007-02-23 12:13:55 +01:00
|
|
|
if (vio_type(net->vio) == VIO_TYPE_NAMEDPIPE)
|
|
|
|
|
my_sleep(1000); /* must wait after eof() */
|
|
|
|
|
#endif
|
|
|
|
|
statistic_increment(aborted_connects,&LOCK_status);
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
|
|
|
|
/* Connect completed, set read/write timeouts back to default */
|
2007-05-24 20:57:10 +02:00
|
|
|
my_net_set_read_timeout(net, thd->variables.net_read_timeout);
|
|
|
|
|
my_net_set_write_timeout(net, thd->variables.net_write_timeout);
|
2007-02-23 12:13:55 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Close an established connection
|
|
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
|
This mainly updates status variables
|
|
|
|
|
*/
|
|
|
|
|
|
2010-06-07 16:01:39 +02:00
|
|
|
void end_connection(THD *thd)
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
|
|
|
|
NET *net= &thd->net;
|
2007-03-02 17:43:45 +01:00
|
|
|
plugin_thdvar_cleanup(thd);
|
2007-02-23 12:13:55 +01:00
|
|
|
if (thd->user_connect)
|
2009-10-13 22:16:41 +02:00
|
|
|
{
|
2007-02-23 12:13:55 +01:00
|
|
|
decrease_user_connections(thd->user_connect);
|
2009-10-13 22:16:41 +02:00
|
|
|
/*
|
|
|
|
|
The thread may returned back to the pool and assigned to a user
|
|
|
|
|
that doesn't have a limit. Ensure the user is not using resources
|
|
|
|
|
of someone else.
|
|
|
|
|
*/
|
|
|
|
|
thd->user_connect= NULL;
|
|
|
|
|
}
|
2007-10-09 12:53:15 +02:00
|
|
|
|
2009-09-23 15:21:29 +02:00
|
|
|
if (thd->killed || (net->error && net->vio != 0))
|
2007-10-09 12:53:15 +02:00
|
|
|
{
|
|
|
|
|
statistic_increment(aborted_threads,&LOCK_status);
|
|
|
|
|
}
|
|
|
|
|
|
2007-12-12 16:21:01 +01:00
|
|
|
if (net->error && net->vio != 0)
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
|
|
|
|
if (!thd->killed && thd->variables.log_warnings > 1)
|
2007-10-09 12:53:15 +02:00
|
|
|
{
|
|
|
|
|
Security_context *sctx= thd->security_ctx;
|
|
|
|
|
|
2007-02-23 12:13:55 +01:00
|
|
|
sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION),
|
|
|
|
|
thd->thread_id,(thd->db ? thd->db : "unconnected"),
|
|
|
|
|
sctx->user ? sctx->user : "unauthenticated",
|
|
|
|
|
sctx->host_or_ip,
|
2009-09-10 11:18:29 +02:00
|
|
|
(thd->stmt_da->is_error() ? thd->stmt_da->message() :
|
2007-02-23 12:13:55 +01:00
|
|
|
ER(ER_UNKNOWN_ERROR)));
|
2007-10-09 12:53:15 +02:00
|
|
|
}
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Initialize THD to handle queries
|
|
|
|
|
*/
|
|
|
|
|
|
2010-06-07 16:01:39 +02:00
|
|
|
void prepare_new_connection_state(THD* thd)
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
|
|
|
|
Security_context *sctx= thd->security_ctx;
|
|
|
|
|
|
|
|
|
|
if (thd->client_capabilities & CLIENT_COMPRESS)
|
|
|
|
|
thd->net.compress=1; // Use compression
|
|
|
|
|
|
2007-08-27 22:31:27 +02:00
|
|
|
/*
|
|
|
|
|
Much of this is duplicated in create_embedded_thd() for the
|
|
|
|
|
embedded server library.
|
|
|
|
|
TODO: refactor this to avoid code duplication there
|
|
|
|
|
*/
|
2007-02-23 12:13:55 +01:00
|
|
|
thd->proc_info= 0;
|
|
|
|
|
thd->command= COM_SLEEP;
|
|
|
|
|
thd->set_time();
|
|
|
|
|
thd->init_for_queries();
|
|
|
|
|
|
2009-12-22 10:35:56 +01:00
|
|
|
if (opt_init_connect.length && !(sctx->master_access & SUPER_ACL))
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
2009-12-22 10:35:56 +01:00
|
|
|
execute_init_command(thd, &opt_init_connect, &LOCK_sys_init_connect);
|
2007-12-12 16:21:01 +01:00
|
|
|
if (thd->is_error())
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
2012-01-02 07:25:48 +01:00
|
|
|
ulong packet_length;
|
|
|
|
|
NET *net= &thd->net;
|
|
|
|
|
|
2007-02-23 12:13:55 +01:00
|
|
|
sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION),
|
2012-01-02 07:25:48 +01:00
|
|
|
thd->thread_id,
|
|
|
|
|
thd->db ? thd->db : "unconnected",
|
2007-02-23 12:13:55 +01:00
|
|
|
sctx->user ? sctx->user : "unauthenticated",
|
|
|
|
|
sctx->host_or_ip, "init_connect command failed");
|
2009-09-10 11:18:29 +02:00
|
|
|
sql_print_warning("%s", thd->stmt_da->message());
|
2012-01-02 07:25:48 +01:00
|
|
|
|
|
|
|
|
thd->lex->current_select= 0;
|
|
|
|
|
my_net_set_read_timeout(net, thd->variables.net_wait_timeout);
|
|
|
|
|
thd->clear_error();
|
|
|
|
|
net_new_transaction(net);
|
|
|
|
|
packet_length= my_net_read(net);
|
|
|
|
|
/*
|
|
|
|
|
If my_net_read() failed, my_error() has been already called,
|
|
|
|
|
and the main Diagnostics Area contains an error condition.
|
|
|
|
|
*/
|
|
|
|
|
if (packet_length != packet_error)
|
|
|
|
|
my_error(ER_NEW_ABORTING_CONNECTION, MYF(0),
|
|
|
|
|
thd->thread_id,
|
|
|
|
|
thd->db ? thd->db : "unconnected",
|
|
|
|
|
sctx->user ? sctx->user : "unauthenticated",
|
|
|
|
|
sctx->host_or_ip, "init_connect command failed");
|
|
|
|
|
|
|
|
|
|
thd->server_status&= ~SERVER_STATUS_CLEAR_SET;
|
2012-01-02 07:50:05 +01:00
|
|
|
thd->protocol->end_statement();
|
2012-01-02 07:25:48 +01:00
|
|
|
thd->killed = THD::KILL_CONNECTION;
|
|
|
|
|
return;
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
2012-01-02 07:25:48 +01:00
|
|
|
|
2007-02-23 12:13:55 +01:00
|
|
|
thd->proc_info=0;
|
|
|
|
|
thd->set_time();
|
|
|
|
|
thd->init_for_queries();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Thread handler for a connection
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
handle_one_connection()
|
|
|
|
|
arg Connection object (THD)
|
|
|
|
|
|
|
|
|
|
IMPLEMENTATION
|
|
|
|
|
This function (normally) does the following:
|
|
|
|
|
- Initialize thread
|
|
|
|
|
- Initialize THD to be used with this thread
|
|
|
|
|
- Authenticate user
|
|
|
|
|
- Execute all queries sent on the connection
|
|
|
|
|
- Take connection down
|
|
|
|
|
- End thread / Handle next connection using thread from thread cache
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
pthread_handler_t handle_one_connection(void *arg)
|
|
|
|
|
{
|
|
|
|
|
THD *thd= (THD*) arg;
|
2009-06-09 00:05:24 +02:00
|
|
|
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_thread_set_psi_id(thd->thread_id);
|
|
|
|
|
|
|
|
|
|
do_handle_one_connection(thd);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-02-10 18:41:02 +01:00
|
|
|
bool thd_prepare_connection(THD *thd)
|
|
|
|
|
{
|
|
|
|
|
bool rc;
|
|
|
|
|
lex_start(thd);
|
|
|
|
|
rc= login_connection(thd);
|
|
|
|
|
MYSQL_AUDIT_NOTIFY_CONNECTION_CONNECT(thd);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
MYSQL_CONNECTION_START(thd->thread_id, &thd->security_ctx->priv_user[0],
|
|
|
|
|
(char *) thd->security_ctx->host_or_ip);
|
|
|
|
|
|
|
|
|
|
prepare_new_connection_state(thd);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool thd_is_connection_alive(THD *thd)
|
|
|
|
|
{
|
|
|
|
|
NET *net= &thd->net;
|
|
|
|
|
if (!net->error &&
|
|
|
|
|
net->vio != 0 &&
|
|
|
|
|
!(thd->killed == THD::KILL_CONNECTION))
|
|
|
|
|
return TRUE;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-07 06:42:07 +01:00
|
|
|
void do_handle_one_connection(THD *thd_arg)
|
|
|
|
|
{
|
|
|
|
|
THD *thd= thd_arg;
|
|
|
|
|
|
2009-06-09 00:05:24 +02:00
|
|
|
thd->thr_create_utime= my_micro_time();
|
2007-02-23 12:13:55 +01:00
|
|
|
|
2010-06-07 16:01:39 +02:00
|
|
|
if (MYSQL_CALLBACK_ELSE(thread_scheduler, init_new_connection_thread, (), 0))
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
2010-12-15 23:59:21 +01:00
|
|
|
close_connection(thd, ER_OUT_OF_RESOURCES);
|
2007-02-23 12:13:55 +01:00
|
|
|
statistic_increment(aborted_connects,&LOCK_status);
|
2010-06-07 16:01:39 +02:00
|
|
|
MYSQL_CALLBACK(thread_scheduler, end_thread, (thd, 0));
|
2010-01-07 06:42:07 +01:00
|
|
|
return;
|
2007-02-23 12:13:55 +01:00
|
|
|
}
|
2009-06-09 00:05:24 +02:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
If a thread was created to handle this connection:
|
|
|
|
|
increment slow_launch_threads counter if it took more than
|
|
|
|
|
slow_launch_time seconds to create the thread.
|
|
|
|
|
*/
|
|
|
|
|
if (thd->prior_thr_create_utime)
|
|
|
|
|
{
|
|
|
|
|
ulong launch_time= (ulong) (thd->thr_create_utime -
|
|
|
|
|
thd->prior_thr_create_utime);
|
|
|
|
|
if (launch_time >= slow_launch_time*1000000L)
|
|
|
|
|
statistic_increment(slow_launch_threads, &LOCK_status);
|
|
|
|
|
thd->prior_thr_create_utime= 0;
|
|
|
|
|
}
|
2007-02-23 12:13:55 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
handle_one_connection() is normally the only way a thread would
|
|
|
|
|
start and would always be on the very high end of the stack ,
|
|
|
|
|
therefore, the thread stack always starts at the address of the
|
|
|
|
|
first local variable of handle_one_connection, which is thd. We
|
|
|
|
|
need to know the start of the stack so that we could check for
|
|
|
|
|
stack overruns.
|
|
|
|
|
*/
|
|
|
|
|
thd->thread_stack= (char*) &thd;
|
|
|
|
|
if (setup_connection_thread_globals(thd))
|
2010-01-07 06:42:07 +01:00
|
|
|
return;
|
2007-02-23 12:13:55 +01:00
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
2010-12-14 15:34:23 +01:00
|
|
|
bool rc;
|
2007-02-23 12:13:55 +01:00
|
|
|
|
2011-02-10 18:41:02 +01:00
|
|
|
rc= thd_prepare_connection(thd);
|
2010-12-14 15:34:23 +01:00
|
|
|
if (rc)
|
2007-02-23 12:13:55 +01:00
|
|
|
goto end_thread;
|
|
|
|
|
|
2011-02-10 18:41:02 +01:00
|
|
|
while (thd_is_connection_alive(thd))
|
2007-02-23 12:13:55 +01:00
|
|
|
{
|
2009-12-15 20:52:47 +01:00
|
|
|
mysql_audit_release(thd);
|
2007-02-23 12:13:55 +01:00
|
|
|
if (do_command(thd))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
end_connection(thd);
|
|
|
|
|
|
|
|
|
|
end_thread:
|
2010-12-15 23:59:21 +01:00
|
|
|
close_connection(thd);
|
2010-06-07 16:01:39 +02:00
|
|
|
if (MYSQL_CALLBACK_ELSE(thread_scheduler, end_thread, (thd, 1), 0))
|
2010-01-07 06:42:07 +01:00
|
|
|
return; // Probably no-threads
|
2007-02-23 12:13:55 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
If end_thread() returns, we are either running with
|
|
|
|
|
thread-handler=no-threads or this thread has been schedule to
|
|
|
|
|
handle the next connection.
|
|
|
|
|
*/
|
|
|
|
|
thd= current_thd;
|
|
|
|
|
thd->thread_stack= (char*) &thd;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif /* EMBEDDED_LIBRARY */
|