Merge bk-internal:/home/bk/mysql-5.0

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt

5 files changed, 15 insertions, 15 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8058f615f7c..1c858eebb92 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,10 +122,10 @@ ADD_SUBDIRECTORY(myisam)
 ADD_SUBDIRECTORY(myisammrg)
 ADD_SUBDIRECTORY(client)
 IF(WITH_BERKELEY_STORAGE_ENGINE)
-ADD_SUBDIRECTORY(bdb)
+  ADD_SUBDIRECTORY(bdb)
 ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
 IF(WITH_INNOBASE_STORAGE_ENGINE)
-ADD_SUBDIRECTORY(innobase)
+  ADD_SUBDIRECTORY(innobase)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 ADD_SUBDIRECTORY(sql)
 ADD_SUBDIRECTORY(sql/examples)
diff --git a/configure.in b/configure.in
index 55da1dfb241..18c08722fff 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.27)
+AM_INIT_AUTOMAKE(mysql, 5.0.28)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=27
+NDB_VERSION_BUILD=28
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
diff --git a/include/mysql.h b/include/mysql.h
index ae4a8222c5b..8ef3f1273ec 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -293,12 +293,6 @@ typedef struct st_mysql
   /* needed for embedded server - no net buffer to store the 'info' */
   char *info_buffer;
 #endif
-  /*
-    In embedded server it points to the statement that is processed
-    in the current query. We store some results directly in statement
-    fields then.
-  */
-  struct st_mysql_stmt *current_stmt;
 } MYSQL;
 
 typedef struct st_mysql_res {
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 40966be46a5..98c75dfe719 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -100,7 +100,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
   mysql->affected_rows= ~(my_ulonglong) 0;
   mysql->field_count= 0;
   net->last_errno= 0;
-  mysql->current_stmt= stmt;
 
   thd->store_globals();				// Fix if more than one connect
   /* 
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index cc75245e5d9..38e7ab88f22 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -144,8 +144,6 @@ fi
 # Copy data directory, readme files etc
 # ----------------------------------------------------------------------
 
-cp COPYING EXCEPTIONS-CLIENT $DESTDIR/
-
 # FIXME is there ever a data directory to copy?
 if [ -d win/data ] ; then
   cp -pR win/data $DESTDIR/data
@@ -159,9 +157,13 @@ mkdir $DESTDIR/Docs
 cp Docs/INSTALL-BINARY    $DESTDIR/Docs/
 cp Docs/manual.chm        $DESTDIR/Docs/ || /bin/true
 cp ChangeLog              $DESTDIR/Docs/ || /bin/true
-cp COPYING                $DESTDIR/Docs/
 cp support-files/my-*.ini $DESTDIR/
 
+if [ -f COPYING ] ; then
+  cp COPYING EXCEPTIONS-CLIENT $DESTDIR/
+  cp COPYING                   $DESTDIR/Docs/
+fi
+
 # ----------------------------------------------------------------------
 # These will be filled in when we enable embedded. Note that if no
 # argument is given, it is copied if exists, else a check is done.
@@ -170,7 +172,8 @@ cp support-files/my-*.ini $DESTDIR/
 copy_embedded()
 {
   mkdir -p $DESTDIR/Embedded/DLL/release \
-           $DESTDIR/Embedded/static/release
+           $DESTDIR/Embedded/static/release \
+           $DESTDIR/include
   cp libmysqld/libmysqld.def           $DESTDIR/include/
   cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/
   cp libmysqld/$TARGET/libmysqld.dll   $DESTDIR/Embedded/DLL/release/
@@ -211,6 +214,9 @@ fi
 mkdir -p $DESTDIR/examples/tests
 cp tests/*.res tests/*.tst tests/*.pl tests/*.c $DESTDIR/examples/tests/
 
+mkdir -p $DESTDIR/examples/udf_example
+cp sql/udf_example.def sql/udf_example.vcproj sql/udf_example.c $DESTDIR/examples/udf_example/
+
 # ----------------------------------------------------------------------
 # FIXME why not copy it all in "include"?!
 # ----------------------------------------------------------------------
@@ -228,6 +234,7 @@ cp include/conf*.h \
    include/m_string.h \
    include/m_ctype.h \
    include/my_global.h \
+   include/raid.h \
    include/typelib.h $DESTDIR/include/
 cp libmysql/libmysql.def $DESTDIR/include/