Commit 133e91aa authored by unknown's avatar unknown
Browse files

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

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
parents ab133655 71fee03e

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -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 ?

include/mysql.h

+0 −6
Original line number Diff line number Diff line
@@ -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 {

libmysqld/lib_sql.cc

+0 −1
Original line number Diff line number Diff line
@@ -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

  /*

scripts/make_win_bin_dist

+11 −4
Original line number Diff line number Diff line
@@ -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/

CMakeLists.txt

+2 −2

File changed.

Contains only whitespace changes.