diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp index 157c576b187..1f76ea3be92 100644 --- a/VC++Files/client/mysqlclient.dsp +++ b/VC++Files/client/mysqlclient.dsp @@ -330,6 +330,10 @@ SOURCE=..\mysys\my_alloc.c # End Source File # Begin Source File +SOURCE=..\mysys\my_chsize.c +# End Source File +# Begin Source File + SOURCE=..\mysys\my_compress.c # ADD CPP /I "../zlib" # End Source File diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index 34c479c73b4..b94aaf07bed 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -303,6 +303,10 @@ SOURCE=..\mysys\my_alloc.c # End Source File # Begin Source File +SOURCE=..\mysys\my_chsize.c +# End Source File +# Begin Source File + SOURCE=..\mysys\my_compress.c # End Source File # Begin Source File @@ -387,6 +391,10 @@ SOURCE=..\mysys\my_rename.c # End Source File # Begin Source File +SOURCE=..\mysys\my_seek.c +# End Source File +# Begin Source File + SOURCE=..\mysys\my_static.c # End Source File # Begin Source File diff --git a/client/mysql.cc b/client/mysql.cc index c3e79384938..9cdc270e8ed 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2244,7 +2244,6 @@ print_warnings() char query[30]; MYSQL_RES *result; MYSQL_ROW cur; - MYSQL_FIELD *field; /* Get the warnings */ strmov(query,"show warnings"); diff --git a/mysys/default.c b/mysys/default.c index a9f3f4092ef..e28161ba7b0 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -851,10 +851,13 @@ static void init_default_directories() if (GetWindowsDirectory(system_dir,sizeof(system_dir))) *ptr++= &system_dir; +#if defined(_MSC_VER) && (_MSC_VER >= 1300) + /* Only VC7 and up */ /* Only add shared system directory if different from default. */ if (GetSystemWindowsDirectory(shared_system_dir,sizeof(shared_system_dir)) && strcmp(system_dir, shared_system_dir)) *ptr++= &shared_system_dir; +#endif #elif defined(__NETWARE__) *ptr++= "sys:/etc/"; diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index d273e67ec01..ecfe9e8be88 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -315,7 +315,7 @@ system=`echo $system | sed -e 's/solaris2.\([0-9]*\)/solaris\1/g'` system=`echo $system | sed -e 's/sco3.2v\(.*\)/openserver\1/g'` # Use the override --machine if present -if [ -n $MACHINE ] ; then +if [ -n "$MACHINE" ] ; then machine=$MACHINE fi diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 8fdf23f3119..6165a31fac2 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -199,11 +199,10 @@ copy_dir_files() print_debug "Creating directory '$arg'" mkdir $BASE/$arg fi - for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp \ - README INSTALL* LICENSE *.inc *.test *.result \ - *.pem Moscow_leap des_key_file *.dat *.000001 \ - *.require *.opt - + for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp *.dsw \ + README INSTALL* LICENSE AUTHORS NEWS ChangeLog \ + *.inc *.test *.result *.pem Moscow_leap des_key_file \ + *.dat *.000001 *.require *.opt do if [ -f $i ] then @@ -234,6 +233,7 @@ copy_dir_dirs() { find $arg -type d \ -and -not -path \*SCCS\* \ -and -not -path \*.deps\* \ + -and -not -path \*.libs\* \ -and -not -path \*autom4te.cache -print )|( while read v @@ -266,7 +266,7 @@ make -C $SOURCE/ndb windoze # Input directories to be copied recursively # -for i in bdb innobase ndb +for i in bdb innobase ndb extra/yassl do copy_dir_dirs $i done @@ -328,6 +328,8 @@ do $CP -R $i $BASE/$i fi fi + # But remove object files from destination + find $BASE/$i -type f -name \*.o | xargs rm -f done # diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc index 347f435bbc1..77c26fd28de 100644 --- a/server-tools/instance-manager/commands.cc +++ b/server-tools/instance-manager/commands.cc @@ -573,9 +573,9 @@ int Show_instance_log_files::execute(struct st_net *net, ulong connection_id) const char *value; } logs[]= { - {"ERROR LOG", instance->options.logs[LOG_ERROR]}, - {"GENERAL LOG", instance->options.logs[LOG_GENERAL]}, - {"SLOW LOG", instance->options.logs[LOG_SLOW]}, + {"ERROR LOG", instance->options.logs[IM_LOG_ERROR]}, + {"GENERAL LOG", instance->options.logs[IM_LOG_GENERAL]}, + {"SLOW LOG", instance->options.logs[IM_LOG_SLOW]}, {NULL, NULL} }; struct log_files_st *log_files; diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index b2602af6066..c8288c35a6f 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -111,9 +111,9 @@ int Instance_options::fill_log_options() const char *default_suffix; } logs_st[]= { - {"--log-error", 11, &(logs[LOG_ERROR]), ".err"}, - {"--log", 5, &(logs[LOG_GENERAL]), ".log"}, - {"--log-slow-queries", 18, &(logs[LOG_SLOW]), "-slow.log"}, + {"--log-error", 11, &(logs[IM_LOG_ERROR]), ".err"}, + {"--log", 5, &(logs[IM_LOG_GENERAL]), ".log"}, + {"--log-slow-queries", 18, &(logs[IM_LOG_SLOW]), "-slow.log"}, {NULL, 0, NULL, NULL} }; struct log_files_st *log_files; diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc index fae69375b61..ed3bfd6bba0 100644 --- a/server-tools/instance-manager/parse.cc +++ b/server-tools/instance-manager/parse.cc @@ -262,13 +262,13 @@ Command *parse_command(Command_factory *factory, const char *text) /* define a log type */ switch (tok3) { case TOK_ERROR: - log_type= LOG_ERROR; + log_type= IM_LOG_ERROR; break; case TOK_GENERAL: - log_type= LOG_GENERAL; + log_type= IM_LOG_GENERAL; break; case TOK_SLOW: - log_type= LOG_SLOW; + log_type= IM_LOG_SLOW; break; default: goto syntax_error; diff --git a/server-tools/instance-manager/parse.h b/server-tools/instance-manager/parse.h index 0cfa33723c9..7d13691e7eb 100644 --- a/server-tools/instance-manager/parse.h +++ b/server-tools/instance-manager/parse.h @@ -24,9 +24,9 @@ class Command_factory; enum Log_type { - LOG_ERROR= 0, - LOG_GENERAL, - LOG_SLOW + IM_LOG_ERROR= 0, + IM_LOG_GENERAL, + IM_LOG_SLOW }; Command *parse_command(Command_factory *factory, const char *text);