diff options
| author | unknown <jimw@mysql.com> | 2005-08-15 14:19:56 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-15 14:19:56 -0700 |
| commit | c78623fa10bfb8d0716c2a77a85be651fdd33996 (patch) | |
| tree | 8d492e044b4d2e12a3864afbefc6052476ce23f3 /server-tools/instance-manager/protocol.cc | |
| parent | d6a6a48861705efc74a30c64e0cb577402c4cfef (diff) | |
| download | mariadb-git-c78623fa10bfb8d0716c2a77a85be651fdd33996.tar.gz | |
Clean up merge from 4.1
mysql-test/r/func_date_add.result:
Update results
mysql-test/r/func_time.result:
Update results
server-tools/instance-manager/protocol.cc:
Fix call to list_rest()
sql/sp_head.cc:
sp_change_db() removed, call mysql_change_db() instead.
Diffstat (limited to 'server-tools/instance-manager/protocol.cc')
| -rw-r--r-- | server-tools/instance-manager/protocol.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/protocol.cc b/server-tools/instance-manager/protocol.cc index 4b46d091c3f..cd1be805b6b 100644 --- a/server-tools/instance-manager/protocol.cc +++ b/server-tools/instance-manager/protocol.cc @@ -203,7 +203,7 @@ int send_fields(struct st_net *net, LIST *fields) position+= 12; if (my_net_write(net, send_buff.buffer, (uint) position+1)) goto err; - tmp= rest(tmp); + tmp= list_rest(tmp); } if (my_net_write(net, eof_buff, 1)) |