diff options
author | unknown <jimw@mysql.com> | 2005-08-15 12:37:45 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-08-15 12:37:45 -0700 |
commit | f6de082b08f07a705a5a701017b8a160adb02fc6 (patch) | |
tree | a82f8fdfe2f9d907eddaa4718eac8f87481e47b3 /mysys/list.c | |
parent | 219c84faba28171cc04608f826703f5c031d70bc (diff) | |
parent | 000a09baac6db1a2c4d943802d00fa96cf9a5083 (diff) | |
download | mariadb-git-f6de082b08f07a705a5a701017b8a160adb02fc6.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
myisam/myisampack.c:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysys/list.c:
Auto merged
mysys/thr_lock.c:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
Diffstat (limited to 'mysys/list.c')
-rw-r--r-- | mysys/list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/list.c b/mysys/list.c index c3cd6c94b9f..0e55c9399f5 100644 --- a/mysys/list.c +++ b/mysys/list.c @@ -109,7 +109,7 @@ int list_walk(LIST *list, list_walk_action action, gptr argument) { if ((error = (*action)(list->data,argument))) return error; - list=rest(list); + list=list_rest(list); } return 0; } |