1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release

Browse Source 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
This commit is contained in:
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se 2006-10-21 01:13:50 +02:00
commit f97fe50dbb
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mysql.h
View File

@ -293,12 +293,6 @@ typedef struct st_mysql
/* needed for embedded server - no net buffer to store the 'info' */ /* needed for embedded server - no net buffer to store the 'info' */
char *info_buffer; char *info_buffer;
#endif #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; } MYSQL;
typedef struct st_mysql_res { typedef struct st_mysql_res {

1
libmysqld/lib_sql.cc
View File

@ -100,7 +100,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
mysql->affected_rows= ~(my_ulonglong) 0; mysql->affected_rows= ~(my_ulonglong) 0;
mysql->field_count= 0; mysql->field_count= 0;
net->last_errno= 0; net->last_errno= 0;
mysql->current_stmt= stmt;
thd->store_globals(); // Fix if more than one connect thd->store_globals(); // Fix if more than one connect
/* /*

15
scripts/make_win_bin_dist
View File

@ -144,8 +144,6 @@ fi
# Copy data directory, readme files etc # Copy data directory, readme files etc
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
cp COPYING EXCEPTIONS-CLIENT $DESTDIR/
# FIXME is there ever a data directory to copy? # FIXME is there ever a data directory to copy?
if [ -d win/data ] ; then if [ -d win/data ] ; then
cp -pR win/data $DESTDIR/data cp -pR win/data $DESTDIR/data
@ -159,9 +157,13 @@ mkdir $DESTDIR/Docs
cp Docs/INSTALL-BINARY $DESTDIR/Docs/ cp Docs/INSTALL-BINARY $DESTDIR/Docs/
cp Docs/manual.chm $DESTDIR/Docs/ || /bin/true cp Docs/manual.chm $DESTDIR/Docs/ || /bin/true
cp ChangeLog $DESTDIR/Docs/ || /bin/true cp ChangeLog $DESTDIR/Docs/ || /bin/true
cp COPYING $DESTDIR/Docs/
cp support-files/my-*.ini $DESTDIR/ 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 # 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. # 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() copy_embedded()
{ {
mkdir -p $DESTDIR/Embedded/DLL/release \ mkdir -p $DESTDIR/Embedded/DLL/release \
$DESTDIR/Embedded/static/release $DESTDIR/Embedded/static/release \
$DESTDIR/include
cp libmysqld/libmysqld.def $DESTDIR/include/ cp libmysqld/libmysqld.def $DESTDIR/include/
cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/ cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/
cp libmysqld/$TARGET/libmysqld.dll $DESTDIR/Embedded/DLL/release/ cp libmysqld/$TARGET/libmysqld.dll $DESTDIR/Embedded/DLL/release/
@ -211,6 +214,9 @@ fi
mkdir -p $DESTDIR/examples/tests mkdir -p $DESTDIR/examples/tests
cp tests/*.res tests/*.tst tests/*.pl tests/*.c $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"?! # FIXME why not copy it all in "include"?!
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@ -228,6 +234,7 @@ cp include/conf*.h \
include/m_string.h \ include/m_string.h \
include/m_ctype.h \ include/m_ctype.h \
include/my_global.h \ include/my_global.h \
include/raid.h \
include/typelib.h $DESTDIR/include/ include/typelib.h $DESTDIR/include/
cp libmysql/libmysql.def $DESTDIR/include/ cp libmysql/libmysql.def $DESTDIR/include/