Merge

ndb/include/ndb_types.h:
  SCCS merged

innobase/include/sync0rw.h

@@ -61,8 +61,7 @@ Creates, or rather, initializes an rw-lock object in a specified memory
 location (which must be appropriately aligned). The rw-lock is initialized
 to the non-locked state. Explicit freeing of the rw-lock with rw_lock_free
 is necessary only if the memory block containing it is freed. */
-#define rw_lock_create(L) rw_lock_create_func(\
-            (L), __FILE__, __LINE__, __STRING(L))
+#define rw_lock_create(L) rw_lock_create_func((L), __FILE__, __LINE__, #L)
           
 /*=====================*/
 /**********************************************************************

innobase/include/sync0sync.h

@@ -37,7 +37,7 @@ location (which must be appropriately aligned). The mutex is initialized
 in the reset state. Explicit freeing of the mutex with mutex_free is
 necessary only if the memory block containing it is freed. */
 
-#define mutex_create(M)	mutex_create_func((M), __FILE__, __LINE__, __STRING(M))
+#define mutex_create(M)	mutex_create_func((M), __FILE__, __LINE__, #M)
 /*===================*/
 /**********************************************************************
 Creates, or rather, initializes a mutex object in a specified memory