Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani 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
1.1895 05/04/21 01:33:45 jani@stripped +11 -0
Local changes for Netware 5.0.4a.
sql/mysqld.cc
1.453 05/04/21 01:32:39 jani@stripped +4 -0
Local changes for Netware 5.0.4a.
sql/log.cc
1.160 05/04/21 01:32:39 jani@stripped +6 -0
Local changes for Netware 5.0.4a.
scripts/make_binary_distribution.sh
1.80 05/04/21 01:32:38 jani@stripped +5 -2
Local changes for Netware 5.0.4a.
netware/mysqld_safe.c
1.8 05/04/21 01:32:38 jani@stripped +0 -2
Local changes for Netware 5.0.4a.
netware/mysql_test_run.c
1.11 05/04/21 01:32:38 jani@stripped +2 -0
Local changes for Netware 5.0.4a.
netware/BUILD/mwenv
1.10 05/04/21 01:32:38 jani@stripped +3 -3
Local changes for Netware 5.0.4a.
netware/BUILD/compile-netware-END
1.6 05/04/21 01:32:38 jani@stripped +5 -0
Local changes for Netware 5.0.4a.
netware/BUILD/compile-linux-tools
1.8 05/04/21 01:32:38 jani@stripped +6 -0
Local changes for Netware 5.0.4a.
mysys/default.c
1.60 05/04/21 01:32:38 jani@stripped +107 -316
Local changes for Netware 5.0.4a.
include/my_sys.h
1.149 05/04/21 01:32:38 jani@stripped +3 -0
Local changes for Netware 5.0.4a.
configure.in
1.283 05/04/21 01:32:38 jani@stripped +1 -1
Local changes for Netware 5.0.4a.
# 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: jani
# Host: a193-229-222-105.elisa-laajakaista.fi
# Root: /home/jani/mydev/mysql-5.0.4-build-dev
--- 1.282/configure.in Thu Apr 7 15:36:55 2005
+++ 1.283/configure.in Thu Apr 21 01:32:38 2005
@@ -6,7 +6,7 @@
AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# Don't forget to also update the NDB lines below.
-AM_INIT_AUTOMAKE(mysql, 5.0.4-beta)
+AM_INIT_AUTOMAKE(mysql, 5.0.4a-beta)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
--- 1.148/include/my_sys.h Tue Apr 5 14:17:39 2005
+++ 1.149/include/my_sys.h Thu Apr 21 01:32:38 2005
@@ -821,7 +821,10 @@
#define MAP_NOSYNC 0x0800
#define MAP_FAILED ((void *)-1)
#define MS_SYNC 0x0000
+
+#ifndef __NETWARE__
#define HAVE_MMAP
+#endif
int my_getpagesize(void);
void *my_mmap(void *, size_t, int, int, int, my_off_t);
--- 1.59/mysys/default.c Wed Apr 6 17:22:16 2005
+++ 1.60/mysys/default.c Thu Apr 21 01:32:38 2005
@@ -37,9 +37,6 @@
#include "m_string.h"
#include "m_ctype.h"
#include <my_dir.h>
-#ifdef __WIN__
-#include <winbase.h>
-#endif
char *defaults_extra_file=0;
@@ -47,6 +44,7 @@
#define MAX_DEFAULT_DIRS 4
const char *default_directories[MAX_DEFAULT_DIRS + 1];
+
#ifdef __WIN__
static const char *f_extensions[]= { ".ini", ".cnf", 0 };
@@ -54,172 +52,18 @@
static const char *f_extensions[]= { ".cnf", 0 };
#endif
-/*
- This structure defines the context that we pass to callback
- function 'handle_default_option' used in search_default_file
- to process each option. This context is used if search_default_file
- was called from load_defaults.
-*/
+static int search_default_file(DYNAMIC_ARRAY *args,MEM_ROOT *alloc,
+ const char *dir, const char *config_file,
+ TYPELIB *group);
-struct handle_option_ctx
-{
- MEM_ROOT *alloc;
- DYNAMIC_ARRAY *args;
- TYPELIB *group;
-};
-
-static int search_default_file(Process_option_func func, void *func_ctx,
- const char *dir, const char *config_file);
-static int search_default_file_with_ext(Process_option_func func,
- void *func_ctx,
+static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
const char *dir, const char *ext,
- const char *config_file, int recursion_level);
+ const char *config_file,
+ TYPELIB *group);
static void init_default_directories();
-
static char *remove_end_comment(char *ptr);
-/*
- Process config files in default directories.
-
- SYNOPSIS
- my_search_option_files()
- conf_file Basename for configuration file to search for.
- If this is a path, then only this file is read.
- argc Pointer to argc of original program
- argv Pointer to argv of original program
- args_used Pointer to variable for storing the number of
- arguments used.
- func Pointer to the function to process options
- func_ctx It's context. Usually it is the structure to
- store additional options.
- DESCRIPTION
-
- This function looks for config files in default directories. Then it
- travesrses each of the files and calls func to process each option.
-
- RETURN
- 0 ok
- 1 given cinf_file doesn't exist
-*/
-
-int my_search_option_files(const char *conf_file, int *argc, char ***argv,
- uint *args_used, Process_option_func func,
- void *func_ctx)
-{
- const char **dirs, *forced_default_file;
- int error= 0;
- DBUG_ENTER("my_search_option_files");
-
- /* Check if we want to force the use a specific default file */
- get_defaults_files(*argc, *argv,
- (char **)&forced_default_file, &defaults_extra_file);
- if (forced_default_file)
- forced_default_file= strchr(forced_default_file,'=')+1;
- if (defaults_extra_file)
- defaults_extra_file= strchr(defaults_extra_file,'=')+1;
-
- (*args_used)+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0);
-
- if (forced_default_file)
- {
- if ((error= search_default_file_with_ext(func, func_ctx, "", "",
- forced_default_file, 0)) < 0)
- goto err;
- if (error > 0)
- {
- fprintf(stderr, "Could not open required defaults file: %s\n",
- forced_default_file);
- goto err;
- }
- }
- else if (dirname_length(conf_file))
- {
- if ((error= search_default_file(func, func_ctx, NullS, conf_file)) < 0)
- goto err;
- }
- else
- {
-#ifdef __WIN__
- char system_dir[FN_REFLEN];
- GetWindowsDirectory(system_dir,sizeof(system_dir));
- if ((search_default_file(func, func_ctx, system_dir, conf_file)))
- goto err;
-#endif
-#if defined(__EMX__) || defined(OS2)
- {
- const char *etc;
- if ((etc= getenv("ETC")) &&
- (search_default_file(func, func_ctx, etc, conf_file)) < 0)
- goto err;
- }
-#endif
- for (dirs= default_directories ; *dirs; dirs++)
- {
- if (**dirs)
- {
- if (search_default_file(func, func_ctx, *dirs, conf_file) < 0)
- goto err;
- }
- else if (defaults_extra_file)
- {
- if (search_default_file(func, func_ctx, NullS,
- defaults_extra_file) < 0)
- goto err; /* Fatal error */
-
- }
- }
- }
-
- DBUG_RETURN(error);
-
-err:
- fprintf(stderr,"Fatal error in defaults handling. Program aborted\n");
- exit(1);
- return 0; /* Keep compiler happy */
-}
-
-
-/*
- The option handler for load_defaults.
-
- SYNOPSIS
- handle_deault_option()
- in_ctx Handler context. In this case it is a
- handle_option_ctx structure.
- group_name The name of the group the option belongs to.
- option The very option to be processed. It is already
- prepared to be used in argv (has -- prefix)
-
- DESCRIPTION
- This handler checks whether a group is one of the listed and adds an option
- to the array if yes. Some other handler can record, for instance, all
- groups and their options, not knowing in advance the names and amount of
- groups.
-
- RETURN
- 0 - ok
- 1 - error occured
-*/
-
-static int handle_default_option(void *in_ctx, const char *group_name,
- const char *option)
-{
- char *tmp;
- struct handle_option_ctx *ctx= (struct handle_option_ctx *) in_ctx;
-
- if (find_type((char *)group_name, ctx->group, 3))
- {
- if (!(tmp= alloc_root(ctx->alloc, (uint) strlen(option) + 1)))
- return 1;
- if (insert_dynamic(ctx->args, (gptr) &tmp))
- return 1;
- strmov(tmp, option);
- }
-
- return 0;
-}
-
/*
Gets --defaults-file and --defaults-extra-file options from command line.
@@ -279,6 +123,7 @@
RETURN
0 ok
1 The given conf_file didn't exists
+ 2 The given conf_file was not a normal readable file
*/
@@ -286,15 +131,15 @@
int *argc, char ***argv)
{
DYNAMIC_ARRAY args;
+ const char **dirs, *forced_default_file;
TYPELIB group;
my_bool found_print_defaults=0;
uint args_used=0;
int error= 0;
MEM_ROOT alloc;
- char *ptr,**res;
- struct handle_option_ctx ctx;
- DBUG_ENTER("load_defaults");
+ char *ptr, **res;
+ DBUG_ENTER("load_defaults");
init_default_directories();
init_alloc_root(&alloc,512,0);
if (*argc >= 2 && !strcmp(argv[0][1],"--no-defaults"))
@@ -315,22 +160,75 @@
DBUG_RETURN(0);
}
+ get_defaults_files(*argc, *argv,
+ (char **)&forced_default_file, &defaults_extra_file);
+ if (forced_default_file)
+ forced_default_file= strchr(forced_default_file,'=')+1;
+ if (defaults_extra_file)
+ defaults_extra_file= strchr(defaults_extra_file,'=')+1;
+
+ args_used+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0);
+
group.count=0;
group.name= "defaults";
group.type_names= groups;
-
for (; *groups ; groups++)
group.count++;
if (my_init_dynamic_array(&args, sizeof(char*),*argc, 32))
goto err;
-
- ctx.alloc= &alloc;
- ctx.args= &args;
- ctx.group= &group;
-
- error= my_search_option_files(conf_file, argc, argv, &args_used,
- handle_default_option, (void *) &ctx);
+ if (forced_default_file)
+ {
+ if ((error= search_default_file_with_ext(&args, &alloc, "", "",
+ forced_default_file,
+ &group)) < 0)
+ goto err;
+ if (error > 0)
+ {
+ fprintf(stderr, "Could not open required defaults file: %s\n",
+ forced_default_file);
+ goto err;
+ }
+ }
+ else if (dirname_length(conf_file))
+ {
+ if ((error= search_default_file(&args, &alloc, NullS, conf_file,
+ &group)) < 0)
+ goto err;
+ }
+ else
+ {
+#ifdef __WIN__
+ char system_dir[FN_REFLEN];
+ GetWindowsDirectory(system_dir,sizeof(system_dir));
+ if ((search_default_file(&args, &alloc, system_dir, conf_file, &group)))
+ goto err;
+#endif
+#if defined(__EMX__) || defined(OS2)
+ {
+ const char *etc;
+ if ((etc= getenv("ETC")) &&
+ (search_default_file(&args, &alloc, etc, conf_file,
+ &group)) < 0)
+ goto err;
+ }
+#endif
+ for (dirs=default_directories ; *dirs; dirs++)
+ {
+ if (**dirs)
+ {
+ if (search_default_file(&args, &alloc, *dirs, conf_file,
+ &group) < 0)
+ goto err;
+ }
+ else if (defaults_extra_file)
+ {
+ if (search_default_file(&args, &alloc, NullS, defaults_extra_file,
+ &group) < 0)
+ goto err; /* Fatal error */
+ }
+ }
+ }
/*
Here error contains <> 0 only if we have a fully specified conf_file
or a forced default file
@@ -390,19 +288,17 @@
}
-static int search_default_file(Process_option_func opt_handler,
- void *handler_ctx,
+static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
const char *dir,
- const char *config_file)
+ const char *config_file, TYPELIB *group)
{
char **ext;
for (ext= (char**) f_extensions; *ext; *ext++)
{
int error;
- if ((error= search_default_file_with_ext(opt_handler, handler_ctx,
- dir, *ext,
- config_file, 0)) < 0)
+ if ((error= search_default_file_with_ext(args, alloc, dir, *ext,
+ config_file, group)) < 0)
return error;
}
return 0;
@@ -411,44 +307,32 @@
/*
Open a configuration file (if exists) and read given options from it
-
+
SYNOPSIS
search_default_file_with_ext()
- opt_handler Option handler function. It is used to process
- every separate option.
- handler_ctx Pointer to the structure to store actual
- parameters of the function.
+ args Store pointer to found options here
+ alloc Allocate strings in this object
dir directory to read
+ config_file Name of configuration file
ext Extension for configuration file
- config_file Name of configuration file
group groups to read
- recursion_level the level of recursion, got while processing
- "!include" or "!includedir"
RETURN
0 Success
-1 Fatal error, abort
1 File not found (Warning)
+ 2 File is not a regular file (Warning)
*/
-static int search_default_file_with_ext(Process_option_func opt_handler,
- void *handler_ctx,
- const char *dir,
- const char *ext,
- const char *config_file,
- int recursion_level)
+static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
+ const char *dir, const char *ext,
+ const char *config_file,
+ TYPELIB *group)
{
- char name[FN_REFLEN + 10], buff[4096], curr_gr[4096], *ptr, *end, **tmp_ext;
- char *value, option[4096], tmp[FN_REFLEN];
- static const char includedir_keyword[]= "includedir";
- static const char include_keyword[]= "include";
- const int max_recursion_level= 10;
+ char name[FN_REFLEN+10],buff[4096],*ptr,*end,*value,*tmp;
FILE *fp;
uint line=0;
- my_bool found_group=0;
- uint i;
- MY_DIR *search_dir;
- FILEINFO *search_file;
+ my_bool read_values=0,found_group=0;
if ((dir ? strlen(dir) : 0 )+strlen(config_file) >= FN_REFLEN-3)
return 0; /* Ignore wrong paths */
@@ -477,117 +361,22 @@
if ((stat_info.st_mode & S_IWOTH) &&
(stat_info.st_mode & S_IFMT) == S_IFREG)
{
- fprintf(stderr, "Warning: World-writable config file '%s' is ignored\n",
+ fprintf(stderr, "warning: World-writeable config file %s is ignored\n",
name);
return 0;
}
}
#endif
- if (!(fp= my_fopen(name, O_RDONLY, MYF(0))))
+ if (!(fp = my_fopen(fn_format(name,name,"","",4),O_RDONLY,MYF(0))))
return 0; /* Ignore wrong files */
- while (fgets(buff, sizeof(buff) - 1, fp))
+ while (fgets(buff,sizeof(buff)-1,fp))
{
line++;
/* Ignore comment and empty lines */
- for (ptr= buff; my_isspace(&my_charset_latin1, *ptr); ptr++)
- {}
-
+ for (ptr=buff ; my_isspace(&my_charset_latin1,*ptr) ; ptr++ ) ;
if (*ptr == '#' || *ptr == ';' || !*ptr)
continue;
-
- /* Configuration File Directives */
- if ((*ptr == '!') && (recursion_level < max_recursion_level))
- {
- /* skip over `!' and following whitespace */
- for (++ptr; my_isspace(&my_charset_latin1, ptr[0]); ptr++)
- {}
-
- if ((!strncmp(ptr, includedir_keyword, sizeof(includedir_keyword) - 1))
- && my_isspace(&my_charset_latin1, ptr[sizeof(includedir_keyword) - 1]))
- {
- /* skip over "includedir" and following whitespace */
- for (ptr+= sizeof(includedir_keyword) - 1;
- my_isspace(&my_charset_latin1, ptr[0]); ptr++)
- {}
-
- /* trim trailing whitespace from directory name */
- end= ptr + strlen(ptr) - 1;
- /*
- This would work fine even if no whitespaces are met
- since fgets() stores the newline character in the buffer
- */
- for (; my_isspace(&my_charset_latin1, *(end - 1)); end--)
- {}
- end[0]= 0;
-
- /* print error msg if there is nothing after !inludedir directive */
- if (end == ptr)
- {
- fprintf(stderr,
- "error: Wrong !includedir directive in config "
- "file: %s at line %d\n",
- name,line);
- goto err;
- }
-
- if (!(search_dir= my_dir(ptr, MYF(MY_WME))))
- goto err;
-
- for (i= 0; i < (uint) search_dir->number_off_files; i++)
- {
- search_file= search_dir->dir_entry + i;
- ext= fn_ext(search_file->name);
-
- /* check extenstion */
- for (tmp_ext= (char**) f_extensions; *tmp_ext; *tmp_ext++)
- {
- if (!strcmp(ext, *tmp_ext))
- break;
- }
-
- if (*tmp_ext)
- {
- fn_format(tmp, search_file->name, ptr, "",
- MY_UNPACK_FILENAME | MY_SAFE_PATH);
-
- search_default_file_with_ext(opt_handler, handler_ctx, "", "", tmp,
- recursion_level + 1);
- }
- }
-
- my_dirend(search_dir);
- }
- else if ((!strncmp(ptr, include_keyword, sizeof(include_keyword) - 1))
- && my_isspace(&my_charset_latin1, ptr[sizeof(include_keyword) - 1]))
- {
- /* skip over `include' and following whitespace */
- for (ptr+= sizeof(include_keyword) - 1;
- my_isspace(&my_charset_latin1, ptr[0]); ptr++)
- {}
-
- /* trim trailing whitespace from filename */
- end= ptr + strlen(ptr) - 1;
- for (; my_isspace(&my_charset_latin1, *(end - 1)) ; end--)
- {}
- end[0]= 0;
-
- if (end == ptr)
- {
- fprintf(stderr,
- "error: Wrong !include directive in config "
- "file: %s at line %d\n",
- name,line);
- goto err;
- }
-
- search_default_file_with_ext(opt_handler, handler_ctx, "", "", ptr,
- recursion_level + 1);
- }
-
- continue;
- }
-
if (*ptr == '[') /* Group name */
{
found_group=1;
@@ -600,8 +389,7 @@
}
for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ;/* Remove end space */
end[0]=0;
-
- strnmov(curr_gr, ptr, min((uint) (end-ptr)+1, 4096));
+ read_values=find_type(ptr,group,3) > 0;
continue;
}
if (!found_group)
@@ -611,17 +399,19 @@
name,line);
goto err;
}
-
-
+ if (!read_values)
+ continue;
end= remove_end_comment(ptr);
if ((value= strchr(ptr, '=')))
end= value; /* Option without argument */
for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ;
if (!value)
{
- strmake(strmov(option,"--"),ptr,(uint) (end-ptr));
- if (opt_handler(handler_ctx, curr_gr, option))
- goto err;
+ if (!(tmp=alloc_root(alloc,(uint) (end-ptr)+3)))
+ goto err;
+ strmake(strmov(tmp,"--"),ptr,(uint) (end-ptr));
+ if (insert_dynamic(args,(gptr) &tmp))
+ goto err;
}
else
{
@@ -643,7 +433,12 @@
value++;
value_end--;
}
- ptr=strnmov(strmov(option,"--"),ptr,(uint) (end-ptr));
+ if (!(tmp=alloc_root(alloc,(uint) (end-ptr)+3 +
+ (uint) (value_end-value)+1)))
+ goto err;
+ if (insert_dynamic(args,(gptr) &tmp))
+ goto err;
+ ptr=strnmov(strmov(tmp,"--"),ptr,(uint) (end-ptr));
*ptr++= '=';
for ( ; value != value_end; value++)
@@ -685,8 +480,6 @@
*ptr++= *value;
}
*ptr=0;
- if (opt_handler(handler_ctx, curr_gr, option))
- goto err;
}
}
my_fclose(fp,MYF(0));
@@ -732,7 +525,6 @@
#endif
char name[FN_REFLEN], **ext;
const char **dirs;
-
init_default_directories();
puts("\nDefault options are read from the following files in the given order:");
@@ -794,9 +586,6 @@
--defaults-file=# Only read default options from the given file #\n\
--defaults-extra-file=# Read this file after the global files are read");
}
-
-#include <help_end.h>
-
static void init_default_directories()
{
const char *env, **ptr= default_directories;
@@ -816,3 +605,5 @@
#endif
*ptr= 0; /* end marker */
}
+
+#include <help_end.h>
--- 1.79/scripts/make_binary_distribution.sh Sat Apr 16 22:57:12 2005
+++ 1.80/scripts/make_binary_distribution.sh Thu Apr 21 01:32:38 2005
@@ -251,8 +251,11 @@
if [ $BASE_SYSTEM = "netware" ] ; then
echo "CREATE DATABASE mysql;" > $BASE/bin/init_db.sql
echo "CREATE DATABASE test;" >> $BASE/bin/init_db.sql
- sh ./scripts/mysql_create_system_tables.sh real >> $BASE/bin/init_db.sql
- sh ./scripts/mysql_create_system_tables.sh test > $BASE/bin/test_db.sql
+ sh ./scripts/mysql_create_system_tables.sh real "" "%" 0 >> $BASE/bin/init_db.sql
+
+ echo "CREATE DATABASE mysql;" > $BASE/bin/test_db.sql
+ echo "CREATE DATABASE test;" >> $BASE/bin/test_db.sql
+ sh ./scripts/mysql_create_system_tables.sh test "" "%" 0 >> $BASE/bin/test_db.sql
fi
#
--- 1.159/sql/log.cc Tue Apr 5 14:17:39 2005
+++ 1.160/sql/log.cc Thu Apr 21 01:32:39 2005
@@ -1312,7 +1312,9 @@
*/
if (prepared_xids)
{
+ #ifdef HAVE_MMAP
tc_log_page_waits++;
+ #endif
pthread_mutex_lock(&LOCK_prep_xids);
while (prepared_xids)
pthread_cond_wait(&COND_prep_xids, &LOCK_prep_xids);
@@ -2411,9 +2413,11 @@
static const char tc_log_magic[]={(char) 254, 0x23, 0x05, 0x74};
+#ifdef HAVE_MMAP
ulong opt_tc_log_size= TC_LOG_MIN_SIZE;
ulong tc_log_max_pages_used=0, tc_log_page_size=0,
tc_log_page_waits=0, tc_log_cur_pages_used=0;
+#endif
int TC_LOG_MMAP::open(const char *opt_name)
{
@@ -2575,7 +2579,9 @@
TODO perhaps, increase log size ?
let's check the behaviour of tc_log_page_waits first
*/
+ #ifdef HAVE_MMAP
tc_log_page_waits++;
+ #endif
pthread_cond_wait(&COND_pool, &LOCK_pool);
return 1; // always return 1
}
--- 1.452/sql/mysqld.cc Wed Apr 13 13:45:26 2005
+++ 1.453/sql/mysqld.cc Thu Apr 21 01:32:39 2005
@@ -4597,9 +4597,11 @@
"more than one storage engine, when binary log is disabled)",
(gptr*) &opt_tc_log_file, (gptr*) &opt_tc_log_file, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef HAVE_MMAP
{"log-tc-size", OPT_LOG_TC_SIZE, "Size of transaction coordinator log.",
(gptr*) &opt_tc_log_size, (gptr*) &opt_tc_log_size, 0, GET_ULONG,
REQUIRED_ARG, TC_LOG_MIN_SIZE, TC_LOG_MIN_SIZE, ~0L, 0, TC_LOG_PAGE_SIZE, 0},
+#endif
{"log-update", OPT_UPDATE_LOG,
"The update log is deprecated since version 5.0, is replaced by the binary \
log and this option justs turns on --log-bin instead.",
@@ -5736,9 +5738,11 @@
#endif /* HAVE_OPENSSL */
{"Table_locks_immediate", (char*) &locks_immediate, SHOW_LONG},
{"Table_locks_waited", (char*) &locks_waited, SHOW_LONG},
+#ifdef HAVE_MMAP
{"Tc_log_max_pages_used", (char*) &tc_log_max_pages_used, SHOW_LONG},
{"Tc_log_page_size", (char*) &tc_log_page_size, SHOW_LONG},
{"Tc_log_page_waits", (char*) &tc_log_page_waits, SHOW_LONG},
+#endif
{"Threads_cached", (char*) &cached_thread_count, SHOW_LONG_CONST},
{"Threads_connected", (char*) &thread_count, SHOW_INT_CONST},
{"Threads_created", (char*) &thread_created, SHOW_LONG_CONST},
--- 1.7/netware/BUILD/compile-linux-tools Sat Jan 1 21:53:37 2005
+++ 1.8/netware/BUILD/compile-linux-tools Thu Apr 21 01:32:38 2005
@@ -30,6 +30,10 @@
# build tools only
make clean all-local
+
+# Create mysql_version.h which was deleted my previous step
+./config.status include/mysql_version.h
+
(cd dbug; make libdbug.a)
(cd strings; make libmystrings.a)
(cd mysys; make libmysys.a)
@@ -56,3 +60,5 @@
cp sql/gen_lex_hash sql/gen_lex_hash.linux
cp strings/conf_to_src strings/conf_to_src.linux
+# Delete mysql_version.h
+rm -f include/mysql_version.h
--- 1.5/netware/BUILD/compile-netware-END Wed Apr 7 16:12:39 2004
+++ 1.6/netware/BUILD/compile-netware-END Thu Apr 21 01:32:38 2005
@@ -22,6 +22,11 @@
# run auto tools
. $path/compile-AUTOTOOLS
+# For NetWare there is no comp_err but comp_err.linux
+sed -e "s/comp_err/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$
+sed -e "s/replace comp_err.linux/replace comp_err/g" extra/Makefile.am.$$ > extra/Makefile.am
+rm extra/Makefile.am.$$
+
# configure
./configure $base_configs $extra_configs
--- 1.9/netware/BUILD/mwenv Thu Mar 10 02:53:11 2005
+++ 1.10/netware/BUILD/mwenv Thu Apr 21 01:32:38 2005
@@ -6,7 +6,7 @@
# the default is "F:/mydev"
export MYDEV="F:/mydev"
-export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV"
+export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/include;$MYDEV"
export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/openssl;$MYDEV/mysql-VERSION/netware/BUILD"
export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp"
@@ -19,9 +19,9 @@
export AR_FLAGS='-type library -o'
export AS='mwasmnlm'
export CC='mwccnlm -gccincludes'
-export CFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c'
+export CFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c'
export CXX='mwccnlm -gccincludes'
-export CXXFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
+export CXXFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
export LD='mwldnlm'
export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
export RANLIB=:
--- 1.10/netware/mysql_test_run.c Thu Feb 10 01:41:23 2005
+++ 1.11/netware/mysql_test_run.c Thu Apr 21 01:32:38 2005
@@ -1162,6 +1162,8 @@
setenv("MYSQL_TCP_PORT", "3306", 1);
snprintf(file_path, PATH_MAX*2, "%s/mysql_client_test --no-defaults --testcase--user=root --port=%u ", bin_dir, master_port);
setenv("MYSQL_CLIENT_TEST",file_path,1);
+ snprintf(file_path, PATH_MAX*2, "%s/mysql --no-defaults --user=root --port=%u ", bin_dir, master_port);
+ setenv("MYSQL",file_path,1);
}
/******************************************************************************
--- 1.7/netware/mysqld_safe.c Mon Jun 21 10:21:18 2004
+++ 1.8/netware/mysqld_safe.c Thu Apr 21 01:32:38 2005
@@ -666,7 +666,6 @@
if (!strnicmp(argv[i], private_options[j], strlen(private_options[j])))
{
skip= TRUE;
- consoleprintf("The argument skipped is %s\n", argv[i]);
break;
}
}
@@ -674,7 +673,6 @@
if (!skip)
{
add_arg(&al, "%s", argv[i]);
- consoleprintf("The final argument is %s\n", argv[i]);
}
}
// spawn
| Thread |
|---|
| • bk commit into 5.0 tree (jani:1.1895) | jani | 21 Apr |
