diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
| commit | a6481aa4c7016c996a9787db4824307c705ec8a1 (patch) | |
| tree | b60f635d3126e8d0f1321f0187390d7cf8496558 /libmysqld | |
| parent | 95564bfea31aef4686ae4e7c6d422e2a20a5d73a (diff) | |
| parent | 88dd873de0d5dc6e8f262268f925596a60b58704 (diff) | |
| download | mariadb-git-a6481aa4c7016c996a9787db4824307c705ec8a1.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 97bcb9d87ca..796506e054f 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -1041,7 +1041,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; } |