bk commit into 5.0 tree (kostja:1.2444)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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@stripped, 2007-03-08 12:04:45+03:00, kostja@stripped +2 -0
  Fix -ansi -pedantic warning (can't cast a pointer to function 
  to a pointer to object, that is, int foo(); void *bar= (void*) foo
  is not allowed.

  sql/lex.h@stripped, 2007-03-08 12:04:41+03:00, kostja@stripped +2 -2
    Fix -ansi -pedantic warning.

  sql/lex_symbol.h@stripped, 2007-03-08 12:04:41+03:00, kostja@stripped +1 -1
    Fix -ansi -pedantic warning.

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.0-runtime

--- 1.145/sql/lex.h	2006-12-23 22:04:25 +03:00
+++ 1.146/sql/lex.h	2007-03-08 12:04:41 +03:00
@@ -32,10 +32,10 @@
 #define SYM(A) SYM_OR_NULL(A),0,0,&sym_group_common
 #define F_SYM(A) SYM_OR_NULL(A)
 
-#define CREATE_FUNC(A) (void *)(SYM_OR_NULL(A)), &sym_group_common
+#define CREATE_FUNC(A) (void (*)())(SYM_OR_NULL(A)), &sym_group_common
 
 #ifdef HAVE_SPATIAL
-#define CREATE_FUNC_GEOM(A) (void *)(SYM_OR_NULL(A)), &sym_group_geom
+#define CREATE_FUNC_GEOM(A) (void (*)())(SYM_OR_NULL(A)), &sym_group_geom
 #else
 #define CREATE_FUNC_GEOM(A) 0, &sym_group_geom
 #endif

--- 1.9/sql/lex_symbol.h	2006-12-30 23:02:07 +03:00
+++ 1.10/sql/lex_symbol.h	2007-03-08 12:04:41 +03:00
@@ -25,7 +25,7 @@
   const char *name;
   uint	tok;
   uint length;
-  void *create_func;
+  void (*create_func)();
   struct st_sym_group *group;
 } SYMBOL;