bk commit into 4.1 tree (jimw:1.2371) BUG#12327

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2371 05/08/09 18:02:36 jimw@stripped +4 -0
  Rename rest() macro in my_list.h to list_rest(). (Bug #12327)

  sql/sql_test.cc
    1.33 05/08/09 18:02:32 jimw@stripped +1 -1
    rest() renamed to list_rest().

  mysys/thr_lock.c
    1.42 05/08/09 18:02:32 jimw@stripped +2 -1
    rest() renamed to list_rest().

  mysys/list.c
    1.9 05/08/09 18:02:32 jimw@stripped +1 -1
    rest() renamed to list_rest().

  include/my_list.h
    1.8 05/08/09 18:02:32 jimw@stripped +1 -1
    Rename rest() macro to list_rest().

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-12327

--- 1.7/include/my_list.h	2004-11-02 13:46:50 -08:00
+++ 1.8/include/my_list.h	2005-08-09 18:02:32 -07:00
@@ -36,7 +36,7 @@
 extern unsigned int list_length(LIST *);
 extern int list_walk(LIST *,list_walk_action action,gptr argument);
 
-#define rest(a) ((a)->next)
+#define list_rest(a) ((a)->next)
 #define list_push(a,b) (a)=list_cons((b),(a))
 #define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; my_free((gptr)
old,MYF(MY_FAE)); }
 

--- 1.8/mysys/list.c	2004-08-23 03:46:49 -07:00
+++ 1.9/mysys/list.c	2005-08-09 18:02:32 -07:00
@@ -109,7 +109,7 @@
   {
     if ((error = (*action)(list->data,argument)))
       return error;
-    list=rest(list);
+    list=list_rest(list);
   }
   return 0;
 }

--- 1.41/mysys/thr_lock.c	2005-07-27 03:21:36 -07:00
+++ 1.42/mysys/thr_lock.c	2005-08-09 18:02:32 -07:00
@@ -1127,7 +1127,8 @@
 
   pthread_mutex_lock(&THR_LOCK_lock);
   puts("Current locks:");
-  for (list=thr_lock_thread_list ; list && count++ < MAX_THREADS ;
list=rest(list))
+  for (list= thr_lock_thread_list; list && count++ < MAX_THREADS;
+       list= list_rest(list))
   {
     THR_LOCK *lock=(THR_LOCK*) list->data;
     VOID(pthread_mutex_lock(&lock->mutex));

--- 1.32/sql/sql_test.cc	2004-05-03 06:55:19 -07:00
+++ 1.33/sql/sql_test.cc	2005-08-09 18:02:32 -07:00
@@ -271,7 +271,7 @@
 
  
VOID(my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO),open_cache.records
+ 20,50));
   VOID(pthread_mutex_lock(&THR_LOCK_lock));
-  for (list=thr_lock_thread_list ; list ; list=rest(list))
+  for (list= thr_lock_thread_list; list; list= list_rest(list))
   {
     THR_LOCK *lock=(THR_LOCK*) list->data;