diff options
| author | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
| commit | 8a80e36ac3facdfba626fd758b6e4490d3ea9ddf (patch) | |
| tree | 7a54aa50f6bf549d049cd400fe056d244cfc7eb8 /libmysqld/lib_sql.cc | |
| parent | c022454e7c5690330ed78664443e65b3511649b8 (diff) | |
| parent | 120e3f5ee1a5f2d62f6a4ff10db0797c5ac42287 (diff) | |
| download | mariadb-git-8a80e36ac3facdfba626fd758b6e4490d3ea9ddf.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 2853baf2dfe..d0503adaec1 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -1055,6 +1055,7 @@ void Protocol_simple::prepare_for_resend() data->embedded_info->prev_ptr= &cur->next; next_field=cur->data; next_mysql_field= data->embedded_info->fields_list; + DBUG_VOID_RETURN; } |