diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
| commit | a04157fbb3f2b2e054c02968ffc82bb0eb971d58 (patch) | |
| tree | db1cb9732cc2b568c4a56c3f6d11cf8f4d5250b6 /libmysqld | |
| parent | 205f7a0583f5ba5cc0c6428fa6e44c74b534d8e8 (diff) | |
| parent | 9d3fda77c8e20ff299f9750b64c42dfbb58a7806 (diff) | |
| download | mariadb-git-a04157fbb3f2b2e054c02968ffc82bb0eb971d58.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 2eea24e364c..26d761bf6fd 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -1052,7 +1052,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; -err: + DBUG_VOID_RETURN; } |