diff options
| author | Nuno Carvalho <nuno.carvalho@oracle.com> | 2012-10-21 20:34:41 +0100 |
|---|---|---|
| committer | Nuno Carvalho <nuno.carvalho@oracle.com> | 2012-10-21 20:34:41 +0100 |
| commit | a87a0da68889b081c7e26aa829069a0619547028 (patch) | |
| tree | cbe3283cd048bf31b4ac2bd234a70bcb8c604a6e /sql/sql_priv.h | |
| parent | bd3892a9ecdb4442a6760bb38604f43ea8517647 (diff) | |
| parent | 03572c5b82e43f7ab69f02ea81872368489c6e15 (diff) | |
| download | mariadb-git-a87a0da68889b081c7e26aa829069a0619547028.tar.gz | |
BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKS
Merge from mysql-5.1 into mysql-5.5.
Diffstat (limited to 'sql/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 6bc34d611bc..970b921d6e6 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -166,10 +166,6 @@ template <class T> T available_buffer(const char* buf_start, { return buf_len - (buf_current - buf_start); } -/* Explicit instantion to unsigned int. */ -template unsigned int available_buffer<unsigned int>(const char*, - const char*, - unsigned int); /* Check if jump value is within buffer limits. @@ -189,11 +185,6 @@ template <class T> bool valid_buffer_range(T jump, { return (jump <= available_buffer(buf_start, buf_current, buf_len)); } -/* Explicit instantion to unsigned int. */ -template bool valid_buffer_range<unsigned int>(unsigned int, - const char*, - const char*, - unsigned int); /* The rest of the file is included in the server only */ #ifndef MYSQL_CLIENT |