diff -ur porting_base.2.0/mysql/Makefile.in rebuild.2.0/mysql/Makefile.in --- porting_base.2.0/mysql/Makefile.in Thu Jun 3 11:54:43 2010 +++ rebuild.2.0/mysql/Makefile.in Tue Mar 8 12:59:53 2011 @@ -914,6 +914,11 @@ # will then calculate the various port numbers it needs from this, # making sure each user use different ports. +test-special: + cd mysql-test ; \ + @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed --notimer \ + --debug --retry=1 --do-test=$(MYSQL_TEST_CASE) + test-unit: cd unittest && $(MAKE) test @@ -927,11 +932,11 @@ test-pr: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol --mysqld=--binlog-format=row + @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol --mysqld=--binlog-format=row --notimer test-ns: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed + @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed --notimer test-binlog-statement: cd mysql-test ; \ diff -ur porting_base.2.0/mysql/client/Makefile.in rebuild.2.0/mysql/client/Makefile.in --- porting_base.2.0/mysql/client/Makefile.in Thu Jun 3 11:54:08 2010 +++ rebuild.2.0/mysql/client/Makefile.in Fri Jan 7 12:58:03 2011 @@ -500,7 +500,7 @@ mysql_SOURCES = mysql.cc readline.cc sql_string.cc \ completion_hash.cc -mysql_LDADD = @readline_link@ @TERMCAP_LIB@ \ +mysql_LDADD = @readline_link@ @TERMCAP_LIB@ /system/gnu_library/lib/libregex.a \ $(LDADD) $(CXXLDFLAGS) mysqladmin_SOURCES = mysqladmin.cc @@ -585,17 +585,17 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-binPROGRAMS: $(bin_PROGRAMS) +install-binPROGRAMS: @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ + @list='$(bin_PROGRAMS)'; if [ "${host_os}" = "vos" ]; then exe_dir="./.libs/"; else exe_dir=""; fi; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) $$exe_dir'$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) $$exe_dir"$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -956,13 +956,13 @@ for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: $(BUILT_SOURCES) +install: $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am -install-am: all-am +install-am: @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am Only in porting_base.2.0/mysql/client: my_user.c diff -ur porting_base.2.0/mysql/client/mysqlcheck.c rebuild.2.0/mysql/client/mysqlcheck.c --- porting_base.2.0/mysql/client/mysqlcheck.c Thu Jun 3 11:50:21 2010 +++ rebuild.2.0/mysql/client/mysqlcheck.c Mon Nov 8 13:30:06 2010 @@ -590,7 +590,11 @@ { char qbuf[100 + NAME_LEN*4]; int rc= 0; +#ifdef __VOS__ + if (strncmp(name, "=mysql50=", 9)) +#else if (strncmp(name, "#mysql50#", 9)) +#endif return 1; sprintf(qbuf, "RENAME TABLE `%s` TO `%s`", name, name + 9); if (mysql_query(sock, qbuf)) @@ -608,7 +612,11 @@ { char qbuf[100 + NAME_LEN*4]; int rc= 0; +#ifdef __VOS__ + if (strncmp(name, "=mysql50=", 9)) +#else if (strncmp(name, "#mysql50#", 9)) +#endif return 1; sprintf(qbuf, "ALTER DATABASE `%s` UPGRADE DATA DIRECTORY NAME", name); if (mysql_query(sock, qbuf)) @@ -627,7 +635,11 @@ if (what_to_do == DO_UPGRADE) { int rc= 0; +#ifdef __VOS__ + if (opt_fix_db_names && !strncmp(database,"=mysql50=", 9)) +#else if (opt_fix_db_names && !strncmp(database,"#mysql50#", 9)) +#endif { rc= fix_database_storage_name(database); database+= 9; diff -ur porting_base.2.0/mysql/cmd-line-utils/libedit/np/unvis.c rebuild.2.0/mysql/cmd-line-utils/libedit/np/unvis.c --- porting_base.2.0/mysql/cmd-line-utils/libedit/np/unvis.c Thu Jun 3 11:50:26 2010 +++ rebuild.2.0/mysql/cmd-line-utils/libedit/np/unvis.c Fri Apr 15 13:04:23 2011 @@ -67,7 +67,9 @@ #define S_HEX1 7 /* hex digit */ #define S_HEX2 8 /* hex digit 2 */ +#ifndef isoctal #define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#endif #define xtod(c) (isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10)) /* diff -ur porting_base.2.0/mysql/cmd-line-utils/libedit/np/vis.c rebuild.2.0/mysql/cmd-line-utils/libedit/np/vis.c --- porting_base.2.0/mysql/cmd-line-utils/libedit/np/vis.c Thu Jun 3 11:50:27 2010 +++ rebuild.2.0/mysql/cmd-line-utils/libedit/np/vis.c Fri Apr 15 13:04:23 2011 @@ -90,7 +90,9 @@ #undef BELL #define BELL '\a' +#ifndef isoctal #define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#endif #define iswhite(c) (c == ' ' || c == '\t' || c == '\n') #define issafe(c) (c == '\b' || c == BELL || c == '\r') #define xtoa(c) "0123456789abcdef"[c] diff -ur porting_base.2.0/mysql/cmd-line-utils/libedit/readline/readline.h rebuild.2.0/mysql/cmd-line-utils/libedit/readline/readline.h --- porting_base.2.0/mysql/cmd-line-utils/libedit/readline/readline.h Thu Jun 3 11:50:23 2010 +++ rebuild.2.0/mysql/cmd-line-utils/libedit/readline/readline.h Mon Nov 8 13:29:03 2010 @@ -66,7 +66,7 @@ #ifndef CTRL #include -#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__QNXNTO__) && !defined(__USLC__) +#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__QNXNTO__) && !defined(__USLC__) &&!defined(__VOS__) #include #endif #ifndef CTRL diff -ur porting_base.2.0/mysql/cmd-line-utils/libedit/tty.h rebuild.2.0/mysql/cmd-line-utils/libedit/tty.h --- porting_base.2.0/mysql/cmd-line-utils/libedit/tty.h Thu Jun 3 11:50:26 2010 +++ rebuild.2.0/mysql/cmd-line-utils/libedit/tty.h Mon Nov 8 13:29:05 2010 @@ -476,5 +476,8 @@ unsigned char t_vdisable; } el_tty_t; +#ifndef SIGWINCH +#define SIGWINCH SIGUSR1 +#endif #endif /* _h_el_tty */ diff -ur porting_base.2.0/mysql/config/ac-macros/ssl.m4 rebuild.2.0/mysql/config/ac-macros/ssl.m4 --- porting_base.2.0/mysql/config/ac-macros/ssl.m4 Thu Jun 3 11:50:25 2010 +++ rebuild.2.0/mysql/config/ac-macros/ssl.m4 Mon Nov 8 13:29:54 2010 @@ -102,7 +102,7 @@ # # Try to link with openSSL libs in # - openssl_libs="-L$location/lib/ -lssl -lcrypto" + openssl_libs="-L$location/lib/ -lssl -lcrypto -lz" MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) if test "$mysql_ssl_found" == "no" diff -ur porting_base.2.0/mysql/configure rebuild.2.0/mysql/configure --- porting_base.2.0/mysql/configure Thu Jun 3 11:54:47 2010 +++ rebuild.2.0/mysql/configure Fri Apr 15 13:04:40 2011 @@ -9641,6 +9641,20 @@ hardcode_shlibpath_var=no ;; + vos) + no_undefined_flag='${wl}-ztext' + allow_undefined_flag='${wl}-znodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath=$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-export-dynamic' + runpath_var='' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname=$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname=$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) ld_shlibs=no ;; @@ -10573,6 +10587,19 @@ shlibpath_var=LD_LIBRARY_PATH ;; +vos) + version_type=linux + hardcode_into_libs=yes + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=yes + shlibpath_var=LD_LIBRARY_PATH + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec='/lib /usr/lib' + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + *) dynamic_linker=no ;; @@ -16321,6 +16348,20 @@ esac ;; + vos) + no_undefined_flag_CXX='${wl}-ztext' + allow_undefined_flag_CXX='${wl}-znodefs' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath=$libdir' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-export-dynamic' + runpath_var='' + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname=$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname=$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + vxworks*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -17886,6 +17927,19 @@ shlibpath_var=LD_LIBRARY_PATH ;; +vos) + version_type=linux + hardcode_into_libs=yes + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=yes + shlibpath_var=LD_LIBRARY_PATH + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec='/lib /usr/lib' + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + *) dynamic_linker=no ;; @@ -19858,6 +19912,9 @@ *netware*) FIND_PROC= ;; + *stratus-vos*) + FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" + ;; *) { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&5 $as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&2;} @@ -23250,9 +23307,9 @@ fi if test "x$ac_cv_header_tcpd_h" = x""yes; then - LIBS="-lwrap $LIBS" - { $as_echo "$as_me:$LINENO: checking for TCP wrappers library -lwrap" >&5 -$as_echo_n "checking for TCP wrappers library -lwrap... " >&6; } +# LIBS="-lwrap $LIBS" +# { $as_echo "$as_me:$LINENO: checking for TCP wrappers library -lwrap" >&5 +#$as_echo_n "checking for TCP wrappers library -lwrap... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23306,10 +23363,11 @@ #define HAVE_LIBWRAP 1 _ACEOF - if test "$with_libwrap" != "yes"; then - WRAPLIBS="-L${with_libwrap}/lib" - fi - WRAPLIBS="${WRAPLIBS} -lwrap" +# if test "$with_libwrap" != "yes"; then +# WRAPLIBS="-L${with_libwrap}/lib" +# fi +# WRAPLIBS="${WRAPLIBS} -lwrap" + WRAPLIBS="" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -25309,6 +25367,11 @@ echo "done" ;; + *stratus-vos*) + { echo "$as_me:$LINENO: WARNING: Adding defines for Stratus VOS" >&5 +echo "$as_me: WARNING: Adding defines for Stratus VOS" >&2;} + FLAGS="-D_XOPEN_SOURCE=600 -D_SYSV -D_VOS_EXTENDED_NAMES -D__VOS_EXTENDED_PASSWD" + ;; esac @@ -27204,6 +27267,11 @@ { $as_echo "$as_me:$LINENO: result: \"-export-dynamic\"" >&5 $as_echo "\"-export-dynamic\"" >&6; } ;; + *vos*) + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + { $as_echo "$as_me:$LINENO: result: \"-Wl,--export-dynamic\"" >&5 +$as_echo "\"-Wl,--export-dynamic\"" >&6; } + ;; *) { $as_echo "$as_me:$LINENO: result: \"none\"" >&5 $as_echo "\"none\"" >&6; } @@ -38109,7 +38177,7 @@ for ac_func in alarm bcmp bfill bmove bsearch bzero \ - chsize cuserid fchmod fcntl \ + chsize chroot cuserid fchmod fcntl \ fconvert fdatasync fesetround finite fpresetsticky fpsetmask fsync ftruncate \ getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \ getpwuid getrlimit getrusage getwd index initgroups isnan \ @@ -38120,7 +38188,8 @@ pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \ pthread_key_delete pthread_rwlock_rdlock pthread_setprio \ pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \ - realpath rename rint rwlock_init setupterm \ + realpath rename rint rwlock_init \ + setegid seteuid setregid setreuid setupterm \ shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \ sighold sigset sigthreadmask port_create sleep \ snprintf socket stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr \ @@ -40190,7 +40259,7 @@ # # Try to link with openSSL libs in # - openssl_libs="-L$location/lib/ -lssl -lcrypto" + openssl_libs="-L$location/lib/ -lssl -lcrypto -lz" ssl_incs="$openssl_includes" ssl_libs="$openssl_libs" diff -ur porting_base.2.0/mysql/configure.in rebuild.2.0/mysql/configure.in --- porting_base.2.0/mysql/configure.in Thu Jun 3 11:50:10 2010 +++ rebuild.2.0/mysql/configure.in Mon Nov 8 13:30:07 2010 @@ -522,6 +522,9 @@ *netware*) FIND_PROC= ;; + *stratus-vos*) + FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" + ;; *) AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual.]) esac @@ -1264,6 +1267,10 @@ echo "done" ;; + *stratus-vos*) + AC_MSG_WARN([Adding defines for Stratus VOS]) + FLAGS="-D_XOPEN_SOURCE=600 -D_SYSV -D_VOS_EXTENDED_NAMES -D__VOS_EXTENDED_PASSWD" + ;; esac @@ -2103,7 +2110,7 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS(alarm bcmp bfill bmove bsearch bzero \ - chsize cuserid fchmod fcntl \ + chroot chsize cuserid fchmod fcntl \ fconvert fdatasync fesetround finite fpresetsticky fpsetmask fsync ftruncate \ getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \ getpwuid getrlimit getrusage getwd index initgroups isnan \ @@ -2114,7 +2121,8 @@ pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \ pthread_key_delete pthread_rwlock_rdlock pthread_setprio \ pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \ - realpath rename rint rwlock_init setupterm \ + realpath rename rint rwlock_init \ + setegid seteuid setregid setreuid setupterm \ shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \ sighold sigset sigthreadmask port_create sleep \ snprintf socket stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr \ diff -ur porting_base.2.0/mysql/dbug/Makefile.am rebuild.2.0/mysql/dbug/Makefile.am --- porting_base.2.0/mysql/dbug/Makefile.am Thu Jun 3 11:50:19 2010 +++ rebuild.2.0/mysql/dbug/Makefile.am Mon Nov 8 13:05:13 2010 @@ -38,24 +38,24 @@ all: user.t user.ps user.t: user.r $(NROFF_INC) - -nroff -mm user.r > $@ + -nroff -mm $< > $@ -user.ps: user.r $(NROFF_INC) - -groff -mm user.r > $@ +user.ps: user.r $(NROFF_INC) + -groff -mm $< > $@ -output1.r: factorial +output1.r: factorial$(EXEEXT) ./factorial 1 2 3 4 5 | cat > $@ -output2.r: factorial +output2.r: factorial$(EXEEXT) ./factorial -\#t:o 2 3 | cat >$@ -output3.r: factorial +output3.r: factorial$(EXEEXT) ./factorial -\#d:t:o 3 | cat >$@ -output4.r: factorial +output4.r: factorial$(EXEEXT) ./factorial -\#d,result:o 4 | cat >$@ -output5.r: factorial +output5.r: factorial$(EXEEXT) ./factorial -\#d:f,factorial:F:L:o 3 | cat >$@ .c.r: @RM@ -f $@ diff -ur porting_base.2.0/mysql/dbug/Makefile.in rebuild.2.0/mysql/dbug/Makefile.in --- porting_base.2.0/mysql/dbug/Makefile.in Thu Jun 3 11:54:09 2010 +++ rebuild.2.0/mysql/dbug/Makefile.in Mon Nov 8 13:05:11 2010 @@ -442,18 +442,18 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj .r -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dbug/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu dbug/Makefile +#$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +# @for dep in $?; do \ +# case '$(am__configure_deps)' in \ +# *$$dep*) \ +# ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +# && { if test -f $@; then exit 0; else break; fi; }; \ +# exit 1;; \ +# esac; \ +# done; \ +# echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dbug/Makefile'; \ +# cd $(top_srcdir) && \ +# $(AUTOMAKE) --gnu dbug/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -467,11 +467,11 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-pkglibLIBRARIES: $(pkglib_LIBRARIES) +#$(top_srcdir)/configure: $(am__configure_deps) +# cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +#$(ACLOCAL_M4): $(am__aclocal_m4_deps) +# cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-pkglibLIBRARIES: @$(NORMAL_INSTALL) test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ @@ -642,7 +642,7 @@ install-data: install-data-am uninstall: uninstall-am -install-am: all-am +install-am: @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am @@ -741,24 +741,24 @@ all: user.t user.ps user.t: user.r $(NROFF_INC) - -nroff -mm user.r > $@ + -nroff -mm $< > $@ -user.ps: user.r $(NROFF_INC) - -groff -mm user.r > $@ +user.ps: user.r $(NROFF_INC) + -groff -mm $< > $@ -output1.r: factorial +output1.r: factorial$(EXEEXT) ./factorial 1 2 3 4 5 | cat > $@ -output2.r: factorial +output2.r: factorial$(EXEEXT) ./factorial -\#t:o 2 3 | cat >$@ -output3.r: factorial +output3.r: factorial$(EXEEXT) ./factorial -\#d:t:o 3 | cat >$@ -output4.r: factorial +output4.r: factorial$(EXEEXT) ./factorial -\#d,result:o 4 | cat >$@ -output5.r: factorial +output5.r: factorial$(EXEEXT) ./factorial -\#d:f,factorial:F:L:o 3 | cat >$@ .c.r: @RM@ -f $@ diff -ur porting_base.2.0/mysql/dbug/dbug_analyze.c rebuild.2.0/mysql/dbug/dbug_analyze.c --- porting_base.2.0/mysql/dbug/dbug_analyze.c Thu Jun 3 11:50:16 2010 +++ rebuild.2.0/mysql/dbug/dbug_analyze.c Mon Nov 8 13:05:11 2010 @@ -100,13 +100,13 @@ while(0) -struct stack_t { +struct dbug_stack_t { unsigned int pos; /* which function? */ unsigned long time; /* Time that this was entered */ unsigned long children; /* Time spent in called funcs */ }; -static struct stack_t fn_stack[STACKSIZ+1]; +static struct dbug_stack_t fn_stack[STACKSIZ+1]; static unsigned int stacktop = 0; /* Lowest stack position is a dummy */ @@ -130,7 +130,7 @@ register unsigned int name_pos; register unsigned long time_entered; { - register struct stack_t *t; + register struct dbug_stack_t *t; DBUG_ENTER("push"); if (++stacktop > STACKSIZ) { @@ -157,7 +157,7 @@ register unsigned long *time_entered; register unsigned long *child_time; { - register struct stack_t *temp; + register struct dbug_stack_t *temp; register unsigned int rtnval; DBUG_ENTER ("pop"); @@ -313,7 +313,7 @@ unsigned int oldpos; unsigned long oldtime; unsigned long oldchild; - struct stack_t *t; + struct dbug_stack_t *t; DBUG_ENTER ("process"); while (fgets (buf,BUFSIZ,inf) != NULL) { diff -ur porting_base.2.0/mysql/extra/comp_err.c rebuild.2.0/mysql/extra/comp_err.c --- porting_base.2.0/mysql/extra/comp_err.c Thu Jun 3 11:50:01 2010 +++ rebuild.2.0/mysql/extra/comp_err.c Mon Nov 8 13:28:50 2010 @@ -1084,5 +1084,9 @@ DBUG_RETURN(1); } +#ifdef __VOS__ + fflush(to); /* avoid posix-1902 */ +#endif + DBUG_RETURN(0); } diff -ur porting_base.2.0/mysql/extra/innochecksum.c rebuild.2.0/mysql/extra/innochecksum.c --- porting_base.2.0/mysql/extra/innochecksum.c Thu Jun 3 11:50:17 2010 +++ rebuild.2.0/mysql/extra/innochecksum.c Fri Apr 15 13:04:16 2011 @@ -27,7 +27,9 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE 500 /* needed to include getopt.h on some platforms. */ +#endif #include #include diff -ur porting_base.2.0/mysql/include/config.h.in rebuild.2.0/mysql/include/config.h.in --- porting_base.2.0/mysql/include/config.h.in Thu Jun 3 11:54:04 2010 +++ rebuild.2.0/mysql/include/config.h.in Tue Nov 9 13:14:28 2010 @@ -229,6 +229,9 @@ /* Define to enable ut8 */ #undef HAVE_CHARSET_utf8 +/* Define to 1 if you have the `chroot' function. */ +#undef HAVE_CHROOT + /* Define to 1 if you have the `chsize' function. */ #undef HAVE_CHSIZE @@ -726,11 +729,23 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SEMAPHORE_H +/* Define to 1 if you have the `setegid' function. */ +#undef HAVE_SETEGID + /* Define to 1 if you have the `setenv' function. */ #undef HAVE_SETENV +/* Define to 1 if you have the `seteuid' function. */ +#undef HAVE_SETEUID + /* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE + +/* Define to 1 if you have the `setregid' function. */ +#undef HAVE_SETREGID + +/* Define to 1 if you have the `setreuid' function. */ +#undef HAVE_SETREUID /* Define to 1 if you have the `setupterm' function. */ #undef HAVE_SETUPTERM diff -ur porting_base.2.0/mysql/include/my_base.h rebuild.2.0/mysql/include/my_base.h --- porting_base.2.0/mysql/include/my_base.h Thu Jun 3 11:50:20 2010 +++ rebuild.2.0/mysql/include/my_base.h Tue Mar 8 12:59:49 2011 @@ -553,7 +553,11 @@ #define HA_OFFSET_ERROR (~ (my_off_t) 0) #if SYSTEM_SIZEOF_OFF_T == 4 +#ifdef __VOS__ +#define MAX_FILE_SIZE 2145402880 /* 523780 * 4096; the "slow" file i/o limit. */ +#else #define MAX_FILE_SIZE INT_MAX32 +#endif #else #define MAX_FILE_SIZE LONGLONG_MAX #endif diff -ur porting_base.2.0/mysql/include/my_global.h rebuild.2.0/mysql/include/my_global.h --- porting_base.2.0/mysql/include/my_global.h Thu Jun 3 11:50:27 2010 +++ rebuild.2.0/mysql/include/my_global.h Mon Nov 8 13:28:55 2010 @@ -884,8 +884,10 @@ #endif /* isfinite */ #ifndef HAVE_ISNAN +#ifndef isnan #define isnan(x) ((x) != (x)) #endif +#endif #ifdef HAVE_ISINF /* Check if C compiler is affected by GCC bug #39228 */ @@ -1174,8 +1176,8 @@ (low byte first) */ -/* Optimized store functions for Intel x86 */ -#if defined(__i386__) || defined(_WIN32) +/* Optimized store functions for Little-Endian Intel x86 */ +#if (!defined(WORDS_BIGENDIAN) && (defined(__i386__) || defined(_WIN32))) #define sint2korr(A) (*((int16 *) (A))) #define sint3korr(A) ((int32) ((((uchar) (A)[2]) & 128) ? \ (((uint32) 255L << 24) | \ @@ -1253,7 +1255,7 @@ #else /* - We're here if it's not a IA-32 architecture (Win32 and UNIX IA-32 defines + We're here if it's not a Little-Endian IA-32 architecture (Win32 and UNIX IA-32 defines were done before) */ #define sint2korr(A) (int16) (((int16) ((uchar) (A)[0])) +\ diff -ur porting_base.2.0/mysql/include/my_sys.h rebuild.2.0/mysql/include/my_sys.h --- porting_base.2.0/mysql/include/my_sys.h Thu Jun 3 11:50:10 2010 +++ rebuild.2.0/mysql/include/my_sys.h Mon Nov 8 13:28:54 2010 @@ -911,6 +911,12 @@ #ifndef MAP_NORESERVE #define MAP_NORESERVE 0 /* For irix and AIX */ #endif +#ifndef MS_SYNC +#define MS_SYNC 0x0000 +#endif +#ifndef MS_INVALIDATE +#define MS_INVALIDATE 0x0000 +#endif #ifdef HAVE_MMAP64 #define my_mmap(a,b,c,d,e,f) mmap64(a,b,c,d,e,f) diff -ur porting_base.2.0/mysql/include/myisam.h rebuild.2.0/mysql/include/myisam.h --- porting_base.2.0/mysql/include/myisam.h Thu Jun 3 11:50:20 2010 +++ rebuild.2.0/mysql/include/myisam.h Tue Mar 8 12:59:49 2011 @@ -56,7 +56,11 @@ #define MI_NAME_IEXT ".MYI" #define MI_NAME_DEXT ".MYD" /* Max extra space to use when sorting keys */ +#ifdef __VOS__ +#define MI_MAX_TEMP_LENGTH MAX_FILE_SIZE +#else #define MI_MAX_TEMP_LENGTH 2*1024L*1024L*1024L +#endif /* Possible values for myisam_block_size (must be power of 2) */ #define MI_KEY_BLOCK_LENGTH 1024 /* default key block length */ diff -ur porting_base.2.0/mysql/include/mysql.h.pp rebuild.2.0/mysql/include/mysql.h.pp --- porting_base.2.0/mysql/include/mysql.h.pp Thu Jun 3 11:50:12 2010 +++ rebuild.2.0/mysql/include/mysql.h.pp Mon Nov 8 13:28:55 2010 @@ -1,4 +1,40 @@ #include +typedef long time_t; +#include +typedef unsigned long size_t; +typedef long ssize_t; +typedef unsigned char u_char; +typedef unsigned short u_short; +typedef unsigned int u_int; +typedef unsigned long u_long; +typedef unsigned short ushort; +typedef unsigned int uint; +typedef char *caddr_t; +typedef long dev_t; +typedef unsigned long gid_t; +typedef unsigned long ino_t; +typedef unsigned long uid_t; +#include +typedef long fd_mask; +typedef struct fd_set { + fd_mask fds_bits[(((4096)+(((sizeof (fd_mask) * 8))-1))/((sizeof (fd_mask) * 8)))]; +} fd_set; +struct timeval + { + long tv_sec; + long tv_usec; + }; +extern int select(int _nfds, fd_set *_readfds, fd_set *_writefds, + fd_set *_exceptfds, struct timeval *_timeout); +extern int select_with_events(int _nfds, fd_set *_readfds, + fd_set *_writefds, fd_set *_exceptfds, + struct timeval *_timeout, int *_os_event_ids, + int *_os_event_counts, short _total_os_events, + short *_os_event_no); +typedef long minor_t; +typedef long off_t; +typedef unsigned char uchar; +typedef unsigned long ulong; typedef char my_bool; typedef int my_socket; #include "mysql_version.h" Only in porting_base.2.0/mysql/include: mysqld_ername.h Only in porting_base.2.0/mysql/include: mysqld_error.h Only in porting_base.2.0/mysql/include: sql_state.h diff -ur porting_base.2.0/mysql/ltmain.sh rebuild.2.0/mysql/ltmain.sh --- porting_base.2.0/mysql/ltmain.sh Thu Jun 3 11:54:04 2010 +++ rebuild.2.0/mysql/ltmain.sh Fri Jan 7 12:58:06 2011 @@ -1951,7 +1951,7 @@ func_fatal_help "\`$dest' is not a directory" fi case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; + [\\/%]* | [A-Za-z]:[\\/]*) ;; *) for file in $files; do case $file in @@ -4522,7 +4522,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-vos) # These systems don't actually have a C or math library (as such) continue ;; @@ -4550,7 +4550,7 @@ esac elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-vos) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -6476,7 +6476,7 @@ if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-vos) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) @@ -7821,6 +7821,10 @@ exeext=.exe func_stripname '' '.exe' "$outputname" outputname=$func_stripname_result ;; + *vos) + exeext=.pm + func_stripname '' '.pm' "$outputname" + output=$func_stripname_result ;; *) exeext= ;; esac case $host in diff -ur porting_base.2.0/mysql/mysql-test/Makefile.in rebuild.2.0/mysql/mysql-test/Makefile.in --- porting_base.2.0/mysql/mysql-test/Makefile.in Thu Jun 3 11:54:14 2010 +++ rebuild.2.0/mysql/mysql-test/Makefile.in Fri Apr 15 13:03:53 2011 @@ -402,8 +402,7 @@ zlib_dir = @zlib_dir@ testroot = $(prefix) testdir = $(testroot)/mysql-test -test_SCRIPTS = mtr \ - mysql-test-run \ +test_SCRIPTS = \ mysql-test-run.pl \ mysql-stress-test.pl diff -ur porting_base.2.0/mysql/mysql-test/lib/My/Find.pm rebuild.2.0/mysql/mysql-test/lib/My/Find.pm --- porting_base.2.0/mysql/mysql-test/lib/My/Find.pm Thu Jun 3 11:50:17 2010 +++ rebuild.2.0/mysql/mysql-test/lib/My/Find.pm Mon Nov 8 13:15:45 2010 @@ -31,6 +31,7 @@ our $vs_config_dir; my $bin_extension= ".exe" if IS_WINDOWS; +my $bin_extension= ".pm" if IS_VOS; # Helper function to be used for fourth parameter to find functions sub NOT_REQUIRED { return 0; } diff -ur porting_base.2.0/mysql/mysql-test/lib/My/Platform.pm rebuild.2.0/mysql/mysql-test/lib/My/Platform.pm --- porting_base.2.0/mysql/mysql-test/lib/My/Platform.pm Thu Jun 3 11:50:23 2010 +++ rebuild.2.0/mysql/mysql-test/lib/My/Platform.pm Mon Nov 8 13:15:44 2010 @@ -21,7 +21,7 @@ use File::Path; use base qw(Exporter); -our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL +our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL IS_VOS native_path posix_path mixed_path check_socket_path_length process_alive); @@ -41,6 +41,12 @@ } else { eval 'sub IS_WIN32PERL { 0 }'; + } + if ($^O eq "vos") { + eval 'sub IS_VOS { 1 }'; + } + else { + eval 'sub IS_VOS { 0 }'; } } diff -ur porting_base.2.0/mysql/mysql-test/lib/My/SafeProcess/Makefile.in rebuild.2.0/mysql/mysql-test/lib/My/SafeProcess/Makefile.in --- porting_base.2.0/mysql/mysql-test/lib/My/SafeProcess/Makefile.in Thu Jun 3 11:54:14 2010 +++ rebuild.2.0/mysql/mysql-test/lib/My/SafeProcess/Makefile.in Mon Nov 8 13:15:44 2010 @@ -407,34 +407,34 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mysql-test/lib/My/SafeProcess/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mysql-test/lib/My/SafeProcess/Makefile +# @for dep in $?; do \ +# case '$(am__configure_deps)' in \ +# *$$dep*) \ +# ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +# && { if test -f $@; then exit 0; else break; fi; }; \ +# exit 1;; \ +# esac; \ +# done; \ +# echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mysql-test/lib/My/SafeProcess/Makefile'; \ +# cd $(top_srcdir) && \ +# $(AUTOMAKE) --gnu mysql-test/lib/My/SafeProcess/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; +# @case '$?' in \ +# *config.status*) \ +# cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +# *) \ +# echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +# cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +# esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +# cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +# cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +# cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-safePROGRAMS: $(safe_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(safedir)" || $(MKDIR_P) "$(DESTDIR)$(safedir)" diff -ur porting_base.2.0/mysql/mysql-test/lib/My/SafeProcess/safe_process.pl rebuild.2.0/mysql/mysql-test/lib/My/SafeProcess/safe_process.pl --- porting_base.2.0/mysql/mysql-test/lib/My/SafeProcess/safe_process.pl Thu Jun 3 11:50:24 2010 +++ rebuild.2.0/mysql/mysql-test/lib/My/SafeProcess/safe_process.pl Fri Apr 15 13:03:39 2011 @@ -94,7 +94,7 @@ local $SIG{INT}= \&handle_signal; local $SIG{CHLD}= sub { message("Got signal @_"); - kill(9, -$child_pid); + kill('KILL', -$child_pid); my $ret= waitpid($child_pid, 0); if ($? & 127){ exit(65); # Killed by signal @@ -134,7 +134,7 @@ # Use negative pid in order to kill the whole # process group # -my $ret= kill(9, -$child_pid); +my $ret= kill('KILL', -$child_pid); message("Killed child: $child_pid, ret: $ret"); if ($ret > 0) { message("Killed child: $child_pid"); diff -ur porting_base.2.0/mysql/mysql-test/lib/mtr_misc.pl rebuild.2.0/mysql/mysql-test/lib/mtr_misc.pl --- porting_base.2.0/mysql/mysql-test/lib/mtr_misc.pl Thu Jun 3 11:50:20 2010 +++ rebuild.2.0/mysql/mysql-test/lib/mtr_misc.pl Fri Jan 7 12:57:52 2011 @@ -131,6 +131,7 @@ sub mtr_exe_maybe_exists (@) { my @path= @_; + map {$_.= ".pm"} @path if IS_VOS; map {$_.= ".exe"} @path if IS_WINDOWS; foreach my $path ( @path ) { @@ -141,6 +142,13 @@ else { return $path if -x $path; + + # If .pm is not there then see if it's a script file + # so take out .pm suffix and check if file exists again + if (IS_VOS){ + $path = substr($path, 0, - 3); + return $path if -x $path; + } } } return ""; diff -ur porting_base.2.0/mysql/mysql-test/lib/v1/mtr_process.pl rebuild.2.0/mysql/mysql-test/lib/v1/mtr_process.pl --- porting_base.2.0/mysql/mysql-test/lib/v1/mtr_process.pl Thu Jun 3 11:50:12 2010 +++ rebuild.2.0/mysql/mysql-test/lib/v1/mtr_process.pl Mon Nov 8 13:15:56 2010 @@ -271,7 +271,7 @@ elsif ( $timer_name eq "testcase" ) { $saved_exit_value= 63; # Mark as timeout - kill(9, $pid); # Kill mysqltest + kill('KILL', $pid); # Kill mysqltest next; # Go on and catch the termination } } @@ -294,7 +294,7 @@ # We terminated the waiting because a "mysqld" process died. # Kill the mysqltest process. mtr_verbose("Kill mysqltest because another process died"); - kill(9,$pid); + kill('KILL',$pid); $ret_pid= waitpid($pid,0); @@ -504,7 +504,7 @@ do { mtr_debug("Sending SIGKILL to pids: " . join(' ', @pids)); - kill(9, @pids); + kill('KILL', @pids); mtr_report("Sleep 1 second waiting for processes to die"); sleep(1) # Wait one second } while ( $retries-- and kill(0, @pids) ); @@ -741,8 +741,8 @@ mtr_add_arg($args, "--connect_timeout=5"); # Shutdown time must be high as slave may be in reconnect - mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo"); - mtr_add_arg($args, "$command"); + mtr_add_arg($args, "--shutdown_timeout=%s", "$adm_shutdown_tmo"); + mtr_add_arg($args, "%s", "$command"); my $pid= mtr_spawn($::exe_mysqladmin, $args, "", "", "", "", { append_log_file => 1 }); @@ -766,7 +766,7 @@ mtr_add_arg($args, "--try-reconnect=1"); mtr_add_arg($args, "--ndb_connectstring=%s", $cluster->{'connect_string'}); mtr_add_arg($args, "-e"); - mtr_add_arg($args, "$command"); + mtr_add_arg($args, "%s", "$command"); my $pid= mtr_spawn($::exe_ndb_mgm, $args, "", "/dev/null", "/dev/null", "", @@ -1092,7 +1092,7 @@ next; } - my $signaled_procs= kill(9, $pid); + my $signaled_procs= kill('KILL', $pid); if ($signaled_procs == 0) { # No such process existed, assume it's killed diff -ur porting_base.2.0/mysql/mysql-test/lib/v1/mtr_timer.pl rebuild.2.0/mysql/mysql-test/lib/v1/mtr_timer.pl --- porting_base.2.0/mysql/mysql-test/lib/v1/mtr_timer.pl Thu Jun 3 11:50:12 2010 +++ rebuild.2.0/mysql/mysql-test/lib/v1/mtr_timer.pl Mon Nov 8 13:15:56 2010 @@ -118,7 +118,7 @@ # FIXME as Cygwin reuses pids fast, maybe check that is # the expected process somehow?! - kill(15, $tpid); + kill('TERM', $tpid); # As the timers are so simple programs, we trust them to terminate, # and use blocking wait for it. We wait just to avoid a zombie. Only in porting_base.2.0/mysql/mysql-test: mtr Only in porting_base.2.0/mysql/mysql-test: mysql-test-run diff -ur porting_base.2.0/mysql/mysql-test/mysql-test-run.pl rebuild.2.0/mysql/mysql-test/mysql-test-run.pl --- porting_base.2.0/mysql/mysql-test/mysql-test-run.pl Thu Jun 3 11:50:02 2010 +++ rebuild.2.0/mysql/mysql-test/mysql-test-run.pl Tue Mar 8 12:59:39 2011 @@ -207,8 +207,8 @@ my $opt_sleep; -my $opt_testcase_timeout= $ENV{MTR_TESTCASE_TIMEOUT} || 15; # minutes -my $opt_suite_timeout = $ENV{MTR_SUITE_TIMEOUT} || 300; # minutes +my $opt_testcase_timeout= $ENV{MTR_TESTCASE_TIMEOUT} || 45; # minutes +my $opt_suite_timeout = $ENV{MTR_SUITE_TIMEOUT} || 900; # minutes my $opt_shutdown_timeout= $ENV{MTR_SHUTDOWN_TIMEOUT} || 10; # seconds my $opt_start_timeout = $ENV{MTR_START_TIMEOUT} || 180; # seconds @@ -255,7 +255,7 @@ my $opt_max_save_core= env_or_val(MTR_MAX_SAVE_CORE => 5); my $opt_max_save_datadir= env_or_val(MTR_MAX_SAVE_DATADIR => 20); -my $opt_max_test_fail= env_or_val(MTR_MAX_TEST_FAIL => 10); +my $opt_max_test_fail= env_or_val(MTR_MAX_TEST_FAIL => 100); my $opt_parallel= $ENV{MTR_PARALLEL} || 1; @@ -500,7 +500,7 @@ mtr_report(" - saving '$worker_savedir/' to '$savedir/'"); rename($worker_savedir, $savedir); # Move any core files from e.g. mysqltest - foreach my $coref (glob("core*"), glob("*.dmp")) + foreach my $coref (glob("core*"), glob("*.dmp"), glob("*.kp")) { mtr_report(" - found '$coref', moving it to '$savedir'"); move($coref, $savedir); @@ -513,7 +513,8 @@ my $core_name= basename($core_file); if ($core_name =~ /^core/ or # Starting with core - (IS_WINDOWS and $core_name =~ /\.dmp$/)){ + (IS_WINDOWS and $core_name =~ /\.dmp$/) or + (IS_VOS and $core_name =~ /\.kp$/)){ # Ending with .dmp mtr_report(" - found '$core_name'", "($num_saved_cores/$opt_max_save_core)"); @@ -599,6 +600,14 @@ elsif ($line eq 'START'){ ; # Send first test } + elsif ($line eq 'BYEBYE'){ + mtr_verbose("Child terminated normally"); + $s->remove($sock); + IO::Socket::shutdown($sock,0); + if (--$childs == 0){ + return $completed; + } + } else { mtr_error("Unknown response: '$line' from client"); } @@ -751,6 +760,8 @@ } elsif ($line eq 'BYE'){ mtr_report("Server said BYE"); + print $server "BYEBYE\n"; + IO::Socket::shutdown($server,1); stop_all_servers($opt_shutdown_timeout); if ($opt_valgrind_mysqld) { valgrind_exit_reports(); @@ -1572,7 +1583,7 @@ mtr_add_arg($args, "--user=%s", $opt_user); while (my ($option, $value)= each( %opts_extern )) { - mtr_add_arg($args, "--$option=$value"); + mtr_add_arg($args, "--$option=%s", $value); } mtr_add_arg($args, "--silent"); # Tab separated output @@ -1784,7 +1795,7 @@ } mtr_add_arg($args, "--defaults-file=%s", $path_config_file); mtr_add_arg($args, "--testcase"); - mtr_add_arg($args, "--vardir=$opt_vardir"); + mtr_add_arg($args, "--vardir=%s", $opt_vardir); client_debug_arg($args,"mysql_client_test"); return mtr_args2str($exe, @$args); @@ -2194,6 +2205,11 @@ mkpath("$opt_vardir/tmp"); mkpath($opt_tmpdir) if ($opt_tmpdir ne "$opt_vardir/tmp"); + unless ( -d $opt_tmpdir and -w $opt_tmpdir ) + { + mtr_error("Writable 'tmp' directory is needed!!"); + } + # On some operating systems, there is a limit to the length of a # UNIX domain socket's path far below PATH_MAX. # Don't allow that to happen @@ -2358,7 +2374,7 @@ if ($ndb_waiter_extra_opt) { - mtr_add_arg($args, "$ndb_waiter_extra_opt"); + mtr_add_arg($args, "%s", $ndb_waiter_extra_opt); } # Start the ndb_waiter which will connect to the ndb_mgmd @@ -4066,10 +4082,18 @@ mtr_report("Saving datadirs..."); my $save_dir= "$opt_vardir/log/"; - $save_dir.= $tinfo->{name}; + my $save_dirname= $tinfo->{name}; + # Add combination name if any - $save_dir.= "-$tinfo->{combination}" + $save_dirname.= "-$tinfo->{combination}" if defined $tinfo->{combination}; + + if (length ($save_dirname) > 32) { + $save_dir.= substr($save_dirname,0,32); + } + else { + $save_dir.= $save_dirname; + } # Save savedir path for server $tinfo->{savedir}= $save_dir; @@ -4890,7 +4914,7 @@ $exe= $opt_strace_client || "strace"; mtr_add_arg($args, "-o"); mtr_add_arg($args, "%s/log/mysqltest.strace", $opt_vardir); - mtr_add_arg($args, "$exe_mysqltest"); + mtr_add_arg($args, "%s", $exe_mysqltest); } mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir); @@ -5052,19 +5076,19 @@ $$args= []; mtr_add_arg($$args, "-title"); - mtr_add_arg($$args, "$type"); + mtr_add_arg($$args, "%s", $type); mtr_add_arg($$args, "-e"); if ( $exe_libtool ) { - mtr_add_arg($$args, $exe_libtool); + mtr_add_arg($$args, "%s", $exe_libtool); mtr_add_arg($$args, "--mode=execute"); } mtr_add_arg($$args, "gdb"); mtr_add_arg($$args, "-x"); - mtr_add_arg($$args, "$gdb_init_file"); - mtr_add_arg($$args, "$$exe"); + mtr_add_arg($$args, "%s", $gdb_init_file); + mtr_add_arg($$args, "%s", $$exe); $$exe= "xterm"; } @@ -5126,8 +5150,8 @@ { $$exe= "ddd"; } - mtr_add_arg($$args, "--command=$gdb_init_file"); - mtr_add_arg($$args, "$save_exe"); + mtr_add_arg($$args, "--command=%s", $gdb_init_file); + mtr_add_arg($$args, "%s", $save_exe); } @@ -5144,7 +5168,7 @@ # vc[express] /debugexe exe arg1 .. argn # Add name of the exe and /debugexe before args - unshift(@$$args, "$$exe"); + unshift(@$$args, "%s", "$$exe"); unshift(@$$args, "/debugexe"); # Set exe to debuggername @@ -5156,7 +5180,7 @@ # windbg exe arg1 .. argn # Add name of the exe before args - unshift(@$$args, "$$exe"); + unshift(@$$args, "%s", $$exe); # Set exe to debuggername $$exe= $debugger; @@ -5166,7 +5190,7 @@ { # xterm -e dbx -r exe arg1 .. argn - unshift(@$$args, $$exe); + unshift(@$$args, "%s", $$exe); unshift(@$$args, "-r"); unshift(@$$args, $debugger); unshift(@$$args, "-e"); @@ -5191,7 +5215,7 @@ if ( $opt_callgrind) { mtr_add_arg($args, "--tool=callgrind"); - mtr_add_arg($args, "--base=$opt_vardir/log"); + mtr_add_arg($args, "--base=%s/log", $opt_vardir); } else { @@ -5205,7 +5229,7 @@ # Add valgrind options, can be overriden by user mtr_add_arg($args, '%s', $_) for (@valgrind_args); - mtr_add_arg($args, $$exe); + mtr_add_arg($args, "%s", $$exe); $$exe= $opt_valgrind_path || "valgrind"; diff -ur porting_base.2.0/mysql/mysql-test/r/alter_table.result rebuild.2.0/mysql/mysql-test/r/alter_table.result --- porting_base.2.0/mysql/mysql-test/r/alter_table.result Thu Jun 3 12:17:59 2010 +++ rebuild.2.0/mysql/mysql-test/r/alter_table.result Mon Nov 8 13:10:43 2010 @@ -1090,48 +1090,48 @@ `c1` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE `tt+1`, `tt+2`; -CREATE TABLE `#sql1` (c1 INT); -CREATE TABLE `@0023sql2` (c1 INT); +CREATE TABLE `=sql1` (c1 INT); +CREATE TABLE `@003Dsql2` (c1 INT); SHOW TABLES; Tables_in_test -#sql1 -@0023sql2 -RENAME TABLE `#sql1` TO `@0023sql1`; -RENAME TABLE `@0023sql2` TO `#sql2`; +=sql1 +@003Dsql2 +RENAME TABLE `=sql1` TO `@003Dsql1`; +RENAME TABLE `@003Dsql2` TO `=sql2`; SHOW TABLES; Tables_in_test -#sql2 -@0023sql1 -ALTER TABLE `@0023sql1` RENAME `#sql-1`; -ALTER TABLE `#sql2` RENAME `@0023sql-2`; +=sql2 +@003Dsql1 +ALTER TABLE `@003Dsql1` RENAME `=sql-1`; +ALTER TABLE `=sql2` RENAME `@003Dsql-2`; SHOW TABLES; Tables_in_test -#sql-1 -@0023sql-2 -INSERT INTO `#sql-1` VALUES (1); -INSERT INTO `@0023sql-2` VALUES (2); -DROP TABLE `#sql-1`, `@0023sql-2`; -CREATE TEMPORARY TABLE `#sql1` (c1 INT); -CREATE TEMPORARY TABLE `@0023sql2` (c1 INT); +=sql-1 +@003Dsql-2 +INSERT INTO `=sql-1` VALUES (1); +INSERT INTO `@003Dsql-2` VALUES (2); +DROP TABLE `=sql-1`, `@003Dsql-2`; +CREATE TEMPORARY TABLE `=sql1` (c1 INT); +CREATE TEMPORARY TABLE `@003Dsql2` (c1 INT); SHOW TABLES; Tables_in_test -ALTER TABLE `#sql1` RENAME `@0023sql1`; -ALTER TABLE `@0023sql2` RENAME `#sql2`; +ALTER TABLE `=sql1` RENAME `@003Dsql1`; +ALTER TABLE `@003Dsql2` RENAME `=sql2`; SHOW TABLES; Tables_in_test -INSERT INTO `#sql2` VALUES (1); -INSERT INTO `@0023sql1` VALUES (2); -SHOW CREATE TABLE `#sql2`; +INSERT INTO `=sql2` VALUES (1); +INSERT INTO `@003Dsql1` VALUES (2); +SHOW CREATE TABLE `=sql2`; Table Create Table -#sql2 CREATE TEMPORARY TABLE `#sql2` ( +=sql2 CREATE TEMPORARY TABLE `=sql2` ( `c1` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -SHOW CREATE TABLE `@0023sql1`; +SHOW CREATE TABLE `@003Dsql1`; Table Create Table -@0023sql1 CREATE TEMPORARY TABLE `@0023sql1` ( +@003Dsql1 CREATE TEMPORARY TABLE `@003Dsql1` ( `c1` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -DROP TABLE `#sql2`, `@0023sql1`; +DROP TABLE `=sql2`, `@003Dsql1`; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; CREATE TABLE t1 ( diff -ur porting_base.2.0/mysql/mysql-test/r/archive.result rebuild.2.0/mysql/mysql-test/r/archive.result --- porting_base.2.0/mysql/mysql-test/r/archive.result Thu Jun 3 12:18:00 2010 +++ rebuild.2.0/mysql/mysql-test/r/archive.result Mon Nov 8 13:11:45 2010 @@ -12734,7 +12734,7 @@ CREATE TABLE t1(a INT) ENGINE=ARCHIVE; FLUSH TABLE t1; SELECT * FROM t1; -ERROR HY000: Can't find file: 't1' (errno: 2) +ERROR HY000: Can't find file: 't1' (errno: 5002) DROP TABLE t1; ERROR 42S02: Unknown table 't1' # diff -ur porting_base.2.0/mysql/mysql-test/r/backup.result rebuild.2.0/mysql/mysql-test/r/backup.result --- porting_base.2.0/mysql/mysql-test/r/backup.result Thu Jun 3 12:18:00 2010 +++ rebuild.2.0/mysql/mysql-test/r/backup.result Mon Nov 8 13:11:37 2010 @@ -3,9 +3,9 @@ create table t4(n int); backup table t4 to '../../bogus'; Table Op Msg_type Msg_text -test.t4 backup error Failed copying .frm file (errno: X) +test.t4 backup error Failed copying .frm file (errno: 5002) test.t4 backup Warning 'BACKUP TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead -test.t4 backup Error Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X) +test.t4 backup Error Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: 5002) test.t4 backup status Operation failed backup table t4 to '../../tmp'; Table Op Msg_type Msg_text @@ -13,9 +13,9 @@ test.t4 backup status OK backup table t4 to '../../tmp'; Table Op Msg_type Msg_text -test.t4 backup error Failed copying .frm file (errno: X) +test.t4 backup error Failed copying .frm file (errno: 5017) test.t4 backup Warning 'BACKUP TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead -test.t4 backup Error Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X) +test.t4 backup Error Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: 5017) test.t4 backup status Operation failed drop table t4; restore table t4 from '../../tmp'; @@ -37,7 +37,7 @@ t1 restore error Failed copying .frm file Warnings: Warning 1287 'RESTORE TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead -Error 29 File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X) +Error 29 File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: 5002) restore table t1 from '../../tmp'; Table Op Msg_type Msg_text test.t1 restore Warning 'RESTORE TABLE' is deprecated and will be removed in a future release. Please use MySQL Administrator (mysqldump, mysql) instead diff -ur porting_base.2.0/mysql/mysql-test/r/csv.result rebuild.2.0/mysql/mysql-test/r/csv.result --- porting_base.2.0/mysql/mysql-test/r/csv.result Thu Jun 3 12:18:02 2010 +++ rebuild.2.0/mysql/mysql-test/r/csv.result Mon Nov 8 13:12:04 2010 @@ -5196,7 +5196,7 @@ create table bug15205 (val int(11) not null) engine=csv; create table bug15205_2 (val int(11) not null) engine=csv; select * from bug15205; -ERROR HY000: Can't get stat of './test/bug15205.CSV' (Errcode: 2) +ERROR HY000: Can't get stat of './test/bug15205.CSV' (Errcode: 5002) select * from bug15205_2; val select * from bug15205; @@ -5391,7 +5391,7 @@ create table t1 (a int not null) engine=csv; lock tables t1 read; select * from t1; -ERROR HY000: File 'MYSQLD_DATADIR/test/t1.CSV' not found (Errcode: 2) +ERROR HY000: File 'MYSQLD_DATADIR/test/t1.CSV' not found (Errcode: 5002) unlock tables; drop table t1; CREATE TABLE t1 (e enum('foo','bar') NOT NULL) ENGINE = CSV; diff -ur porting_base.2.0/mysql/mysql-test/r/distinct.result rebuild.2.0/mysql/mysql-test/r/distinct.result --- porting_base.2.0/mysql/mysql-test/r/distinct.result Thu Jun 3 12:18:04 2010 +++ rebuild.2.0/mysql/mysql-test/r/distinct.result Tue Mar 8 12:59:25 2011 @@ -753,7 +753,7 @@ (1, 2, 3); EXPLAIN SELECT DISTINCT a, b, d, c FROM t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL PRIMARY 16 NULL 7 Using index for group-by; Using temporary +1 SIMPLE t1 index NULL a 16 NULL 6 Using index SELECT DISTINCT a, b, d, c FROM t1; a b d c 1 1 0 1 diff -ur porting_base.2.0/mysql/mysql-test/r/drop.result rebuild.2.0/mysql/mysql-test/r/drop.result --- porting_base.2.0/mysql/mysql-test/r/drop.result Thu Jun 3 12:18:04 2010 +++ rebuild.2.0/mysql/mysql-test/r/drop.result Mon Nov 8 13:10:42 2010 @@ -89,9 +89,9 @@ End of 5.0 tests create database mysql_test; create table mysql_test.t1(f1 int); -create table mysql_test.`#sql-347f_7` (f1 int); -create table mysql_test.`#sql-347f_8` (f1 int); -drop table mysql_test.`#sql-347f_8`; +create table mysql_test.`=sql-347f_7` (f1 int); +create table mysql_test.`=sql-347f_8` (f1 int); +drop table mysql_test.`=sql-347f_8`; drop database mysql_test; # -- @@ -111,13 +111,13 @@ create database mysqltestbug26703; use mysqltestbug26703; -create table `#mysql50#abc``def` ( id int ); +create table `=mysql50=abc``def` ( id int ); create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); ERROR 42000: Incorrect table name 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); -create table `#mysql50#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); -create table `#mysql50#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); -ERROR 42000: Incorrect table name '#mysql50#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +create table `=mysql50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); +create table `=mysql50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); +ERROR 42000: Incorrect table name '=mysql50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' use test; drop database mysqltestbug26703; End of 5.1 tests diff -ur porting_base.2.0/mysql/mysql-test/r/func_group.result rebuild.2.0/mysql/mysql-test/r/func_group.result --- porting_base.2.0/mysql/mysql-test/r/func_group.result Thu Jun 3 12:18:07 2010 +++ rebuild.2.0/mysql/mysql-test/r/func_group.result Mon Nov 8 13:10:19 2010 @@ -1209,13 +1209,13 @@ 3 4 0.000000000000000000000000000000 select round(std(s1/s2), 17) from bug22555; round(std(s1/s2), 17) -0.21325763586649341 +0.21325763586649340 select std(o1/o2) from bug22555; std(o1/o2) 0.213257635866493 select round(std(e1/e2), 17) from bug22555; round(std(e1/e2), 17) -0.21325763586649341 +0.21325763586649340 set div_precision_increment=20; select i, count(*), std(s1/s2) from bug22555 group by i order by i; i count(*) std(s1/s2) @@ -1234,13 +1234,13 @@ 3 4 0.000000000000000000000000000000 select round(std(s1/s2), 17) from bug22555; round(std(s1/s2), 17) -0.21325763586649341 +0.21325763586649340 select std(o1/o2) from bug22555; std(o1/o2) 0.213257635866493 select round(std(e1/e2), 17) from bug22555; round(std(e1/e2), 17) -0.21325763586649341 +0.21325763586649340 set @@div_precision_increment=@saved_div_precision_increment; drop table bug22555; create table bug22555 (s smallint, o double, e decimal); diff -ur porting_base.2.0/mysql/mysql-test/r/func_math.result rebuild.2.0/mysql/mysql-test/r/func_math.result --- porting_base.2.0/mysql/mysql-test/r/func_math.result Thu Jun 3 12:18:07 2010 +++ rebuild.2.0/mysql/mysql-test/r/func_math.result Mon Nov 8 13:11:37 2010 @@ -85,7 +85,7 @@ set @@rand_seed1=10000000,@@rand_seed2=1000000; select rand(999999),rand(); rand(999999) rand() -0.0142313651873091 0.028870999839968 +0.0142313651873091 0.0288709998399681 explain extended select rand(999999),rand(); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used diff -ur porting_base.2.0/mysql/mysql-test/r/grant.result rebuild.2.0/mysql/mysql-test/r/grant.result --- porting_base.2.0/mysql/mysql-test/r/grant.result Thu Jun 3 12:18:08 2010 +++ rebuild.2.0/mysql/mysql-test/r/grant.result Mon Nov 8 13:12:04 2010 @@ -1423,8 +1423,8 @@ ERROR 42S02: Table 'db1.../db2/tb2' doesn't exist SELECT * FROM `../db2`.tb2; ERROR 42000: SELECT command denied to user 'testbug'@'localhost' for table 'tb2' -SELECT * FROM `#mysql50#/../db2/tb2`; -ERROR 42S02: Table 'db1.#mysql50#/../db2/tb2' doesn't exist +SELECT * FROM `=mysql50=/../db2/tb2`; +ERROR 42S02: Table 'db1.=mysql50=/../db2/tb2' doesn't exist DROP USER 'testbug'@localhost; DROP TABLE db2.t1; DROP DATABASE db1; diff -ur porting_base.2.0/mysql/mysql-test/r/group_min_max.result rebuild.2.0/mysql/mysql-test/r/group_min_max.result --- porting_base.2.0/mysql/mysql-test/r/group_min_max.result Thu Jun 3 12:18:08 2010 +++ rebuild.2.0/mysql/mysql-test/r/group_min_max.result Tue Mar 8 12:59:27 2011 @@ -2444,7 +2444,7 @@ 3 13 explain extended select sql_buffer_result a, max(b)+1 from t1 where a = 0 group by a; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 range PRIMARY,index PRIMARY 4 NULL 3 100.00 Using where; Using index for group-by; Using temporary +1 SIMPLE t1 ref PRIMARY,index PRIMARY 4 const 15 100.00 Using index; Using temporary Warnings: Note 1003 select sql_buffer_result `test`.`t1`.`a` AS `a`,(max(`test`.`t1`.`b`) + 1) AS `max(b)+1` from `test`.`t1` where (`test`.`t1`.`a` = 0) group by `test`.`t1`.`a` drop table t1; @@ -2474,7 +2474,7 @@ EXPLAIN SELECT a, MIN(b) FROM t WHERE b <> 0 GROUP BY a; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t range NULL a 10 NULL 9 Using where; Using index for group-by +1 SIMPLE t index NULL a 10 NULL 8 Using where; Using index #should return 1 row SELECT a, MIN(b) FROM t WHERE b <> 0 GROUP BY a; a MIN(b) @@ -2484,7 +2484,7 @@ EXPLAIN SELECT a, MAX(b) FROM t WHERE b <> 1 GROUP BY a; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t range NULL a 10 NULL 9 Using where; Using index for group-by +1 SIMPLE t index NULL a 10 NULL 8 Using where; Using index #should return 1 row SELECT a, MAX(b) FROM t WHERE b <> 1 GROUP BY a; a MAX(b) diff -ur porting_base.2.0/mysql/mysql-test/r/index_merge_myisam.result rebuild.2.0/mysql/mysql-test/r/index_merge_myisam.result --- porting_base.2.0/mysql/mysql-test/r/index_merge_myisam.result Thu Jun 3 12:18:10 2010 +++ rebuild.2.0/mysql/mysql-test/r/index_merge_myisam.result Tue Mar 8 12:59:24 2011 @@ -1574,13 +1574,13 @@ set optimizer_switch='default,index_merge_intersection=off'; explain select * from t1 where a=10 and b=10 or c=10; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index_merge a,b,c a,c 5,5 NULL 54 Using union(a,c); Using where +1 SIMPLE t1 index_merge a,b,c b,c 5,5 NULL 54 Using union(b,c); Using where This will switch to sort-union (intersection will be gone, too, thats a known limitation: set optimizer_switch='default,index_merge_union=off'; explain select * from t1 where a=10 and b=10 or c=10; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index_merge a,b,c a,c 5,5 NULL 54 Using sort_union(a,c); Using where +1 SIMPLE t1 index_merge a,b,c b,c 5,5 NULL 54 Using sort_union(b,c); Using where set optimizer_switch=default; show variables like 'optimizer_switch'; Variable_name Value diff -ur porting_base.2.0/mysql/mysql-test/r/insert.result rebuild.2.0/mysql/mysql-test/r/insert.result --- porting_base.2.0/mysql/mysql-test/r/insert.result Thu Jun 3 12:18:11 2010 +++ rebuild.2.0/mysql/mysql-test/r/insert.result Mon Nov 8 13:10:49 2010 @@ -550,7 +550,7 @@ 1.225e+15 1.2e+15 NULL 5000000 5000000 NULL 1.25e+78 1.2e+78 NULL -1.25e-94 1.2e-94 NULL +1.25e-94 1.3e-94 NULL 1.25e+203 1e+203 NULL 1.25e-175 1e-175 NULL 1.225 NULL 1.23 @@ -604,7 +604,7 @@ 1.225e+15 1.2e+15 NULL 5000000 5000000 NULL 1.25e+78 1.2e+78 NULL -1.25e-94 1.2e-94 NULL +1.25e-94 1.3e-94 NULL 1.25e+203 1e+203 NULL 1.25e-175 1e-175 NULL 1.225 NULL 1.225 diff -ur porting_base.2.0/mysql/mysql-test/r/insert_select.result rebuild.2.0/mysql/mysql-test/r/insert_select.result --- porting_base.2.0/mysql/mysql-test/r/insert_select.result Thu Jun 3 12:18:11 2010 +++ rebuild.2.0/mysql/mysql-test/r/insert_select.result Mon Nov 8 13:10:53 2010 @@ -841,7 +841,7 @@ SET @old_myisam_data_pointer_size = @@myisam_data_pointer_size; SET GLOBAL myisam_data_pointer_size = 2; INSERT INTO t1 VALUES (1), (2), (3), (4), (5); -call mtr.add_suppression("mysqld: The table '.*#sql.*' is full"); +call mtr.add_suppression("mysqld.pm: The table '.*=sql.*' is full"); INSERT IGNORE INTO t1 SELECT t1.a FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6,t1 t7; Got one of the listed errors SET GLOBAL myisam_data_pointer_size = @old_myisam_data_pointer_size; diff -ur porting_base.2.0/mysql/mysql-test/r/myisam-system.result rebuild.2.0/mysql/mysql-test/r/myisam-system.result --- porting_base.2.0/mysql/mysql-test/r/myisam-system.result Thu Jun 3 12:18:14 2010 +++ rebuild.2.0/mysql/mysql-test/r/myisam-system.result Mon Nov 8 13:11:09 2010 @@ -2,7 +2,7 @@ create table t1 (a int) engine=myisam; drop table if exists t1; Warnings: -Error 2 Can't find file: 't1' (errno: 2) +Error 5002 Can't find file: 't1' (errno: 5002) create table t1 (a int) engine=myisam; drop table t1; Got one of the listed errors diff -ur porting_base.2.0/mysql/mysql-test/r/myisam.result rebuild.2.0/mysql/mysql-test/r/myisam.result --- porting_base.2.0/mysql/mysql-test/r/myisam.result Thu Jun 3 12:18:14 2010 +++ rebuild.2.0/mysql/mysql-test/r/myisam.result Tue Mar 8 12:59:27 2011 @@ -923,7 +923,7 @@ CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=4100100100; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 MyISAM 10 Dynamic X X X 72057594037927935 X X X X X X latin1_swedish_ci X max_rows=4100100100 avg_row_length=70100 +t1 MyISAM 10 Dynamic X X X 2147483647 X X X X X X latin1_swedish_ci X max_rows=4100100100 avg_row_length=70100 DROP TABLE t1; CREATE TABLE t1 (c1 TEXT NOT NULL, KEY c1 (c1(10))) ENGINE=MyISAM; INSERT INTO t1 VALUES @@ -2312,13 +2312,14 @@ INSERT INTO t1 SELECT a+1280,b FROM t1; INSERT INTO t1 SELECT a+2560,b FROM t1; INSERT INTO t1 SELECT a+5120,b FROM t1; +INSERT INTO t1 SELECT a+10240,b FROM t1; SET myisam_sort_buffer_size=4; Warnings: Warning 1292 Truncated incorrect myisam_sort_buffer_size value: '4' REPAIR TABLE t1; Table Op Msg_type Msg_text test.t1 repair error myisam_sort_buffer_size is too small -test.t1 repair warning Number of rows changed from 0 to 7168 +test.t1 repair warning Number of rows changed from 0 to 14336 test.t1 repair status OK SET myisam_repair_threads=2; REPAIR TABLE t1; @@ -2383,10 +2384,13 @@ ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'); Warnings: Error 1034 myisam_sort_buffer_size is too small -Error 1034 Number of rows changed from 0 to 157 +Error 1034 Number of rows changed from 0 to 187 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; INSERT INTO t1 VALUES('1'); SELECT * FROM t1, t1 AS a1 WHERE t1.a=1 AND a1.a=1; diff -ur porting_base.2.0/mysql/mysql-test/r/mysql.result rebuild.2.0/mysql/mysql-test/r/mysql.result --- porting_base.2.0/mysql/mysql-test/r/mysql.result Thu Jun 3 12:18:14 2010 +++ rebuild.2.0/mysql/mysql-test/r/mysql.result Fri Jan 7 12:57:47 2011 @@ -1,13 +1,13 @@ drop table if exists t1; create table t1(a int); insert into t1 values(1); -ERROR at line 9: DELIMITER must be followed by a 'delimiter' character or string Test default delimiter ; a 1 Test delimiter without arg +ERROR at line 9: DELIMITER must be followed by a 'delimiter' character or string Test delimiter : a @@ -151,6 +151,156 @@ insert into t17583 select a from t17583; insert into t17583 select a from t17583; select count(*) from t17583; +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 +count(*) +1280 count(*) 1280 drop table t17583; diff -ur porting_base.2.0/mysql/mysql-test/r/mysqlcheck.result rebuild.2.0/mysql/mysql-test/r/mysqlcheck.result --- porting_base.2.0/mysql/mysql-test/r/mysqlcheck.result Thu Jun 3 12:18:15 2010 +++ rebuild.2.0/mysql/mysql-test/r/mysqlcheck.result Mon Nov 8 13:10:52 2010 @@ -123,7 +123,7 @@ show tables; Tables_in_test t1 -#mysql50#v-1 +=mysql50=v-1 v1 show tables; Tables_in_test @@ -133,10 +133,10 @@ drop view v1, `v-1`; drop table t1; SET NAMES utf8; -CREATE TABLE `#mysql50#@` (a INT); +CREATE TABLE `=mysql50=@` (a INT); SHOW TABLES; Tables_in_test -#mysql50#@ +=mysql50=@ SET NAMES DEFAULT; mysqlcheck --fix-table-names --databases test SET NAMES utf8; @@ -155,18 +155,18 @@ SET NAMES utf8; DROP TABLE `я`; SET NAMES DEFAULT; -CREATE DATABASE `#mysql50#a@b`; -USE `#mysql50#a@b`; -CREATE TABLE `#mysql50#c@d` (a INT); +CREATE DATABASE `=mysql50=a@b`; +USE `=mysql50=a@b`; +CREATE TABLE `=mysql50=c@d` (a INT); CREATE TABLE t1 (a INT); SELECT * FROM INFORMATION_SCHEMA.TRIGGERS -WHERE TRIGGER_SCHEMA="#mysql50#a@b" ORDER BY trigger_name; +WHERE TRIGGER_SCHEMA="=mysql50=a@b" ORDER BY trigger_name; TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION -NULL #mysql50#a@b tr1 INSERT NULL #mysql50#a@b #mysql50#c@d 0 NULL SET NEW.a = 10 * NEW.a ROW BEFORE NULL NULL OLD NEW NULL root@localhost latin1 latin1_swedish_ci latin1_swedish_ci -NULL #mysql50#a@b tr2 INSERT NULL #mysql50#a@b t1 0 NULL SET NEW.a = 100 * NEW.a ROW BEFORE NULL NULL OLD NEW NULL root@localhost latin1 latin1_swedish_ci latin1_swedish_ci +NULL =mysql50=a@b tr1 INSERT NULL =mysql50=a@b =mysql50=c@d 0 NULL SET NEW.a = 10 * NEW.a ROW BEFORE NULL NULL OLD NEW NULL root@localhost latin1 latin1_swedish_ci latin1_swedish_ci +NULL =mysql50=a@b tr2 INSERT NULL =mysql50=a@b t1 0 NULL SET NEW.a = 100 * NEW.a ROW BEFORE NULL NULL OLD NEW NULL root@localhost latin1 latin1_swedish_ci latin1_swedish_ci Warnings: -Warning 1603 Triggers for table `#mysql50#a@b`.`#mysql50#c@d` have no creation context -Warning 1603 Triggers for table `#mysql50#a@b`.`t1` have no creation context +Warning 1603 Triggers for table `=mysql50=a@b`.`=mysql50=c@d` have no creation context +Warning 1603 Triggers for table `=mysql50=a@b`.`t1` have no creation context mysqlcheck --fix-db-names --fix-table-names --all-databases USE `a@b`; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS @@ -189,13 +189,13 @@ # # Bug #31821: --all-in-1 and --fix-table-names don't work together # -drop table if exists `#mysql50#t1-1`; -create table `#mysql50#t1-1` (a int); +drop table if exists `=mysql50=t1-1`; +create table `=mysql50=t1-1` (a int); show tables like 't1-1'; Tables_in_test (t1-1) t1-1 drop table `t1-1`; -create table `#mysql50#t1-1` (a int); +create table `=mysql50=t1-1` (a int); show tables like 't1-1'; Tables_in_test (t1-1) t1-1 diff -ur porting_base.2.0/mysql/mysql-test/r/mysqldump.result rebuild.2.0/mysql/mysql-test/r/mysqldump.result --- porting_base.2.0/mysql/mysql-test/r/mysqldump.result Thu Jun 3 12:18:15 2010 +++ rebuild.2.0/mysql/mysql-test/r/mysqldump.result Tue Mar 8 12:59:26 2011 @@ -1832,8 +1832,6 @@ # Bug#21288 mysqldump segmentation fault when using --where # create table t1 (a int); -mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064) -mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -1853,6 +1851,8 @@ ) ENGINE=MyISAM DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; +mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064) +mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; @@ -4207,7 +4207,7 @@ aberrant aberration drop table words; -mysql-import: Error: 1146, Table 'test.words' doesn't exist, when using table: words +mysql-import.pm: Error: 1146, Table 'test.words' doesn't exist, when using table: words drop table t1; drop table t2; drop table words2; diff -ur porting_base.2.0/mysql/mysql-test/r/mysqltest.result rebuild.2.0/mysql/mysql-test/r/mysqltest.result --- porting_base.2.0/mysql/mysql-test/r/mysqltest.result Thu Jun 3 12:18:16 2010 +++ rebuild.2.0/mysql/mysql-test/r/mysqltest.result Tue Nov 30 14:02:32 2010 @@ -304,7 +304,7 @@ failing query in let mysqltest: At line 1: Error running query 'failing query': 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing query' at line 1 mysqltest: At line 1: Missing required argument 'filename' to command 'source' -mysqltest: At line 1: Could not open './non_existingFile' for reading, errno: 2 +mysqltest: At line 1: Could not open './non_existingFile' for reading, errno: 5002 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 @@ -452,7 +452,7 @@ Output from mysqltest-x.inc Output from mysqltest-x.inc Output from mysqltest-x.inc -mysqltest: Could not open './non_existing_file.inc' for reading, errno: 2 +mysqltest: Could not open './non_existing_file.inc' for reading, errno: 5002 failing_statement; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing_statement' at line 1 failing_statement; @@ -556,8 +556,8 @@ select * from t1;; f1 Abcd -mysqltest: At line 2: Cannot run query on connection between send and reap select * from t1;; +mysqltest: At line 2: Cannot run query on connection between send and reap drop table t1; mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file' mysqltest: At line 1: Missing required argument 'directory' to command 'remove_files_wildcard' diff -ur porting_base.2.0/mysql/mysql-test/r/order_by.result rebuild.2.0/mysql/mysql-test/r/order_by.result --- porting_base.2.0/mysql/mysql-test/r/order_by.result Thu Jun 3 12:18:17 2010 +++ rebuild.2.0/mysql/mysql-test/r/order_by.result Tue Mar 8 12:59:26 2011 @@ -1424,7 +1424,7 @@ set session sort_buffer_size= 30000; Warnings: Warning 1292 Truncated incorrect sort_buffer_size value: '30000' -set session max_sort_length= 2180; +set session max_sort_length= 2182; select * from t1 order by b; ERROR HY001: Out of sort memory; increase server sort buffer size drop table t1; diff -ur porting_base.2.0/mysql/mysql-test/r/partition_not_embedded.result rebuild.2.0/mysql/mysql-test/r/partition_not_embedded.result --- porting_base.2.0/mysql/mysql-test/r/partition_not_embedded.result Thu Jun 3 12:18:18 2010 +++ rebuild.2.0/mysql/mysql-test/r/partition_not_embedded.result Mon Nov 8 13:11:37 2010 @@ -6,14 +6,14 @@ PARTITION `p1....................` VALUES LESS THAN (9), PARTITION p2 VALUES LESS THAN MAXVALUE); # List of files in database `test`, all original t1-files here -t1#P#p0.MYD -t1#P#p0.MYI -t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD -t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI -t1#P#p2.MYD -t1#P#p2.MYI t1.frm t1.par +t1=P=p0.MYD +t1=P=p0.MYI +t1=P=p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD +t1=P=p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI +t1=P=p2.MYD +t1=P=p2.MYI INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10); # Renaming to a file name where the first partition is 250 chars # and the second partition is 350 chars @@ -21,14 +21,14 @@ Got one of the listed errors # List of files in database `test`, should not be any t2-files here # List of files in database `test`, should be all t1-files here -t1#P#p0.MYD -t1#P#p0.MYI -t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD -t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI -t1#P#p2.MYD -t1#P#p2.MYI t1.frm t1.par +t1=P=p0.MYD +t1=P=p0.MYI +t1=P=p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD +t1=P=p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI +t1=P=p2.MYD +t1=P=p2.MYI SELECT * FROM t1; a 1 @@ -42,28 +42,28 @@ 8 9 # List of files in database `test`, should be all t1-files here -t1#P#p0.MYD -t1#P#p0.MYI -t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD -t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI -t1#P#p2.MYD -t1#P#p2.MYI t1.frm t1.par +t1=P=p0.MYD +t1=P=p0.MYI +t1=P=p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD +t1=P=p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI +t1=P=p2.MYD +t1=P=p2.MYI # Renaming to a file name where the first partition is 156 chars # and the second partition is 256 chars RENAME TABLE t1 TO `t2_............................_end`; Got one of the listed errors # List of files in database `test`, should not be any t2-files here # List of files in database `test`, should be all t1-files here -t1#P#p0.MYD -t1#P#p0.MYI -t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD -t1#P#p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI -t1#P#p2.MYD -t1#P#p2.MYI t1.frm t1.par +t1=P=p0.MYD +t1=P=p0.MYI +t1=P=p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYD +t1=P=p1@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e@002e.MYI +t1=P=p2.MYD +t1=P=p2.MYI SELECT * FROM t1; a 1 diff -ur porting_base.2.0/mysql/mysql-test/r/partition_range.result rebuild.2.0/mysql/mysql-test/r/partition_range.result --- porting_base.2.0/mysql/mysql-test/r/partition_range.result Thu Jun 3 12:18:18 2010 +++ rebuild.2.0/mysql/mysql-test/r/partition_range.result Tue Mar 8 12:59:24 2011 @@ -11,7 +11,7 @@ INSERT INTO t1 VALUES (0, 580092), (3, 894076), (4, 805483), (4, 913540), (6, 611137), (8, 171602), (9, 599495), (9, 746305), (10, 272829), (10, 847519), (12, 258869), (12, 929028), (13, 288970), (15, 20971), (15, 105839), (16, 788272), (17, 76914), (18, 827274), (19, 802258), (20, 123677), (20, 587729), (22, 701449), (25, 31565), (25, 230782), (25, 442887), (25, 733139), (25, 851020); EXPLAIN SELECT a, MAX(b) FROM t1 WHERE a IN (10, 100, 3) GROUP BY a; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range a a 5 NULL 4 Using where; Using index +1 SIMPLE t1 range a a 5 NULL 1 Using where; Using index for group-by DROP TABLE t1; create table t1 (a int) partition by range (a) diff -ur porting_base.2.0/mysql/mysql-test/r/ps_1general.result rebuild.2.0/mysql/mysql-test/r/ps_1general.result --- porting_base.2.0/mysql/mysql-test/r/ps_1general.result Thu Jun 3 12:18:19 2010 +++ rebuild.2.0/mysql/mysql-test/r/ps_1general.result Mon Nov 8 13:10:52 2010 @@ -531,7 +531,7 @@ prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ; create table t5 (a int) ; execute stmt1 ; -ERROR HY000: Can't find file: './test/t7' (errno: 2) +ERROR HY000: Can't find file: './test/t7' (errno: 5002) create table t7 (a int) ; execute stmt1 ; execute stmt1 ; diff -ur porting_base.2.0/mysql/mysql-test/r/renamedb.result rebuild.2.0/mysql/mysql-test/r/renamedb.result --- porting_base.2.0/mysql/mysql-test/r/renamedb.result Thu Jun 3 12:18:20 2010 +++ rebuild.2.0/mysql/mysql-test/r/renamedb.result Mon Nov 8 13:11:09 2010 @@ -2,11 +2,11 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'database testdb1 to testdb2' at line 1 ALTER DATABASE wrong UPGRADE DATA DIRECTORY NAME; ERROR HY000: Incorrect usage of ALTER DATABASE UPGRADE DATA DIRECTORY NAME and name -ALTER DATABASE `#mysql41#not-supported` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql41=not-supported` UPGRADE DATA DIRECTORY NAME; ERROR HY000: Incorrect usage of ALTER DATABASE UPGRADE DATA DIRECTORY NAME and name -ALTER DATABASE `#mysql51#not-yet` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql51=not-yet` UPGRADE DATA DIRECTORY NAME; ERROR HY000: Incorrect usage of ALTER DATABASE UPGRADE DATA DIRECTORY NAME and name -ALTER DATABASE `#mysql50#` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Incorrect database name '#mysql50#' -ALTER DATABASE `#mysql50#upgrade-me` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Unknown database '#mysql50#upgrade-me' +ALTER DATABASE `=mysql50=` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Incorrect database name '=mysql50=' +ALTER DATABASE `=mysql50=upgrade-me` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Unknown database '=mysql50=upgrade-me' diff -ur porting_base.2.0/mysql/mysql-test/r/repair.result rebuild.2.0/mysql/mysql-test/r/repair.result --- porting_base.2.0/mysql/mysql-test/r/repair.result Thu Jun 3 12:18:20 2010 +++ rebuild.2.0/mysql/mysql-test/r/repair.result Tue Mar 8 12:59:27 2011 @@ -75,15 +75,17 @@ ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'); Warnings: Error 1034 myisam_sort_buffer_size is too small -Error 1034 Number of rows changed from 0 to 157 +Error 1034 Number of rows changed from 0 to 177 SET myisam_repair_threads=2; REPAIR TABLE t1; Table Op Msg_type Msg_text test.t1 repair error myisam_sort_buffer_size is too small -test.t1 repair warning Number of rows changed from 0 to 157 +test.t1 repair warning Number of rows changed from 0 to 177 test.t1 repair status OK SET myisam_repair_threads=@@global.myisam_repair_threads; SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; @@ -118,7 +120,7 @@ # Test with a saved table from 4.1 SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 MyISAM 9 Fixed 2 5 10 21474836479 1024 0 NULL # # NULL latin1_swedish_ci NULL +t1 MyISAM 9 Fixed 2 5 10 2147483647 1024 0 NULL # # NULL latin1_swedish_ci NULL SELECT * FROM t1; id 1 @@ -137,7 +139,7 @@ test.t1 repair status OK SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 MyISAM 10 Fixed 2 7 14 1970324836974591 1024 0 NULL # # NULL latin1_swedish_ci NULL +t1 MyISAM 10 Fixed 2 7 14 2147483647 1024 0 NULL # # NULL latin1_swedish_ci NULL SELECT * FROM t1; id 1 diff -ur porting_base.2.0/mysql/mysql-test/r/show_check.result rebuild.2.0/mysql/mysql-test/r/show_check.result --- porting_base.2.0/mysql/mysql-test/r/show_check.result Thu Jun 3 12:18:21 2010 +++ rebuild.2.0/mysql/mysql-test/r/show_check.result Mon Nov 8 13:10:32 2010 @@ -1335,7 +1335,7 @@ été BASE TABLE drop table `été`; set names latin1; -show columns from `#mysql50#????????`; +show columns from `=mysql50=*`; Got one of the listed errors DROP TABLE IF EXISTS t1; DROP PROCEDURE IF EXISTS p1; diff -ur porting_base.2.0/mysql/mysql-test/r/sp-error.result rebuild.2.0/mysql/mysql-test/r/sp-error.result --- porting_base.2.0/mysql/mysql-test/r/sp-error.result Thu Jun 3 12:18:21 2010 +++ rebuild.2.0/mysql/mysql-test/r/sp-error.result Mon Nov 8 13:11:52 2010 @@ -1486,12 +1486,12 @@ drop function if exists func_28360; CREATE PROCEDURE proc_28360() BEGIN -ALTER DATABASE `#mysql50#upgrade-me` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=upgrade-me` UPGRADE DATA DIRECTORY NAME; END// ERROR HY000: Can't drop or alter a DATABASE from within another stored routine CREATE FUNCTION func_28360() RETURNS int BEGIN -ALTER DATABASE `#mysql50#upgrade-me` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=upgrade-me` UPGRADE DATA DIRECTORY NAME; RETURN 0; END// ERROR HY000: Can't drop or alter a DATABASE from within another stored routine diff -ur porting_base.2.0/mysql/mysql-test/r/sp.result rebuild.2.0/mysql/mysql-test/r/sp.result --- porting_base.2.0/mysql/mysql-test/r/sp.result Thu Jun 3 12:18:22 2010 +++ rebuild.2.0/mysql/mysql-test/r/sp.result Tue Nov 30 14:02:33 2010 @@ -5293,12 +5293,12 @@ The following should succeed. DROP PROCEDURE bug21414| set names utf8| -drop database if exists това_е_дълго_име_за_база_данни_нали| -create database това_е_дълго_име_за_база_данни_нали| -INSERT INTO mysql.proc VALUES ('това_е_дълго_име_за_база_данни_нали','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','PROCEDURE','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','SQL','CONTAINS_SQL','NO','DEFINER','','','bad_body','root@localhost',now(), now(),'','', 'utf8', 'utf8_general_ci', 'utf8_general_ci', 'n/a')| -call това_е_дълго_име_за_база_данни_нали.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго()| -ERROR HY000: Failed to load routine това_е_дълго_име_за_база_данни_нали.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6) -drop database това_е_дълго_име_за_база_данни_нали| +drop database if exists това| +create database това| +INSERT INTO mysql.proc VALUES ('това','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','PROCEDURE','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','SQL','CONTAINS_SQL','NO','DEFINER','','','bad_body','root@localhost',now(), now(),'','', 'utf8', 'utf8_general_ci', 'utf8_general_ci', 'n/a')| +call това.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго()| +ERROR HY000: Failed to load routine това.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6) +drop database това| CREATE TABLE t3 ( Member_ID varchar(15) NOT NULL, PRIMARY KEY (Member_ID) diff -ur porting_base.2.0/mysql/mysql-test/r/symlink.result rebuild.2.0/mysql/mysql-test/r/symlink.result --- porting_base.2.0/mysql/mysql-test/r/symlink.result Thu Jun 3 12:18:23 2010 +++ rebuild.2.0/mysql/mysql-test/r/symlink.result Mon Nov 8 13:11:40 2010 @@ -113,7 +113,7 @@ DATA DIRECTORY='TEST_DIR/tmp' INDEX DIRECTORY='TEST_DIR/tmp'; RENAME TABLE t2 TO t1; -ERROR HY000: Can't create/write to file 'TEST_DIR/tmp/t1.MYI' (Errcode: 17) +ERROR HY000: Can't create/write to file 'TEST_DIR/tmp/t1.MYI' (Errcode: 5017) DROP TABLE t2; create temporary table t1 (a int) engine=myisam data directory="MYSQLTEST_VARDIR/log" select 9 a; show create table t1; @@ -160,7 +160,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1(a INT) INDEX DIRECTORY='TEST_DIR/master-data_var'; -ERROR HY000: Can't create/write to file 'TEST_DIR/master-data_var/t1.MYI' (Errcode: 2) +ERROR HY000: Can't create/write to file 'TEST_DIR/master-data_var/t1.MYI' (Errcode: 5002) SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE='NO_DIR_IN_CREATE'; CREATE TABLE t1(a INT) DATA DIRECTORY='MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY='MYSQLTEST_VARDIR/tmp'; Warnings: diff -ur porting_base.2.0/mysql/mysql-test/r/trigger.result rebuild.2.0/mysql/mysql-test/r/trigger.result --- porting_base.2.0/mysql/mysql-test/r/trigger.result Thu Jun 3 12:18:24 2010 +++ rebuild.2.0/mysql/mysql-test/r/trigger.result Mon Nov 8 13:10:48 2010 @@ -968,7 +968,7 @@ test t1_bi test t1 set @a:=new.id test t1_ai test t1 set @b:=new.id rename table t1 to t2; -ERROR HY000: Can't create/write to file './test/t1_ai.TRN~' (Errcode: 13) +ERROR HY000: Can't create/write to file './test/t1_ai.TRN~' (Errcode: 5013) insert into t1 values (102); select @a, @b; @a @b diff -ur porting_base.2.0/mysql/mysql-test/r/upgrade.result rebuild.2.0/mysql/mysql-test/r/upgrade.result --- porting_base.2.0/mysql/mysql-test/r/upgrade.result Thu Jun 3 12:18:25 2010 +++ rebuild.2.0/mysql/mysql-test/r/upgrade.result Mon Nov 8 13:12:03 2010 @@ -1,27 +1,27 @@ drop database if exists `mysqltest1`; drop database if exists `mysqltest-1`; -drop database if exists `#mysql50#mysqltest-1`; +drop database if exists `=mysql50=mysqltest-1`; create database `mysqltest1`; -create database `#mysql50#mysqltest-1`; +create database `=mysql50=mysqltest-1`; create table `mysqltest1`.`t1` (a int); -create table `mysqltest1`.`#mysql50#t-1` (a int); -create table `#mysql50#mysqltest-1`.`t1` (a int); -create table `#mysql50#mysqltest-1`.`#mysql50#t-1` (a int); +create table `mysqltest1`.`=mysql50=t-1` (a int); +create table `=mysql50=mysqltest-1`.`t1` (a int); +create table `=mysql50=mysqltest-1`.`=mysql50=t-1` (a int); show create database `mysqltest1`; Database Create Database mysqltest1 CREATE DATABASE `mysqltest1` /*!40100 DEFAULT CHARACTER SET latin1 */ show create database `mysqltest-1`; ERROR 42000: Unknown database 'mysqltest-1' -show create database `#mysql50#mysqltest-1`; +show create database `=mysql50=mysqltest-1`; Database Create Database -#mysql50#mysqltest-1 CREATE DATABASE `#mysql50#mysqltest-1` /*!40100 DEFAULT CHARACTER SET latin1 */ +=mysql50=mysqltest-1 CREATE DATABASE `=mysql50=mysqltest-1` /*!40100 DEFAULT CHARACTER SET latin1 */ show tables in `mysqltest1`; Tables_in_mysqltest1 -#mysql50#t-1 +=mysql50=t-1 t1 -show tables in `#mysql50#mysqltest-1`; -Tables_in_#mysql50#mysqltest-1 -#mysql50#t-1 +show tables in `=mysql50=mysqltest-1`; +Tables_in_=mysql50=mysqltest-1 +=mysql50=t-1 t1 show create database `mysqltest1`; Database Create Database @@ -29,8 +29,8 @@ show create database `mysqltest-1`; Database Create Database mysqltest-1 CREATE DATABASE `mysqltest-1` /*!40100 DEFAULT CHARACTER SET latin1 */ -show create database `#mysql50#mysqltest-1`; -ERROR 42000: Unknown database '#mysql50#mysqltest-1' +show create database `=mysql50=mysqltest-1`; +ERROR 42000: Unknown database '=mysql50=mysqltest-1' show tables in `mysqltest1`; Tables_in_mysqltest1 t1 @@ -41,22 +41,22 @@ t-1 drop database `mysqltest1`; drop database `mysqltest-1`; -drop table if exists `txu@0023p@0023p1`; -drop table if exists `txu#p#p1`; -create table `txu#p#p1` (s1 int); -insert into `txu#p#p1` values (1); -select * from `txu@0023p@0023p1`; -ERROR 42S02: Table 'test.txu@0023p@0023p1' doesn't exist -create table `txu@0023p@0023p1` (s1 int); -insert into `txu@0023p@0023p1` values (2); -select * from `txu@0023p@0023p1`; +drop table if exists `txu@003Dp@003Dp1`; +drop table if exists `txu=p=p1`; +create table `txu=p=p1` (s1 int); +insert into `txu=p=p1` values (1); +select * from `txu@003Dp@003Dp1`; +ERROR 42S02: Table 'test.txu@003Dp@003Dp1' doesn't exist +create table `txu@003Dp@003Dp1` (s1 int); +insert into `txu@003Dp@003Dp1` values (2); +select * from `txu@003Dp@003Dp1`; s1 2 -select * from `txu#p#p1`; +select * from `txu=p=p1`; s1 1 -drop table `txu@0023p@0023p1`; -drop table `txu#p#p1`; +drop table `txu@003Dp@003Dp1`; +drop table `txu=p=p1`; # # Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 # @@ -78,8 +78,8 @@ FLUSH TABLES; show databases like '%a-b-c%'; Database (%a-b-c%) -#mysql50#a-b-c -ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME; +=mysql50=a-b-c +ALTER DATABASE `=mysql50=a-b-c` UPGRADE DATA DIRECTORY NAME; show databases like '%a-b-c%'; Database (%a-b-c%) a-b-c @@ -96,12 +96,12 @@ ) ENGINE=MyISAM DEFAULT CHARSET=latin2 drop database `a-b-c`; drop database `tabc`; -use `#mysql50#a-b-c`; +use `=mysql50=a-b-c`; create table t1(f1 char(10)); show databases like '%a-b-c%'; Database (%a-b-c%) -#mysql50#a-b-c -ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME; +=mysql50=a-b-c +ALTER DATABASE `=mysql50=a-b-c` UPGRADE DATA DIRECTORY NAME; show databases like '%a-b-c%'; Database (%a-b-c%) a-b-c @@ -117,26 +117,26 @@ # Bug #53804: serious flaws in the alter database .. upgrade data # directory name command # -ALTER DATABASE `#mysql50#:` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Unknown database '#mysql50#:' -ALTER DATABASE `#mysql50#.` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Incorrect database name '#mysql50#.' -ALTER DATABASE `#mysql50#../` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Incorrect database name '#mysql50#../' -ALTER DATABASE `#mysql50#../..` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Incorrect database name '#mysql50#../..' -ALTER DATABASE `#mysql50#../../` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Incorrect database name '#mysql50#../../' -ALTER DATABASE `#mysql50#./blablabla` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Incorrect database name '#mysql50#./blablabla' -ALTER DATABASE `#mysql50#../blablabla` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Incorrect database name '#mysql50#../blablabla' -ALTER DATABASE `#mysql50#/` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Incorrect database name '#mysql50#/' -ALTER DATABASE `#mysql50#/.` UPGRADE DATA DIRECTORY NAME; -ERROR 42000: Incorrect database name '#mysql50#/.' -USE `#mysql50#.`; -ERROR 42000: Incorrect database name '#mysql50#.' -USE `#mysql50#../blablabla`; -ERROR 42000: Incorrect database name '#mysql50#../blablabla' +ALTER DATABASE `=mysql50=:` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Unknown database '=mysql50=:' +ALTER DATABASE `=mysql50=.` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Incorrect database name '=mysql50=.' +ALTER DATABASE `=mysql50=../` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Incorrect database name '=mysql50=../' +ALTER DATABASE `=mysql50=../..` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Incorrect database name '=mysql50=../..' +ALTER DATABASE `=mysql50=../../` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Incorrect database name '=mysql50=../../' +ALTER DATABASE `=mysql50=./blablabla` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Incorrect database name '=mysql50=./blablabla' +ALTER DATABASE `=mysql50=../blablabla` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Incorrect database name '=mysql50=../blablabla' +ALTER DATABASE `=mysql50=/` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Incorrect database name '=mysql50=/' +ALTER DATABASE `=mysql50=/.` UPGRADE DATA DIRECTORY NAME; +ERROR 42000: Incorrect database name '=mysql50=/.' +USE `=mysql50=.`; +ERROR 42000: Incorrect database name '=mysql50=.' +USE `=mysql50=../blablabla`; +ERROR 42000: Incorrect database name '=mysql50=../blablabla' # End of 5.1 tests diff -ur porting_base.2.0/mysql/mysql-test/r/variables.result rebuild.2.0/mysql/mysql-test/r/variables.result --- porting_base.2.0/mysql/mysql-test/r/variables.result Thu Jun 3 12:18:26 2010 +++ rebuild.2.0/mysql/mysql-test/r/variables.result Tue Mar 8 12:59:24 2011 @@ -650,7 +650,7 @@ ERROR HY000: Variable 'ft_boolean_syntax' is a GLOBAL variable and should be set with SET GLOBAL set global ft_boolean_syntax = @@init_connect; ERROR 42000: Variable 'ft_boolean_syntax' can't be set to the value of '' -set global myisam_max_sort_file_size=4294967296; +set global myisam_max_sort_file_size=2145386496; show global variables like 'myisam_max_sort_file_size'; Variable_name Value myisam_max_sort_file_size MAX_FILE_SIZE diff -ur porting_base.2.0/mysql/mysql-test/suite/engines/funcs/r/rpl_temporary.result rebuild.2.0/mysql/mysql-test/suite/engines/funcs/r/rpl_temporary.result --- porting_base.2.0/mysql/mysql-test/suite/engines/funcs/r/rpl_temporary.result Thu Jun 3 12:20:57 2010 +++ rebuild.2.0/mysql/mysql-test/suite/engines/funcs/r/rpl_temporary.result Mon Nov 8 13:17:17 2010 @@ -90,11 +90,11 @@ set @@session.pseudo_thread_id=200; create temporary table t201 (id int); create temporary table `t``201` (id int); -create temporary table `#sql_not_user_table202` (id int); +create temporary table `=sql_not_user_table202` (id int); set @@session.pseudo_thread_id=300; create temporary table t301 (id int); create temporary table t302 (id int); -create temporary table `#sql_not_user_table303` (id int); +create temporary table `=sql_not_user_table303` (id int); DROP USER ''@localhost; create table t1(f int); insert into t1 values (1); diff -ur porting_base.2.0/mysql/mysql-test/suite/engines/funcs/t/rpl_temporary.test rebuild.2.0/mysql/mysql-test/suite/engines/funcs/t/rpl_temporary.test --- porting_base.2.0/mysql/mysql-test/suite/engines/funcs/t/rpl_temporary.test Thu Jun 3 12:21:15 2010 +++ rebuild.2.0/mysql/mysql-test/suite/engines/funcs/t/rpl_temporary.test Mon Nov 8 13:18:26 2010 @@ -174,11 +174,11 @@ create temporary table t201 (id int); create temporary table `t``201` (id int); # emulate internal temp table not to come to binlog -create temporary table `#sql_not_user_table202` (id int); +create temporary table `=sql_not_user_table202` (id int); set @@session.pseudo_thread_id=300; create temporary table t301 (id int); create temporary table t302 (id int); -create temporary table `#sql_not_user_table303` (id int); +create temporary table `=sql_not_user_table303` (id int); #Added on 2007/5/18 diff -ur porting_base.2.0/mysql/mysql-test/suite/innodb/r/innodb_bug21704.result rebuild.2.0/mysql/mysql-test/suite/innodb/r/innodb_bug21704.result --- porting_base.2.0/mysql/mysql-test/suite/innodb/r/innodb_bug21704.result Thu Jun 3 12:20:44 2010 +++ rebuild.2.0/mysql/mysql-test/suite/innodb/r/innodb_bug21704.result Mon Nov 8 13:18:32 2010 @@ -22,7 +22,7 @@ # Test renaming the column in the referenced table. ALTER TABLE t1 CHANGE a c INT; -ERROR HY000: Error on rename of '#sql-temporary' to './test/t1' (errno: 150) +ERROR HY000: Error on rename of '=sql-temporary' to './test/t1' (errno: 150) # Ensure that online column rename works. ALTER TABLE t1 CHANGE b c INT; affected rows: 3 @@ -31,7 +31,7 @@ # Test renaming the column in the referencing table ALTER TABLE t2 CHANGE a c INT; -ERROR HY000: Error on rename of '#sql-temporary' to './test/t2' (errno: 150) +ERROR HY000: Error on rename of '=sql-temporary' to './test/t2' (errno: 150) # Ensure that online column rename works. ALTER TABLE t2 CHANGE b c INT; affected rows: 3 @@ -40,9 +40,9 @@ # Test with self-referential constraints ALTER TABLE t3 CHANGE a d INT; -ERROR HY000: Error on rename of '#sql-temporary' to './test/t3' (errno: 150) +ERROR HY000: Error on rename of '=sql-temporary' to './test/t3' (errno: 150) ALTER TABLE t3 CHANGE b d INT; -ERROR HY000: Error on rename of '#sql-temporary' to './test/t3' (errno: 150) +ERROR HY000: Error on rename of '=sql-temporary' to './test/t3' (errno: 150) # Ensure that online column rename works. ALTER TABLE t3 CHANGE c d INT; affected rows: 3 diff -ur porting_base.2.0/mysql/mysql-test/suite/innodb/r/innodb_bug46000.result rebuild.2.0/mysql/mysql-test/suite/innodb/r/innodb_bug46000.result --- porting_base.2.0/mysql/mysql-test/suite/innodb/r/innodb_bug46000.result Thu Jun 3 12:20:45 2010 +++ rebuild.2.0/mysql/mysql-test/suite/innodb/r/innodb_bug46000.result Mon Nov 8 13:18:32 2010 @@ -8,10 +8,10 @@ Error 1005 Can't create table 'test.bug46000' (errno: -1) create table bug46000(id int) engine=innodb; create index GEN_CLUST_INDEX on bug46000(id); -ERROR HY000: Can't create table '#sql-temporary' (errno: -1) +ERROR HY000: Can't create table '=sql-temporary' (errno: -1) show warnings; Level Code Message Warning 1005 Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index. -Error 1005 Can't create table '#sql-temporary' (errno: -1) +Error 1005 Can't create table '=sql-temporary' (errno: -1) create index idx on bug46000(id); drop table bug46000; diff -ur porting_base.2.0/mysql/mysql-test/suite/innodb/r/innodb_misc1.result rebuild.2.0/mysql/mysql-test/suite/innodb/r/innodb_misc1.result --- porting_base.2.0/mysql/mysql-test/suite/innodb/r/innodb_misc1.result Thu Jun 3 12:20:45 2010 +++ rebuild.2.0/mysql/mysql-test/suite/innodb/r/innodb_misc1.result Mon Nov 8 13:18:32 2010 @@ -726,7 +726,7 @@ INSERT INTO t2 VALUES (1); ALTER TABLE t2 ADD FOREIGN KEY (a) REFERENCES t1 (a) ON DELETE SET NULL; ALTER TABLE t2 MODIFY a INT NOT NULL; -ERROR HY000: Error on rename of '#sql-temporary' to './test/t2' (errno: 150) +ERROR HY000: Error on rename of '=sql-temporary' to './test/t2' (errno: 150) DELETE FROM t1; DROP TABLE t2,t1; CREATE TABLE t1 (a VARCHAR(5) COLLATE utf8_unicode_ci PRIMARY KEY) diff -ur porting_base.2.0/mysql/mysql-test/suite/innodb/t/innodb_bug21704.test rebuild.2.0/mysql/mysql-test/suite/innodb/t/innodb_bug21704.test --- porting_base.2.0/mysql/mysql-test/suite/innodb/t/innodb_bug21704.test Thu Jun 3 12:20:42 2010 +++ rebuild.2.0/mysql/mysql-test/suite/innodb/t/innodb_bug21704.test Mon Nov 8 13:18:34 2010 @@ -34,7 +34,7 @@ --echo # mysqltest first does replace_regex, then replace_result ---replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/ +--replace_regex /'[^']*test\/=sql-[0-9a-f_]*'/'=sql-temporary'/ # Embedded server doesn't chdir to data directory --replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' --error ER_ERROR_ON_RENAME @@ -51,7 +51,7 @@ --echo # mysqltest first does replace_regex, then replace_result ---replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/ +--replace_regex /'[^']*test\/=sql-[0-9a-f_]*'/'=sql-temporary'/ # Embedded server doesn't chdir to data directory --replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' --error ER_ERROR_ON_RENAME @@ -68,14 +68,14 @@ --echo # mysqltest first does replace_regex, then replace_result ---replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/ +--replace_regex /'[^']*test\/=sql-[0-9a-f_]*'/'=sql-temporary'/ # Embedded server doesn't chdir to data directory --replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' --error ER_ERROR_ON_RENAME ALTER TABLE t3 CHANGE a d INT; # mysqltest first does replace_regex, then replace_result ---replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/ +--replace_regex /'[^']*test\/=sql-[0-9a-f_]*'/'=sql-temporary'/ # Embedded server doesn't chdir to data directory --replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' --error ER_ERROR_ON_RENAME diff -ur porting_base.2.0/mysql/mysql-test/suite/innodb/t/innodb_bug46000.test rebuild.2.0/mysql/mysql-test/suite/innodb/t/innodb_bug46000.test --- porting_base.2.0/mysql/mysql-test/suite/innodb/t/innodb_bug46000.test Thu Jun 3 12:20:43 2010 +++ rebuild.2.0/mysql/mysql-test/suite/innodb/t/innodb_bug46000.test Mon Nov 8 13:18:35 2010 @@ -19,11 +19,11 @@ create table bug46000(id int) engine=innodb; # This 'create index' operation should fail. ---replace_regex /'[^']*test.#sql-[0-9a-f_]*'/'#sql-temporary'/ +--replace_regex /'[^']*test.=sql-[0-9a-f_]*'/'=sql-temporary'/ --error ER_CANT_CREATE_TABLE create index GEN_CLUST_INDEX on bug46000(id); ---replace_regex /'[^']*test.#sql-[0-9a-f_]*'/'#sql-temporary'/ +--replace_regex /'[^']*test.=sql-[0-9a-f_]*'/'=sql-temporary'/ show warnings; # This 'create index' operation should succeed, no diff -ur porting_base.2.0/mysql/mysql-test/suite/innodb/t/innodb_misc1.test rebuild.2.0/mysql/mysql-test/suite/innodb/t/innodb_misc1.test --- porting_base.2.0/mysql/mysql-test/suite/innodb/t/innodb_misc1.test Thu Jun 3 12:20:44 2010 +++ rebuild.2.0/mysql/mysql-test/suite/innodb/t/innodb_misc1.test Mon Nov 8 13:18:34 2010 @@ -978,7 +978,7 @@ INSERT INTO t2 VALUES (1); ALTER TABLE t2 ADD FOREIGN KEY (a) REFERENCES t1 (a) ON DELETE SET NULL; # mysqltest first does replace_regex, then replace_result ---replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/ +--replace_regex /'[^']*test\/=sql-[0-9a-f_]*'/'=sql-temporary'/ # Embedded server doesn't chdir to data directory --replace_result $MYSQLD_DATADIR ./ master-data/ '' --error 1025 diff -ur porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_EE_err.result rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_EE_err.result --- porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_EE_err.result Thu Jun 3 12:19:34 2010 +++ rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_EE_err.result Mon Nov 8 13:19:57 2010 @@ -8,4 +8,4 @@ flush tables; drop table if exists t1; Warnings: -Error 2 Can't find file: 't1' (errno: 2) +Error 5002 Can't find file: 't1' (errno: 5002) diff -ur porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_drop_db.result rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_drop_db.result --- porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_drop_db.result Thu Jun 3 12:19:36 2010 +++ rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_drop_db.result Mon Nov 8 13:19:54 2010 @@ -12,12 +12,12 @@ create table mysqltest1.t2 (n int); create table mysqltest1.t3 (n int); drop database mysqltest1; -ERROR HY000: Error dropping database (can't rmdir './mysqltest1/', errno: 17) +ERROR HY000: Error dropping database (can't rmdir './mysqltest1/', errno: 5017) use mysqltest1; show tables; Tables_in_mysqltest1 drop database mysqltest1; -ERROR HY000: Error dropping database (can't rmdir './mysqltest1/', errno: 17) +ERROR HY000: Error dropping database (can't rmdir './mysqltest1/', errno: 5017) use mysqltest1; show tables; Tables_in_mysqltest1 diff -ur porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result --- porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result Thu Jun 3 12:19:39 2010 +++ rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result Mon Nov 8 13:19:58 2010 @@ -4,10 +4,10 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -DROP DATABASE IF EXISTS `#mysql50#mysqltest-1`; -CREATE DATABASE `#mysql50#mysqltest-1`; +DROP DATABASE IF EXISTS `=mysql50=mysqltest-1`; +CREATE DATABASE `=mysql50=mysqltest-1`; Master position is not changed STOP SLAVE SQL_THREAD; Master position has been changed DROP DATABASE `mysqltest-1`; -DROP DATABASE `#mysql50#mysqltest-1`; +DROP DATABASE `=mysql50=mysqltest-1`; diff -ur porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_packet.result rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_packet.result --- porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_packet.result Thu Jun 3 12:19:40 2010 +++ rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_packet.result Fri Apr 15 13:03:46 2011 @@ -6,8 +6,8 @@ start slave; call mtr.add_suppression("Slave I/O: Got a packet bigger than 'max_allowed_packet' bytes, Error_code: 1153"); call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log:"); -drop database if exists DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________; -create database DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________; +drop database if exists DB_NAME_OF_MAX_LENGTH___________; +create database DB_NAME_OF_MAX_LENGTH___________; SET @@global.max_allowed_packet=1024; SET @@global.net_buffer_length=1024; include/stop_slave.inc @@ -17,7 +17,7 @@ 1024 1024 create table `t1` (`f1` LONGTEXT) ENGINE=MyISAM; INSERT INTO `t1`(`f1`) VALUES ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1023'); -select count(*) from `DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________`.`t1` /* must be 1 */; +select count(*) from `DB_NAME_OF_MAX_LENGTH___________`.`t1` /* must be 1 */; count(*) 1 SHOW STATUS LIKE 'Slave_running'; @@ -26,7 +26,7 @@ select * from information_schema.session_status where variable_name= 'SLAVE_RUNNING'; VARIABLE_NAME VARIABLE_VALUE SLAVE_RUNNING ON -drop database DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________; +drop database DB_NAME_OF_MAX_LENGTH___________; SET @@global.max_allowed_packet=4096; SET @@global.net_buffer_length=4096; include/stop_slave.inc diff -ur porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_temporary.result rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_temporary.result --- porting_base.2.0/mysql/mysql-test/suite/rpl/r/rpl_temporary.result Thu Jun 3 12:19:45 2010 +++ rebuild.2.0/mysql/mysql-test/suite/rpl/r/rpl_temporary.result Mon Nov 8 13:19:55 2010 @@ -114,11 +114,11 @@ set @@session.pseudo_thread_id=200; create temporary table t201 (id int); create temporary table `t``201` (id int); -create temporary table `#sql_not_user_table202` (id int); +create temporary table `=sql_not_user_table202` (id int); set @@session.pseudo_thread_id=300; create temporary table t301 (id int); create temporary table t302 (id int); -create temporary table `#sql_not_user_table303` (id int); +create temporary table `=sql_not_user_table303` (id int); create table t1(f int); insert into t1 values (1); select * from t1 /* must be 1 */; diff -ur porting_base.2.0/mysql/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test rebuild.2.0/mysql/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test --- porting_base.2.0/mysql/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test Thu Jun 3 12:19:54 2010 +++ rebuild.2.0/mysql/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test Mon Nov 8 13:20:47 2010 @@ -12,8 +12,8 @@ connection master; --disable_warnings -DROP DATABASE IF EXISTS `#mysql50#mysqltest-1`; -CREATE DATABASE `#mysql50#mysqltest-1`; +DROP DATABASE IF EXISTS `=mysql50=mysqltest-1`; +CREATE DATABASE `=mysql50=mysqltest-1`; --enable_warnings sync_slave_with_master; @@ -53,4 +53,4 @@ DROP DATABASE `mysqltest-1`; connection slave; -DROP DATABASE `#mysql50#mysqltest-1`; +DROP DATABASE `=mysql50=mysqltest-1`; diff -ur porting_base.2.0/mysql/mysql-test/suite/rpl/t/rpl_packet.test rebuild.2.0/mysql/mysql-test/suite/rpl/t/rpl_packet.test --- porting_base.2.0/mysql/mysql-test/suite/rpl/t/rpl_packet.test Thu Jun 3 12:19:55 2010 +++ rebuild.2.0/mysql/mysql-test/suite/rpl/t/rpl_packet.test Fri Apr 15 13:03:51 2011 @@ -9,7 +9,7 @@ call mtr.add_suppression("Slave I/O: Got a packet bigger than 'max_allowed_packet' bytes, Error_code: 1153"); call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log:"); -let $db= DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________; +let $db= DB_NAME_OF_MAX_LENGTH___________; disable_warnings; eval drop database if exists $db; enable_warnings; @@ -30,7 +30,7 @@ disconnect master; # alas, can't use eval here; if db name changed apply the change here -connect (master,localhost,root,,DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________); +connect (master,localhost,root,,DB_NAME_OF_MAX_LENGTH___________); connection master; select @@net_buffer_length, @@max_allowed_packet; diff -ur porting_base.2.0/mysql/mysql-test/suite/rpl/t/rpl_temporary.test rebuild.2.0/mysql/mysql-test/suite/rpl/t/rpl_temporary.test --- porting_base.2.0/mysql/mysql-test/suite/rpl/t/rpl_temporary.test Thu Jun 3 12:20:07 2010 +++ rebuild.2.0/mysql/mysql-test/suite/rpl/t/rpl_temporary.test Mon Nov 8 13:20:47 2010 @@ -253,11 +253,11 @@ create temporary table t201 (id int); create temporary table `t``201` (id int); # emulate internal temp table not to come to binlog -create temporary table `#sql_not_user_table202` (id int); +create temporary table `=sql_not_user_table202` (id int); set @@session.pseudo_thread_id=300; create temporary table t301 (id int); create temporary table t302 (id int); -create temporary table `#sql_not_user_table303` (id int); +create temporary table `=sql_not_user_table303` (id int); disconnect con1; #now do something to show that slave is ok after DROP temp tables diff -ur porting_base.2.0/mysql/mysql-test/t/alter_table.test rebuild.2.0/mysql/mysql-test/t/alter_table.test --- porting_base.2.0/mysql/mysql-test/t/alter_table.test Thu Jun 3 12:17:29 2010 +++ rebuild.2.0/mysql/mysql-test/t/alter_table.test Mon Nov 8 13:15:31 2010 @@ -842,31 +842,31 @@ DROP TABLE `tt+1`, `tt+2`; # # Check if special characters as in tmp_file_prefix work. -CREATE TABLE `#sql1` (c1 INT); -CREATE TABLE `@0023sql2` (c1 INT); +CREATE TABLE `=sql1` (c1 INT); +CREATE TABLE `@003Dsql2` (c1 INT); SHOW TABLES; -RENAME TABLE `#sql1` TO `@0023sql1`; -RENAME TABLE `@0023sql2` TO `#sql2`; +RENAME TABLE `=sql1` TO `@003Dsql1`; +RENAME TABLE `@003Dsql2` TO `=sql2`; SHOW TABLES; -ALTER TABLE `@0023sql1` RENAME `#sql-1`; -ALTER TABLE `#sql2` RENAME `@0023sql-2`; +ALTER TABLE `@003Dsql1` RENAME `=sql-1`; +ALTER TABLE `=sql2` RENAME `@003Dsql-2`; SHOW TABLES; -INSERT INTO `#sql-1` VALUES (1); -INSERT INTO `@0023sql-2` VALUES (2); -DROP TABLE `#sql-1`, `@0023sql-2`; +INSERT INTO `=sql-1` VALUES (1); +INSERT INTO `@003Dsql-2` VALUES (2); +DROP TABLE `=sql-1`, `@003Dsql-2`; # # Same for temporary tables though these names do not become file names. -CREATE TEMPORARY TABLE `#sql1` (c1 INT); -CREATE TEMPORARY TABLE `@0023sql2` (c1 INT); +CREATE TEMPORARY TABLE `=sql1` (c1 INT); +CREATE TEMPORARY TABLE `@003Dsql2` (c1 INT); SHOW TABLES; -ALTER TABLE `#sql1` RENAME `@0023sql1`; -ALTER TABLE `@0023sql2` RENAME `#sql2`; +ALTER TABLE `=sql1` RENAME `@003Dsql1`; +ALTER TABLE `@003Dsql2` RENAME `=sql2`; SHOW TABLES; -INSERT INTO `#sql2` VALUES (1); -INSERT INTO `@0023sql1` VALUES (2); -SHOW CREATE TABLE `#sql2`; -SHOW CREATE TABLE `@0023sql1`; -DROP TABLE `#sql2`, `@0023sql1`; +INSERT INTO `=sql2` VALUES (1); +INSERT INTO `@003Dsql1` VALUES (2); +SHOW CREATE TABLE `=sql2`; +SHOW CREATE TABLE `@003Dsql1`; +DROP TABLE `=sql2`, `@003Dsql1`; # # Bug #22369: Alter table rename combined with other alterations causes lost tables diff -ur porting_base.2.0/mysql/mysql-test/t/backup-master.sh rebuild.2.0/mysql/mysql-test/t/backup-master.sh --- porting_base.2.0/mysql/mysql-test/t/backup-master.sh Thu Jun 3 12:17:30 2010 +++ rebuild.2.0/mysql/mysql-test/t/backup-master.sh Mon Nov 8 13:15:31 2010 @@ -1,5 +1,5 @@ #!/bin/sh if [ "$MYSQL_TEST_DIR" ] then - rm -f $MYSQLTEST_VARDIR/tmp/*.frm $MYSQLTEST_VARDIR/tmp/*.MY? + rm -f $MYSQLTEST_VARDIR/tmp/*.frm $MYSQLTEST_VARDIR/tmp/*.MY* fi diff -ur porting_base.2.0/mysql/mysql-test/t/disabled.def rebuild.2.0/mysql/mysql-test/t/disabled.def --- porting_base.2.0/mysql/mysql-test/t/disabled.def Thu Jun 3 12:17:34 2010 +++ rebuild.2.0/mysql/mysql-test/t/disabled.def Mon Nov 8 13:15:38 2010 @@ -10,5 +10,11 @@ # ############################################################################## kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild. +create : OpenVOS does not support international characters in file names +long_tmpdir : OpenVOS does not support long directory names +ps : OpenVOS does not support long database names query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically partition_innodb_plugin : Bug#53307 2010-04-30 VasilDimov valgrind warnings +partition_rename_longfilename : OpenVOS does not support long directory names +timezone : Test fails identically on RHEL 5.5 and on OpenVOS (assumes runtime knows when daylight time happens) +timezone3 : OpenVOS does not support taking time zone names from a file diff -ur porting_base.2.0/mysql/mysql-test/t/drop.test rebuild.2.0/mysql/mysql-test/t/drop.test --- porting_base.2.0/mysql/mysql-test/t/drop.test Thu Jun 3 12:17:34 2010 +++ rebuild.2.0/mysql/mysql-test/t/drop.test Mon Nov 8 13:15:39 2010 @@ -131,11 +131,11 @@ # create database mysql_test; create table mysql_test.t1(f1 int); -create table mysql_test.`#sql-347f_7` (f1 int); -create table mysql_test.`#sql-347f_8` (f1 int); -drop table mysql_test.`#sql-347f_8`; +create table mysql_test.`=sql-347f_7` (f1 int); +create table mysql_test.`=sql-347f_8` (f1 int); +drop table mysql_test.`=sql-347f_8`; let $MYSQLD_DATADIR= `select @@datadir`; -copy_file $MYSQLD_DATADIR/mysql_test/t1.frm $MYSQLD_DATADIR/mysql_test/#sql-347f_6.frm; +copy_file $MYSQLD_DATADIR/mysql_test/t1.frm $MYSQLD_DATADIR/mysql_test/=sql-347f_6.frm; drop database mysql_test; ########################################################################### @@ -187,17 +187,17 @@ --echo # -# Bug#26703: DROP DATABASE fails if database contains a #mysql50# table with backticks +# Bug#26703: DROP DATABASE fails if database contains a =mysql50= table with backticks # create database mysqltestbug26703; use mysqltestbug26703; -create table `#mysql50#abc``def` ( id int ); +create table `=mysql50=abc``def` ( id int ); --error ER_WRONG_TABLE_NAME create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); -create table `#mysql50#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); +create table `=mysql50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); --error ER_WRONG_TABLE_NAME -create table `#mysql50#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); +create table `=mysql50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (a int); use test; drop database mysqltestbug26703; diff -ur porting_base.2.0/mysql/mysql-test/t/grant.test rebuild.2.0/mysql/mysql-test/t/grant.test --- porting_base.2.0/mysql/mysql-test/t/grant.test Thu Jun 3 12:17:38 2010 +++ rebuild.2.0/mysql/mysql-test/t/grant.test Mon Nov 8 13:15:43 2010 @@ -1542,7 +1542,7 @@ --error ER_TABLEACCESS_DENIED_ERROR SELECT * FROM `../db2`.tb2; --error ER_NO_SUCH_TABLE -SELECT * FROM `#mysql50#/../db2/tb2`; +SELECT * FROM `=mysql50=/../db2/tb2`; connection default; disconnect con1; DROP USER 'testbug'@localhost; diff -ur porting_base.2.0/mysql/mysql-test/t/insert_select.test rebuild.2.0/mysql/mysql-test/t/insert_select.test --- porting_base.2.0/mysql/mysql-test/t/insert_select.test Thu Jun 3 12:17:41 2010 +++ rebuild.2.0/mysql/mysql-test/t/insert_select.test Mon Nov 8 13:15:41 2010 @@ -407,7 +407,7 @@ INSERT INTO t1 VALUES (1), (2), (3), (4), (5); -call mtr.add_suppression("mysqld: The table '.*#sql.*' is full"); +call mtr.add_suppression("mysqld.pm: The table '.*=sql.*' is full"); --error ER_RECORD_FILE_FULL,ER_RECORD_FILE_FULL INSERT IGNORE INTO t1 SELECT t1.a FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6,t1 t7; diff -ur porting_base.2.0/mysql/mysql-test/t/myisam.test rebuild.2.0/mysql/mysql-test/t/myisam.test --- porting_base.2.0/mysql/mysql-test/t/myisam.test Thu Jun 3 12:17:45 2010 +++ rebuild.2.0/mysql/mysql-test/t/myisam.test Tue Mar 8 12:59:35 2011 @@ -1561,6 +1561,7 @@ INSERT INTO t1 SELECT a+1280,b FROM t1; INSERT INTO t1 SELECT a+2560,b FROM t1; INSERT INTO t1 SELECT a+5120,b FROM t1; +INSERT INTO t1 SELECT a+10240,b FROM t1; SET myisam_sort_buffer_size=4; REPAIR TABLE t1; @@ -1610,6 +1611,9 @@ SELECT * FROM t1, t1 AS a1; SET myisam_sort_buffer_size=4; INSERT INTO t1 VALUES +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), diff -ur porting_base.2.0/mysql/mysql-test/t/mysql.test rebuild.2.0/mysql/mysql-test/t/mysql.test --- porting_base.2.0/mysql/mysql-test/t/mysql.test Thu Jun 3 12:17:45 2010 +++ rebuild.2.0/mysql/mysql-test/t/mysql.test Fri Jan 7 12:57:50 2011 @@ -184,7 +184,7 @@ insert into t17583 select a from t17583; # Close to the minimal data needed to exercise bug. select count(*) from t17583; ---exec echo "select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; " |$MYSQL test >&- +--exec echo "select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; select count(*) from t17583; " |$MYSQL test drop table t17583; # diff -ur porting_base.2.0/mysql/mysql-test/t/mysqlcheck.test rebuild.2.0/mysql/mysql-test/t/mysqlcheck.test --- porting_base.2.0/mysql/mysql-test/t/mysqlcheck.test Thu Jun 3 12:17:46 2010 +++ rebuild.2.0/mysql/mysql-test/t/mysqlcheck.test Mon Nov 8 13:15:41 2010 @@ -121,11 +121,11 @@ # # Bug #33094: Error in upgrading from 5.0 to 5.1 when table contains triggers -# Bug #41385: Crash when attempting to repair a #mysql50# upgraded table with +# Bug #41385: Crash when attempting to repair a =mysql50= upgraded table with # triggers # SET NAMES utf8; -CREATE TABLE `#mysql50#@` (a INT); +CREATE TABLE `=mysql50=@` (a INT); SHOW TABLES; SET NAMES DEFAULT; --echo mysqlcheck --fix-table-names --databases test @@ -138,7 +138,7 @@ SET NAMES DEFAULT; --echo mysqlcheck --default-character-set="latin1" --databases test # Error returned depends on platform, replace it with "Table doesn't exist" ---replace_result "Can't find file: './test/@003f.frm' (errno: 22)" "Table doesn't exist" "Table 'test.?' doesn't exist" "Table doesn't exist" +--replace_result "Table 'test.?' doesn't exist" "Table doesn't exist" "Table 'test.*' doesn't exist" "Table doesn't exist" --exec $MYSQL_CHECK --default-character-set="latin1" --databases test --echo mysqlcheck --default-character-set="utf8" --databases test --exec $MYSQL_CHECK --default-character-set="utf8" --databases test @@ -146,9 +146,9 @@ DROP TABLE `я`; SET NAMES DEFAULT; -CREATE DATABASE `#mysql50#a@b`; -USE `#mysql50#a@b`; -CREATE TABLE `#mysql50#c@d` (a INT); +CREATE DATABASE `=mysql50=a@b`; +USE `=mysql50=a@b`; +CREATE TABLE `=mysql50=c@d` (a INT); CREATE TABLE t1 (a INT); # Create 5.0 like triggers @@ -175,7 +175,7 @@ EOF SELECT * FROM INFORMATION_SCHEMA.TRIGGERS - WHERE TRIGGER_SCHEMA="#mysql50#a@b" ORDER BY trigger_name; + WHERE TRIGGER_SCHEMA="=mysql50=a@b" ORDER BY trigger_name; --echo mysqlcheck --fix-db-names --fix-table-names --all-databases --exec $MYSQL_CHECK --fix-db-names --fix-table-names --all-databases @@ -198,16 +198,16 @@ --echo # --disable_warnings -drop table if exists `#mysql50#t1-1`; +drop table if exists `=mysql50=t1-1`; --enable_warnings -create table `#mysql50#t1-1` (a int); +create table `=mysql50=t1-1` (a int); --exec $MYSQL_CHECK --all-in-1 --fix-table-names --databases test show tables like 't1-1'; drop table `t1-1`; -create table `#mysql50#t1-1` (a int); ---exec $MYSQL_CHECK --all-in-1 --fix-table-names test "#mysql50#t1-1" +create table `=mysql50=t1-1` (a int); +--exec $MYSQL_CHECK --all-in-1 --fix-table-names test "=mysql50=t1-1" show tables like 't1-1'; drop table `t1-1`; diff -ur porting_base.2.0/mysql/mysql-test/t/order_by.test rebuild.2.0/mysql/mysql-test/t/order_by.test --- porting_base.2.0/mysql/mysql-test/t/order_by.test Thu Jun 3 12:17:47 2010 +++ rebuild.2.0/mysql/mysql-test/t/order_by.test Tue Mar 8 12:59:36 2011 @@ -842,7 +842,7 @@ create table t1(a int, b tinytext); insert into t1 values (1,2),(3,2); set session sort_buffer_size= 30000; -set session max_sort_length= 2180; +set session max_sort_length= 2182; --error 1038 select * from t1 order by b; drop table t1; diff -ur porting_base.2.0/mysql/mysql-test/t/partition_error.test rebuild.2.0/mysql/mysql-test/t/partition_error.test --- porting_base.2.0/mysql/mysql-test/t/partition_error.test Thu Jun 3 12:17:48 2010 +++ rebuild.2.0/mysql/mysql-test/t/partition_error.test Mon Nov 8 13:15:36 2010 @@ -25,8 +25,8 @@ --error ER_BAD_TABLE_ERROR DROP TABLE t1; --remove_file $MYSQLD_DATADIR/test/t1.frm ---remove_file $MYSQLD_DATADIR/test/t1#P#p0.MYI ---remove_file $MYSQLD_DATADIR/test/t1#P#p0.MYD +--remove_file $MYSQLD_DATADIR/test/t1=P=p0.MYI +--remove_file $MYSQLD_DATADIR/test/t1=P=p0.MYD --echo # --echo # Bug#49477: Assertion `0' failed in ha_partition.cc:5530 diff -ur porting_base.2.0/mysql/mysql-test/t/partition_innodb.test rebuild.2.0/mysql/mysql-test/t/partition_innodb.test --- porting_base.2.0/mysql/mysql-test/t/partition_innodb.test Thu Jun 3 12:17:49 2010 +++ rebuild.2.0/mysql/mysql-test/t/partition_innodb.test Mon Nov 8 13:15:35 2010 @@ -358,7 +358,7 @@ CREATE INDEX i1 ON t1 (a); DROP TABLE t1; -# Before the fix it should show extra file like #sql-2405_2.par +# Before the fix it should show extra file like =sql-2405_2.par --list_files $MYSQLD_DATADIR/test/ * --echo # diff -ur porting_base.2.0/mysql/mysql-test/t/partition_mgm.test rebuild.2.0/mysql/mysql-test/t/partition_mgm.test --- porting_base.2.0/mysql/mysql-test/t/partition_mgm.test Thu Jun 3 12:17:49 2010 +++ rebuild.2.0/mysql/mysql-test/t/partition_mgm.test Mon Nov 8 13:15:35 2010 @@ -34,16 +34,16 @@ PARTITION BY HASH(YEAR(f_date)) PARTITIONS 2; SHOW CREATE TABLE t1; let $MYSQLD_DATADIR= `select @@datadir`; --- file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYD --- file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYI --- file_exists $MYSQLD_DATADIR/test/t1#P#p1.MYD --- file_exists $MYSQLD_DATADIR/test/t1#P#p1.MYI +-- file_exists $MYSQLD_DATADIR/test/t1=P=p0.MYD +-- file_exists $MYSQLD_DATADIR/test/t1=P=p0.MYI +-- file_exists $MYSQLD_DATADIR/test/t1=P=p1.MYD +-- file_exists $MYSQLD_DATADIR/test/t1=P=p1.MYI -- file_exists $MYSQLD_DATADIR/test/t1.frm -- file_exists $MYSQLD_DATADIR/test/t1.par ALTER TABLE t1 COALESCE PARTITION 1; SHOW CREATE TABLE t1; --- file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYD --- file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYI +-- file_exists $MYSQLD_DATADIR/test/t1=P=p0.MYD +-- file_exists $MYSQLD_DATADIR/test/t1=P=p0.MYI -- file_exists $MYSQLD_DATADIR/test/t1.frm -- file_exists $MYSQLD_DATADIR/test/t1.par drop table t1; diff -ur porting_base.2.0/mysql/mysql-test/t/partition_mgm_err2.test rebuild.2.0/mysql/mysql-test/t/partition_mgm_err2.test --- porting_base.2.0/mysql/mysql-test/t/partition_mgm_err2.test Thu Jun 3 12:17:49 2010 +++ rebuild.2.0/mysql/mysql-test/t/partition_mgm_err2.test Mon Nov 8 13:15:30 2010 @@ -20,7 +20,7 @@ INDEX DIRECTORY="$MYSQLTEST_VARDIR/tmp/bug14354"); enable_query_log; INSERT INTO t1 VALUES (15); ---system test -f $MYSQLTEST_VARDIR/tmp/bug14354/t1#P#p1.MYD ---system test -f $MYSQLTEST_VARDIR/tmp/bug14354/t1#P#p1.MYI +--system test -f $MYSQLTEST_VARDIR/tmp/bug14354/t1=P=p1.MYD +--system test -f $MYSQLTEST_VARDIR/tmp/bug14354/t1=P=p1.MYI DROP TABLE t1; --system rm -rf $MYSQLTEST_VARDIR/tmp/bug14354 diff -ur porting_base.2.0/mysql/mysql-test/t/partition_not_embedded.test rebuild.2.0/mysql/mysql-test/t/partition_not_embedded.test --- porting_base.2.0/mysql/mysql-test/t/partition_not_embedded.test Thu Jun 3 12:17:49 2010 +++ rebuild.2.0/mysql/mysql-test/t/partition_not_embedded.test Mon Nov 8 13:15:34 2010 @@ -14,8 +14,8 @@ (PARTITION p0 VALUES LESS THAN (6), PARTITION `p1....................` VALUES LESS THAN (9), PARTITION p2 VALUES LESS THAN MAXVALUE); -# partition p1 is 't1#P#p1' + @002e * 20 = 107 characters + file ending -# total path lenght of './test/t1#P#p1@002e@002e<...>@002e.MY[ID]' is 118 chars +# partition p1 is 't1=P=p1' + @002e * 20 = 107 characters + file ending +# total path lenght of './test/t1=P=p1@002e@002e<...>@002e.MY[ID]' is 118 chars --echo # List of files in database `test`, all original t1-files here --list_files $MYSQLD_DATADIR/test t1* INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10); diff -ur porting_base.2.0/mysql/mysql-test/t/partition_not_windows.test rebuild.2.0/mysql/mysql-test/t/partition_not_windows.test --- porting_base.2.0/mysql/mysql-test/t/partition_not_windows.test Thu Jun 3 12:17:49 2010 +++ rebuild.2.0/mysql/mysql-test/t/partition_not_windows.test Mon Nov 8 13:15:35 2010 @@ -25,14 +25,14 @@ --echo # Checking if file exists before alter --file_exists $MYSQLD_DATADIR/test/t1.frm --file_exists $MYSQLD_DATADIR/test/t1.par ---file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYD ---file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYI ---file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYD ---file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYI ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart00.MYD ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart01.MYD ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart00.MYI ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart01.MYI +--file_exists $MYSQLD_DATADIR/test/t1=P=p0=SP=subpart00.MYD +--file_exists $MYSQLD_DATADIR/test/t1=P=p0=SP=subpart00.MYI +--file_exists $MYSQLD_DATADIR/test/t1=P=p0=SP=subpart01.MYD +--file_exists $MYSQLD_DATADIR/test/t1=P=p0=SP=subpart01.MYI +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p0=SP=subpart00.MYD +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p0=SP=subpart01.MYD +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p0=SP=subpart00.MYI +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p0=SP=subpart01.MYI --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO @@ -44,22 +44,22 @@ --echo # Checking if file exists after alter --file_exists $MYSQLD_DATADIR/test/t1.frm --file_exists $MYSQLD_DATADIR/test/t1.par ---file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYD ---file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYI ---file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYD ---file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYI ---file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYD ---file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYI ---file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYD ---file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYI ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart10.MYD ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart11.MYD ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p2#SP#subpart20.MYD ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p2#SP#subpart21.MYD ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart10.MYI ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart11.MYI ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p2#SP#subpart20.MYI ---file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p2#SP#subpart21.MYI +--file_exists $MYSQLD_DATADIR/test/t1=P=p1=SP=subpart10.MYD +--file_exists $MYSQLD_DATADIR/test/t1=P=p1=SP=subpart10.MYI +--file_exists $MYSQLD_DATADIR/test/t1=P=p1=SP=subpart11.MYD +--file_exists $MYSQLD_DATADIR/test/t1=P=p1=SP=subpart11.MYI +--file_exists $MYSQLD_DATADIR/test/t1=P=p2=SP=subpart20.MYD +--file_exists $MYSQLD_DATADIR/test/t1=P=p2=SP=subpart20.MYI +--file_exists $MYSQLD_DATADIR/test/t1=P=p2=SP=subpart21.MYD +--file_exists $MYSQLD_DATADIR/test/t1=P=p2=SP=subpart21.MYI +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p1=SP=subpart10.MYD +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p1=SP=subpart11.MYD +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p2=SP=subpart20.MYD +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p2=SP=subpart21.MYD +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p1=SP=subpart10.MYI +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p1=SP=subpart11.MYI +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p2=SP=subpart20.MYI +--file_exists $MYSQLTEST_VARDIR/tmp/t1=P=p2=SP=subpart21.MYI drop table t1; @@ -173,22 +173,22 @@ let $MYSQLD_DATADIR= `select @@datadir`; --echo # Checking that MyISAM .MYD and .MYI are in test db and data/idx dir ---file_exists $MYSQLD_DATADIR/test/example#P#p0.MYI ---file_exists $MYSQLD_DATADIR/test/example#P#p0.MYD ---file_exists $MYSQLTEST_VARDIR/p0Data/example#P#p0.MYD ---file_exists $MYSQLTEST_VARDIR/p0Index/example#P#p0.MYI ---file_exists $MYSQLD_DATADIR/test/example#P#p1.MYI ---file_exists $MYSQLD_DATADIR/test/example#P#p1.MYD ---file_exists $MYSQLTEST_VARDIR/p1Data/example#P#p1.MYD ---file_exists $MYSQLTEST_VARDIR/p1Index/example#P#p1.MYI ---file_exists $MYSQLD_DATADIR/test/example#P#p2.MYI ---file_exists $MYSQLD_DATADIR/test/example#P#p2.MYD ---file_exists $MYSQLTEST_VARDIR/p2Data/example#P#p2.MYD ---file_exists $MYSQLTEST_VARDIR/p2Index/example#P#p2.MYI ---file_exists $MYSQLD_DATADIR/test/example#P#p3.MYI ---file_exists $MYSQLD_DATADIR/test/example#P#p3.MYD ---file_exists $MYSQLTEST_VARDIR/p3Data/example#P#p3.MYD ---file_exists $MYSQLTEST_VARDIR/p3Index/example#P#p3.MYI +--file_exists $MYSQLD_DATADIR/test/example=P=p0.MYI +--file_exists $MYSQLD_DATADIR/test/example=P=p0.MYD +--file_exists $MYSQLTEST_VARDIR/p0Data/example=P=p0.MYD +--file_exists $MYSQLTEST_VARDIR/p0Index/example=P=p0.MYI +--file_exists $MYSQLD_DATADIR/test/example=P=p1.MYI +--file_exists $MYSQLD_DATADIR/test/example=P=p1.MYD +--file_exists $MYSQLTEST_VARDIR/p1Data/example=P=p1.MYD +--file_exists $MYSQLTEST_VARDIR/p1Index/example=P=p1.MYI +--file_exists $MYSQLD_DATADIR/test/example=P=p2.MYI +--file_exists $MYSQLD_DATADIR/test/example=P=p2.MYD +--file_exists $MYSQLTEST_VARDIR/p2Data/example=P=p2.MYD +--file_exists $MYSQLTEST_VARDIR/p2Index/example=P=p2.MYI +--file_exists $MYSQLD_DATADIR/test/example=P=p3.MYI +--file_exists $MYSQLD_DATADIR/test/example=P=p3.MYD +--file_exists $MYSQLTEST_VARDIR/p3Data/example=P=p3.MYD +--file_exists $MYSQLTEST_VARDIR/p3Index/example=P=p3.MYI DROP TABLE example; --rmdir $MYSQLTEST_VARDIR/p0Data --rmdir $MYSQLTEST_VARDIR/p1Data diff -ur porting_base.2.0/mysql/mysql-test/t/partition_symlink.test rebuild.2.0/mysql/mysql-test/t/partition_symlink.test --- porting_base.2.0/mysql/mysql-test/t/partition_symlink.test Thu Jun 3 12:17:50 2010 +++ rebuild.2.0/mysql/mysql-test/t/partition_symlink.test Mon Nov 8 13:15:31 2010 @@ -18,7 +18,7 @@ # replaced by a user with no rights in 'mysqltest2'. The altered table # test.t1 will be altered (remove partitioning) into the test directory # and having its partitions removed from the mysqltest2 directory. -# (the partitions data files are named #P#.MYD +# (the partitions data files are named =P=.MYD # and will not collide with a non partitioned table's data files.) # NOTE: the privileges on files and directories are the same for all # database users in mysqld, though mysqld enforces privileges on diff -ur porting_base.2.0/mysql/mysql-test/t/ps_ddl.test rebuild.2.0/mysql/mysql-test/t/ps_ddl.test --- porting_base.2.0/mysql/mysql-test/t/ps_ddl.test Thu Jun 3 12:17:51 2010 +++ rebuild.2.0/mysql/mysql-test/t/ps_ddl.test Mon Nov 8 13:15:33 2010 @@ -1462,7 +1462,7 @@ # View with name of table to be created exists # Attention: # We cannot print the error message because it contains a random filename. -# Example: 1050: Table '/var/tmp/#sql_6979_0' already exists +# Example: 1050: Table '/var/tmp/=sql_6979_0' already exists # Therefore we mangle it via # "--error ER_TABLE_EXISTS_ERROR,9999" (9999 is currently not used) # to "Got one of the listed errors". diff -ur porting_base.2.0/mysql/mysql-test/t/renamedb.test rebuild.2.0/mysql/mysql-test/t/renamedb.test --- porting_base.2.0/mysql/mysql-test/t/renamedb.test Thu Jun 3 12:17:51 2010 +++ rebuild.2.0/mysql/mysql-test/t/renamedb.test Mon Nov 8 13:15:34 2010 @@ -39,15 +39,15 @@ ALTER DATABASE wrong UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_USAGE -ALTER DATABASE `#mysql41#not-supported` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql41=not-supported` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_USAGE -ALTER DATABASE `#mysql51#not-yet` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql51=not-yet` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -ALTER DATABASE `#mysql50#` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=` UPGRADE DATA DIRECTORY NAME; --error ER_BAD_DB_ERROR -ALTER DATABASE `#mysql50#upgrade-me` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=upgrade-me` UPGRADE DATA DIRECTORY NAME; diff -ur porting_base.2.0/mysql/mysql-test/t/repair.test rebuild.2.0/mysql/mysql-test/t/repair.test --- porting_base.2.0/mysql/mysql-test/t/repair.test Thu Jun 3 12:17:51 2010 +++ rebuild.2.0/mysql/mysql-test/t/repair.test Tue Mar 8 12:59:36 2011 @@ -77,6 +77,8 @@ ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), +('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'); SET myisam_repair_threads=2; REPAIR TABLE t1; diff -ur porting_base.2.0/mysql/mysql-test/t/show_check.test rebuild.2.0/mysql/mysql-test/t/show_check.test --- porting_base.2.0/mysql/mysql-test/t/show_check.test Thu Jun 3 12:17:52 2010 +++ rebuild.2.0/mysql/mysql-test/t/show_check.test Mon Nov 8 13:15:31 2010 @@ -1063,7 +1063,7 @@ # Bug#26402 Server crashes with old-style named table # --error ER_NO_SUCH_TABLE,ER_FILE_NOT_FOUND -show columns from `#mysql50#????????`; +show columns from `=mysql50=*`; # # SHOW CREATE TRIGGER test. diff -ur porting_base.2.0/mysql/mysql-test/t/sp-error.test rebuild.2.0/mysql/mysql-test/t/sp-error.test --- porting_base.2.0/mysql/mysql-test/t/sp-error.test Thu Jun 3 12:17:53 2010 +++ rebuild.2.0/mysql/mysql-test/t/sp-error.test Mon Nov 8 13:15:43 2010 @@ -2161,13 +2161,13 @@ --error ER_SP_NO_DROP_SP CREATE PROCEDURE proc_28360() BEGIN - ALTER DATABASE `#mysql50#upgrade-me` UPGRADE DATA DIRECTORY NAME; + ALTER DATABASE `=mysql50=upgrade-me` UPGRADE DATA DIRECTORY NAME; END// --error ER_SP_NO_DROP_SP CREATE FUNCTION func_28360() RETURNS int BEGIN - ALTER DATABASE `#mysql50#upgrade-me` UPGRADE DATA DIRECTORY NAME; + ALTER DATABASE `=mysql50=upgrade-me` UPGRADE DATA DIRECTORY NAME; RETURN 0; END// diff -ur porting_base.2.0/mysql/mysql-test/t/sp.test rebuild.2.0/mysql/mysql-test/t/sp.test --- porting_base.2.0/mysql/mysql-test/t/sp.test Thu Jun 3 12:17:53 2010 +++ rebuild.2.0/mysql/mysql-test/t/sp.test Mon Nov 8 13:15:33 2010 @@ -6289,15 +6289,18 @@ # # BUG#21311: Possible stack overrun if SP has non-latin1 name # +# OpenVOS: shorten the UTF8 database name so that the resulting +# directory fits within 32 characters. +# set names utf8| --disable_warnings -drop database if exists това_е_дълго_име_за_база_данни_нали| +drop database if exists това| --enable_warnings -create database това_е_дълго_име_за_база_данни_нали| -INSERT INTO mysql.proc VALUES ('това_е_дълго_име_за_база_данни_нали','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','PROCEDURE','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','SQL','CONTAINS_SQL','NO','DEFINER','','','bad_body','root@localhost',now(), now(),'','', 'utf8', 'utf8_general_ci', 'utf8_general_ci', 'n/a')| +create database това| +INSERT INTO mysql.proc VALUES ('това','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','PROCEDURE','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','SQL','CONTAINS_SQL','NO','DEFINER','','','bad_body','root@localhost',now(), now(),'','', 'utf8', 'utf8_general_ci', 'utf8_general_ci', 'n/a')| --error ER_SP_PROC_TABLE_CORRUPT -call това_е_дълго_име_за_база_данни_нали.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго()| -drop database това_е_дълго_име_за_база_данни_нали| +call това.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго()| +drop database това| # diff -ur porting_base.2.0/mysql/mysql-test/t/timezone-master.opt rebuild.2.0/mysql/mysql-test/t/timezone-master.opt --- porting_base.2.0/mysql/mysql-test/t/timezone-master.opt Thu Jun 3 12:17:56 2010 +++ rebuild.2.0/mysql/mysql-test/t/timezone-master.opt Mon Nov 8 13:15:41 2010 @@ -1 +1 @@ ---timezone=MET +--timezone=MET-01:00:00 diff -ur porting_base.2.0/mysql/mysql-test/t/upgrade.test rebuild.2.0/mysql/mysql-test/t/upgrade.test --- porting_base.2.0/mysql/mysql-test/t/upgrade.test Thu Jun 3 12:17:58 2010 +++ rebuild.2.0/mysql/mysql-test/t/upgrade.test Mon Nov 8 13:15:32 2010 @@ -3,28 +3,28 @@ --disable_warnings drop database if exists `mysqltest1`; drop database if exists `mysqltest-1`; -drop database if exists `#mysql50#mysqltest-1`; +drop database if exists `=mysql50=mysqltest-1`; --enable_warnings create database `mysqltest1`; -create database `#mysql50#mysqltest-1`; +create database `=mysql50=mysqltest-1`; create table `mysqltest1`.`t1` (a int); -create table `mysqltest1`.`#mysql50#t-1` (a int); -create table `#mysql50#mysqltest-1`.`t1` (a int); -create table `#mysql50#mysqltest-1`.`#mysql50#t-1` (a int); +create table `mysqltest1`.`=mysql50=t-1` (a int); +create table `=mysql50=mysqltest-1`.`t1` (a int); +create table `=mysql50=mysqltest-1`.`=mysql50=t-1` (a int); show create database `mysqltest1`; --error 1049 show create database `mysqltest-1`; -show create database `#mysql50#mysqltest-1`; +show create database `=mysql50=mysqltest-1`; show tables in `mysqltest1`; -show tables in `#mysql50#mysqltest-1`; +show tables in `=mysql50=mysqltest-1`; --exec $MYSQL_CHECK --all-databases --fix-db-names --fix-table-names show create database `mysqltest1`; show create database `mysqltest-1`; --error 1049 -show create database `#mysql50#mysqltest-1`; +show create database `=mysql50=mysqltest-1`; show tables in `mysqltest1`; show tables in `mysqltest-1`; drop database `mysqltest1`; @@ -34,19 +34,19 @@ # Bug#17142: Crash if create with encoded name # --disable_warnings -drop table if exists `txu@0023p@0023p1`; -drop table if exists `txu#p#p1`; +drop table if exists `txu@003Dp@003Dp1`; +drop table if exists `txu=p=p1`; --enable_warnings -create table `txu#p#p1` (s1 int); -insert into `txu#p#p1` values (1); +create table `txu=p=p1` (s1 int); +insert into `txu=p=p1` values (1); --error 1146 -select * from `txu@0023p@0023p1`; -create table `txu@0023p@0023p1` (s1 int); -insert into `txu@0023p@0023p1` values (2); -select * from `txu@0023p@0023p1`; -select * from `txu#p#p1`; -drop table `txu@0023p@0023p1`; -drop table `txu#p#p1`; +select * from `txu@003Dp@003Dp1`; +create table `txu@003Dp@003Dp1` (s1 int); +insert into `txu@003Dp@003Dp1` values (2); +select * from `txu@003Dp@003Dp1`; +select * from `txu=p=p1`; +drop table `txu@003Dp@003Dp1`; +drop table `txu=p=p1`; --echo # --echo # Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 @@ -94,7 +94,7 @@ --copy_file $MYSQLD_DATADIR/tabc/t1.MYI $MYSQLD_DATADIR/a-b-c/t1.MYI show databases like '%a-b-c%'; -ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=a-b-c` UPGRADE DATA DIRECTORY NAME; # The physical directory name is now a@002db@002dc, the logical name still a-b-c show databases like '%a-b-c%'; show create database `a-b-c`; @@ -108,7 +108,7 @@ # let $MYSQLD_DATADIR= `select @@datadir`; --mkdir $MYSQLD_DATADIR/a-b-c -use `#mysql50#a-b-c`; +use `=mysql50=a-b-c`; create table t1(f1 char(10)); --write_file $MYSQLD_DATADIR/a-b-c/v1.frm @@ -129,7 +129,7 @@ EOF show databases like '%a-b-c%'; -ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=a-b-c` UPGRADE DATA DIRECTORY NAME; show databases like '%a-b-c%'; show create view `a-b-c`.v1; --disable_ps_protocol @@ -146,28 +146,28 @@ --echo # --error ER_BAD_DB_ERROR -ALTER DATABASE `#mysql50#:` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=:` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -ALTER DATABASE `#mysql50#.` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=.` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -ALTER DATABASE `#mysql50#../` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=../` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -ALTER DATABASE `#mysql50#../..` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=../..` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -ALTER DATABASE `#mysql50#../../` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=../../` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -ALTER DATABASE `#mysql50#./blablabla` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=./blablabla` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -ALTER DATABASE `#mysql50#../blablabla` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=../blablabla` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -ALTER DATABASE `#mysql50#/` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=/` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -ALTER DATABASE `#mysql50#/.` UPGRADE DATA DIRECTORY NAME; +ALTER DATABASE `=mysql50=/.` UPGRADE DATA DIRECTORY NAME; --error ER_WRONG_DB_NAME -USE `#mysql50#.`; +USE `=mysql50=.`; --error ER_WRONG_DB_NAME -USE `#mysql50#../blablabla`; +USE `=mysql50=../blablabla`; --echo # End of 5.1 tests diff -ur porting_base.2.0/mysql/mysql-test/t/variables.test rebuild.2.0/mysql/mysql-test/t/variables.test --- porting_base.2.0/mysql/mysql-test/t/variables.test Thu Jun 3 12:17:58 2010 +++ rebuild.2.0/mysql/mysql-test/t/variables.test Tue Mar 8 12:59:36 2011 @@ -143,9 +143,9 @@ show global variables like 'myisam_max_sort_file_size'; select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size'; set GLOBAL myisam_max_sort_file_size=default; ---replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE +--replace_result 9223372036853727232 FILE_SIZE 2145386496 FILE_SIZE show global variables like 'myisam_max_sort_file_size'; ---replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE +--replace_result 9223372036853727232 FILE_SIZE 2145386496 FILE_SIZE select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size'; # bug#22891: modified to take read-only SESSION net_buffer_length into account @@ -434,10 +434,10 @@ # expected: check that there is no overflow when 64-bit unsigned # variables are set -set global myisam_max_sort_file_size=4294967296; ---replace_result 4294967296 MAX_FILE_SIZE 2146435072 MAX_FILE_SIZE +set global myisam_max_sort_file_size=2145386496; +--replace_result 2145386496 MAX_FILE_SIZE 2146435072 MAX_FILE_SIZE show global variables like 'myisam_max_sort_file_size'; ---replace_result 4294967296 MAX_FILE_SIZE 2146435072 MAX_FILE_SIZE +--replace_result 2145386496 MAX_FILE_SIZE 2146435072 MAX_FILE_SIZE select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size'; set global myisam_max_sort_file_size=default; diff -ur porting_base.2.0/mysql/mysys/default.c rebuild.2.0/mysql/mysys/default.c --- porting_base.2.0/mysql/mysys/default.c Thu Jun 3 11:50:16 2010 +++ rebuild.2.0/mysql/mysys/default.c Tue Mar 8 12:59:41 2011 @@ -675,7 +675,10 @@ strmov(name,config_file); } fn_format(name,name,"","",4); -#if !defined(__WIN__) && !defined(__NETWARE__) +/* Add VOS to the list of operating systems that disable this check. + The mysqldump test fails on VOS because the configuration file gets + default access of "w *.*" applied. */ +#if !defined(__WIN__) && !defined(__NETWARE__) && !defined(__VOS__) { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) diff -ur porting_base.2.0/mysql/mysys/my_symlink.c rebuild.2.0/mysql/mysys/my_symlink.c --- porting_base.2.0/mysql/mysys/my_symlink.c Thu Jun 3 11:50:20 2010 +++ rebuild.2.0/mysql/mysys/my_symlink.c Mon Nov 8 13:21:43 2010 @@ -128,9 +128,12 @@ char *ptr; DBUG_ENTER("my_realpath"); - DBUG_PRINT("info",("executing realpath")); + DBUG_PRINT("info",("executing realpath: buff_len=%d, path=%-100s",BUFF_LEN,filename)); if ((ptr=realpath(filename,buff))) + { + DBUG_PRINT("info",("result: %-100s",ptr)); strmake(to,ptr,FN_REFLEN-1); + } else { /* diff -ur porting_base.2.0/mysql/mysys/mysys_priv.h rebuild.2.0/mysql/mysys/mysys_priv.h --- porting_base.2.0/mysql/mysys/mysys_priv.h Thu Jun 3 11:50:21 2010 +++ rebuild.2.0/mysql/mysys/mysys_priv.h Mon Nov 8 13:21:45 2010 @@ -20,8 +20,14 @@ #include "system_wrappers.h" #endif +#ifdef __VOS__ +#ifdef HAVE_SYS_RESOURCE_H +#include +#endif +#else #ifdef HAVE_GETRUSAGE #include +#endif #endif #ifdef THREAD diff -ur porting_base.2.0/mysql/netware/Makefile.in rebuild.2.0/mysql/netware/Makefile.in --- porting_base.2.0/mysql/netware/Makefile.in Thu Jun 3 11:54:15 2010 +++ rebuild.2.0/mysql/netware/Makefile.in Mon Nov 8 13:29:57 2010 @@ -817,7 +817,7 @@ # some test data test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql @echo "Building $@"; - @cat init_db.sql \ + @cat $(top_srcdir)/netware/init_db.sql \ $(top_srcdir)/scripts/mysql_test_data_timezone.sql > $@; # Don't update the files from bitkeeper diff -ur porting_base.2.0/mysql/scripts/Makefile.in rebuild.2.0/mysql/scripts/Makefile.in --- porting_base.2.0/mysql/scripts/Makefile.in Thu Jun 3 11:54:17 2010 +++ rebuild.2.0/mysql/scripts/Makefile.in Fri Jan 7 12:57:57 2011 @@ -825,6 +825,7 @@ -e 's!@''sysconfdir''@!$(sysconfdir)!g' \ -e 's!@''mandir''@!$(mandir)!g' \ -e 's!@''infodir''@!$(infodir)!g' \ + -e 's!@''exeext''@!$(EXEEXT)!g' \ -e 's!@''CC''@!@CC@!'\ -e 's!@''CXX''@!@CXX@!'\ -e 's!@''GXX''@!@GXX@!'\ diff -ur porting_base.2.0/mysql/scripts/mysql_config.pl.in rebuild.2.0/mysql/scripts/mysql_config.pl.in --- porting_base.2.0/mysql/scripts/mysql_config.pl.in Thu Jun 3 11:50:21 2010 +++ rebuild.2.0/mysql/scripts/mysql_config.pl.in Mon Nov 8 13:21:50 2010 @@ -198,11 +198,11 @@ my $flags; $flags->{libs} = - [@ldflags,@lib_opts,'@ZLIB_DEPS@','@NON_THREADED_LIBS@','@openssl_libs@','@STATIC_NSS_FLAGS@']; + [@ldflags,@lib_opts,'@NON_THREADED_LIBS@','@openssl_libs@','@ZLIB_DEPS@','@STATIC_NSS_FLAGS@']; $flags->{libs_r} = - [@ldflags,@lib_r_opts,'@ZLIB_DEPS@','@LIBS@','@openssl_libs@']; + [@ldflags,@lib_r_opts,'@LIBS@','@openssl_libs@','@ZLIB_DEPS@']; $flags->{embedded_libs} = - [@ldflags,@lib_e_opts,'@LIBDL@','@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@']; + [@ldflags,@lib_e_opts,'@LIBDL@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@','@ZLIB_DEPS@']; $flags->{include} = ["-I$pkgincludedir"]; $flags->{cflags} = [@{$flags->{include}},split(" ",'@CFLAGS@')]; diff -ur porting_base.2.0/mysql/scripts/mysql_config.sh rebuild.2.0/mysql/scripts/mysql_config.sh --- porting_base.2.0/mysql/scripts/mysql_config.sh Thu Jun 3 11:50:21 2010 +++ rebuild.2.0/mysql/scripts/mysql_config.sh Mon Nov 8 13:21:49 2010 @@ -106,8 +106,8 @@ # We intentionally add a space to the beginning and end of lib strings, simplifies replace later libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " -embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " +libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@ @ZLIB_DEPS@ " +embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ @ZLIB_DEPS@ " if [ -r "$pkglibdir/libmygcc.a" ]; then # When linking against the static library with a different version of GCC diff -ur porting_base.2.0/mysql/scripts/mysql_fix_privilege_tables.sh rebuild.2.0/mysql/scripts/mysql_fix_privilege_tables.sh --- porting_base.2.0/mysql/scripts/mysql_fix_privilege_tables.sh Thu Jun 3 11:50:21 2010 +++ rebuild.2.0/mysql/scripts/mysql_fix_privilege_tables.sh Fri Jan 7 12:57:58 2011 @@ -96,9 +96,9 @@ print_defaults=my_print_defaults for dir in ./bin @bindir@ @bindir@ extra $print_defaults_bindir/../bin $print_defaults_bindir/../extra do - if test -x $dir/my_print_defaults + if test -x $dir/my_print_defaults@exeext@ then - print_defaults="$dir/my_print_defaults" + print_defaults="$dir/my_print_defaults@exeext@" break fi done diff -ur porting_base.2.0/mysql/scripts/mysql_install_db.pl.in rebuild.2.0/mysql/scripts/mysql_install_db.pl.in --- porting_base.2.0/mysql/scripts/mysql_install_db.pl.in Thu Jun 3 11:50:21 2010 +++ rebuild.2.0/mysql/scripts/mysql_install_db.pl.in Fri Apr 15 13:03:56 2011 @@ -378,9 +378,9 @@ } warning($opt, "The host '$hostname' could not be looked up with resolveip.", - "This probably means that your libc libraries are not 100 % compatible", - "with this binary MySQL version. The MySQL daemon, mysqld, should work", - "normally with the exception that host name resolving will not work.", + "Please add '$hostname' to your Domain Name Service. Until then,", + "the MySQL daemon, mysqld, should work normally except for host", + "name resolution.", "This means that you should use IP addresses instead of hostnames", "when specifying MySQL privileges !"); } @@ -478,9 +478,11 @@ "The \"HELP\" command might not work properly"); } - report_verbose($opt,"To start mysqld at boot time you have to copy", - "support-files/mysql.server to the right place " . - "for your system"); + report_verbose($opt,"To start mysqld at system boot time you must edit the", + "file /system/module_start_up.cm. To automatically stop", + "mysqld at system shutdown time, you must edit the file", + "/system/module_shut_down.cm. Refer to the SRB and", + "the sample copies of these files for details."); if ( !$opt->{'cross-bootstrap'} ) { @@ -510,20 +512,19 @@ report($opt, "You can start the MySQL daemon with:", "", - " cd " . '@prefix@' . " ; $bindir/mysqld_safe &", + " start_process '>opt>mysql>bin>mysql_daemon' -priority 7 -output_path '>opt>mysql>var>mysql_daemon.out'", "", "You can test the MySQL daemon with mysql-test-run.pl", "", " cd mysql-test ; perl mysql-test-run.pl"); } report($opt, - "Please report any problems with the " . '@scriptdir@' . "/mysqlbug script!", + "This copy of MySQL is supported by Stratus Technologies; please contact", + "your local Stratus Customer Assistance Center to obtain support.", "", "The latest information about MySQL is available on the web at", "", - " http://www.mysql.com", - "", - "Support MySQL by buying support/licenses at http://shop.mysql.com"); + " http://www.mysql.com"); } exit 0 } @@ -550,8 +551,10 @@ "Please consult the MySQL manual section: 'Problems running mysql_install_db',", "and the manual section that describes problems on your OS.", "Another information source is the MySQL email archive.", - "Please check all of the above before mailing us!", - "And if you do mail us, you MUST use the " . '@scriptdir@' . "/mysqlbug script!") + "", + "This copy of MySQL is supported by Stratus Technologies; please contact", + "your local Stratus Customer Assistance Center to obtain support.", + ""); } ############################################################################## diff -ur porting_base.2.0/mysql/scripts/mysql_install_db.sh rebuild.2.0/mysql/scripts/mysql_install_db.sh --- porting_base.2.0/mysql/scripts/mysql_install_db.sh Thu Jun 3 11:50:02 2010 +++ rebuild.2.0/mysql/scripts/mysql_install_db.sh Fri Apr 15 13:03:56 2011 @@ -220,7 +220,7 @@ then builddir="$srcdir" fi - print_defaults="$builddir/extra/my_print_defaults" + print_defaults="$builddir/extra/my_print_defaults@exeext@" elif test -n "$basedir" then print_defaults=`find_in_basedir my_print_defaults bin extra` @@ -230,7 +230,7 @@ exit 1 fi else - print_defaults="@bindir@/my_print_defaults" + print_defaults="@bindir@/my_print_defaults@exeext@" fi if test ! -x "$print_defaults" @@ -250,7 +250,7 @@ basedir="$builddir" bindir="$basedir/client" extra_bindir="$basedir/extra" - mysqld="$basedir/sql/mysqld" + mysqld="$basedir/sql/mysqld@exeext@" langdir="$srcdir/sql/share/english" pkgdatadir="$srcdir/scripts" scriptdir="$srcdir/scripts" @@ -281,7 +281,7 @@ basedir="@prefix@" bindir="@bindir@" extra_bindir="$bindir" - mysqld="@libexecdir@/mysqld" + mysqld="@libexecdir@/mysqld@exeext@" pkgdatadir="@pkgdatadir@" scriptdir="@scriptdir@" fi @@ -337,9 +337,9 @@ exit 1 fi echo "WARNING: The host '$hostname' could not be looked up with resolveip." - echo "This probably means that your libc libraries are not 100 % compatible" - echo "with this binary MySQL version. The MySQL daemon, mysqld, should work" - echo "normally with the exception that host name resolving will not work." + echo "Please add '$hostname' to your Domain Name Service. Until then," + echo "the MySQL daemon, mysqld, should work normally except for host" + echo "name resolution." echo "This means that you should use IP addresses instead of hostnames" echo "when specifying MySQL privileges !" fi @@ -415,8 +415,8 @@ echo "describes problems on your OS. Another information source are the" echo "MySQL email archives available at http://lists.mysql.com/." echo - echo "Please check all of the above before mailing us! And remember, if" - echo "you do mail us, you MUST use the $scriptdir/mysqlbug script!" + echo "This copy of MySQL is supported by Stratus Technologies; please contact" + echo "your local Stratus Customer Assistance Center to obtain support." echo exit 1 fi @@ -437,8 +437,11 @@ if test "$cross_bootstrap" -eq 0 && test -z "$srcdir" then s_echo - s_echo "To start mysqld at boot time you have to copy" - s_echo "support-files/mysql.server to the right place for your system" + s_echo "To start mysqld at system boot time you must edit the" + s_echo "file /system/module_start_up.cm. To automatically stop" + s_echo "mysqld at system shutdown time, you must edit the file" + s_echo "/system/module_shut_down.cm. Refer to the SRB and" + s_echo "the sample copies of these files for details." echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" @@ -460,14 +463,15 @@ then echo echo "You can start the MySQL daemon with:" - echo "cd $basedir ; $bindir/mysqld_safe &" + echo "start_process '>opt>mysql>bin>mysql_daemon' -priority 7 -output_path '>opt>mysql>var>mysql_daemon.out'" echo echo "You can test the MySQL daemon with mysql-test-run.pl" echo "cd $basedir/mysql-test ; perl mysql-test-run.pl" fi echo - echo "Please report any problems with the $scriptdir/mysqlbug script!" + echo "This copy of MySQL is supported by Stratus Technologies; please contact" + echo "your local Stratus Customer Assistance Center to obtain support." echo fi diff -ur porting_base.2.0/mysql/scripts/mysqld_safe.sh rebuild.2.0/mysql/scripts/mysqld_safe.sh --- porting_base.2.0/mysql/scripts/mysqld_safe.sh Thu Jun 3 11:50:08 2010 +++ rebuild.2.0/mysql/scripts/mysqld_safe.sh Fri Jan 7 12:57:58 2011 @@ -176,9 +176,9 @@ --mysqld-version=*) if test -n "$val" then - MYSQLD="mysqld-$val" + MYSQLD="mysqld-$val@exeext@" else - MYSQLD="mysqld" + MYSQLD="mysqld@exeext@" fi ;; --nice=*) niceness="$val" ;; @@ -419,7 +419,7 @@ # If the user doesn't specify a binary, we assume name "mysqld" if test -z "$MYSQLD" then - MYSQLD=mysqld + MYSQLD=mysqld@exeext@ fi if test ! -x "$ledir/$MYSQLD" diff -ur porting_base.2.0/mysql/sql/filesort.cc rebuild.2.0/mysql/sql/filesort.cc --- porting_base.2.0/mysql/sql/filesort.cc Thu Jun 3 11:50:07 2010 +++ rebuild.2.0/mysql/sql/filesort.cc Fri Apr 15 13:04:34 2011 @@ -694,7 +694,11 @@ MYF(MY_WME))) goto err; /* purecov: inspected */ /* check we won't have more buffpeks than we can possibly keep in memory */ +#if SIZEOF_INT > 4 if (my_b_tell(buffpek_pointers) + sizeof(BUFFPEK) > (ulonglong)UINT_MAX) +#else + if (my_b_tell(buffpek_pointers) + sizeof(BUFFPEK) > (ulong)UINT_MAX) +#endif goto err; buffpek.file_pos= my_b_tell(tempfile); if ((ha_rows) count > param->max_rows) diff -ur porting_base.2.0/mysql/sql/ha_partition.cc rebuild.2.0/mysql/sql/ha_partition.cc --- porting_base.2.0/mysql/sql/ha_partition.cc Thu Jun 3 11:50:27 2010 +++ rebuild.2.0/mysql/sql/ha_partition.cc Mon Nov 8 13:29:47 2010 @@ -2058,7 +2058,7 @@ static uint name_add(char *dest, const char *first_name, const char *sec_name) { - return (uint) (strxmov(dest, first_name, "#SP#", sec_name, NullS) -dest) + 1; + return (uint) (strxmov(dest, first_name, "=SP=", sec_name, NullS) -dest) + 1; } diff -ur porting_base.2.0/mysql/sql/item_create.cc rebuild.2.0/mysql/sql/item_create.cc --- porting_base.2.0/mysql/sql/item_create.cc Thu Jun 3 11:50:02 2010 +++ rebuild.2.0/mysql/sql/item_create.cc Fri Apr 15 13:04:36 2011 @@ -5136,7 +5136,7 @@ CHARSET_INFO *real_cs= (cs ? cs : thd->variables.collation_connection); if (c_len == NULL) { - len= LL(-1); + len= ULONG_MAX; } else { diff -ur porting_base.2.0/mysql/sql/log_event.cc rebuild.2.0/mysql/sql/log_event.cc --- porting_base.2.0/mysql/sql/log_event.cc Thu Jun 3 11:50:10 2010 +++ rebuild.2.0/mysql/sql/log_event.cc Fri Apr 15 13:04:33 2011 @@ -5874,7 +5874,7 @@ bool Slave_log_event::write(IO_CACHE* file) { ulong event_length= get_data_size(); - int8store(mem_pool + SL_MASTER_POS_OFFSET, master_pos); + int8store(mem_pool + SL_MASTER_POS_OFFSET, (ulonglong)master_pos); int2store(mem_pool + SL_MASTER_PORT_OFFSET, master_port); // log and host are already there diff -ur porting_base.2.0/mysql/sql/mysql_priv.h rebuild.2.0/mysql/sql/mysql_priv.h --- porting_base.2.0/mysql/sql/mysql_priv.h Thu Jun 3 11:50:27 2010 +++ rebuild.2.0/mysql/sql/mysql_priv.h Mon Nov 8 13:29:47 2010 @@ -603,7 +603,11 @@ #define portable_sizeof_char_ptr 8 +#ifdef __VOS__ +#define tmp_file_prefix "=sql" /**< Prefix for tmp tables */ +#else #define tmp_file_prefix "#sql" /**< Prefix for tmp tables */ +#endif #define tmp_file_prefix_length 4 /* Flags for calc_week() function. */ @@ -2302,7 +2306,11 @@ const char *get_canonical_filename(handler *file, const char *path, char *tmp_path); +#ifdef __VOS__ +#define MYSQL50_TABLE_NAME_PREFIX "=mysql50=" +#else #define MYSQL50_TABLE_NAME_PREFIX "#mysql50#" +#endif #define MYSQL50_TABLE_NAME_PREFIX_LENGTH 9 uint build_table_shadow_filename(char *buff, size_t bufflen, diff -ur porting_base.2.0/mysql/sql/mysqld.cc rebuild.2.0/mysql/sql/mysqld.cc --- porting_base.2.0/mysql/sql/mysqld.cc Thu Jun 3 11:50:10 2010 +++ rebuild.2.0/mysql/sql/mysqld.cc Tue Mar 8 12:59:53 2011 @@ -1588,18 +1588,37 @@ static void set_effective_user(struct passwd *user_info_arg) { -#if !defined(__WIN__) && !defined(__NETWARE__) +#ifdef HAVE_SETREGID DBUG_ASSERT(user_info_arg != 0); if (setregid((gid_t)-1, user_info_arg->pw_gid) == -1) { sql_perror("setregid"); unireg_abort(1); } +#else +#ifdef HAVE_SETEGID + DBUG_ASSERT(user_info_arg != 0); + if (setegid(user_info_arg->pw_gid) == -1) + { + sql_perror("setegid"); + unireg_abort(1); + } +#endif +#endif +#ifdef HAVE_SETREUID if (setreuid((uid_t)-1, user_info_arg->pw_uid) == -1) { sql_perror("setreuid"); unireg_abort(1); } +#else +#ifdef HAVE_SETEUID + if (seteuid(user_info_arg->pw_uid) == -1) + { + sql_perror("seteuid"); + unireg_abort(1); + } +#endif #endif } @@ -1607,7 +1626,7 @@ /** Change root user if started with @c --chroot . */ static void set_root(const char *path) { -#if !defined(__WIN__) && !defined(__NETWARE__) +#ifdef HAVE_CHROOT if (chroot(path) == -1) { sql_perror("chroot"); @@ -5837,9 +5856,11 @@ {"character-sets-dir", OPT_CHARSETS_DIR, "Directory where character sets are.", (uchar**) &charsets_dir, (uchar**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, +#ifdef HAVE_CHROOT {"chroot", 'r', "Chroot mysqld daemon during startup.", (uchar**) &mysqld_chroot, (uchar**) &mysqld_chroot, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, +#endif {"collation-server", OPT_DEFAULT_COLLATION, "Set the default collation.", (uchar**) &default_collation_name, (uchar**) &default_collation_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, @@ -6842,7 +6863,12 @@ "Don't use the fast sort index method to created index if the temporary file would get bigger than this.", (uchar**) &global_system_variables.myisam_max_sort_file_size, (uchar**) &max_system_variables.myisam_max_sort_file_size, 0, +#ifdef __VOS__ + /* Use MAX_FILE_SIZE as the maximum value, not LONG_MAX. */ + GET_ULL, REQUIRED_ARG, (longlong) MAX_FILE_SIZE, 0, (ulonglong) MAX_FILE_SIZE, +#else GET_ULL, REQUIRED_ARG, (longlong) LONG_MAX, 0, (ulonglong) MAX_FILE_SIZE, +#endif 0, 1024*1024, 0}, {"myisam_mmap_size", OPT_MYISAM_MMAP_SIZE, "Can be used to restrict the total memory used for memory mmaping of myisam files", Binary files porting_base.2.0/mysql/sql/share/english/errmsg.sys and rebuild.2.0/mysql/sql/share/english/errmsg.sys differ diff -ur porting_base.2.0/mysql/sql/sql_class.cc rebuild.2.0/mysql/sql/sql_class.cc --- porting_base.2.0/mysql/sql/sql_class.cc Thu Jun 3 11:50:11 2010 +++ rebuild.2.0/mysql/sql/sql_class.cc Fri Apr 15 13:04:34 2011 @@ -1566,7 +1566,7 @@ select_result::select_result() { thd=current_thd; - nest_level= -1; + nest_level= UINT_MAX; } void select_result::send_error(uint errcode,const char *err) diff -ur porting_base.2.0/mysql/sql/sql_partition.cc rebuild.2.0/mysql/sql/sql_partition.cc --- porting_base.2.0/mysql/sql/sql_partition.cc Thu Jun 3 11:50:11 2010 +++ rebuild.2.0/mysql/sql/sql_partition.cc Mon Nov 8 13:29:46 2010 @@ -7180,11 +7180,11 @@ else transl_part= in2; if (name_variant == NORMAL_PART_NAME) - strxmov(out, in1, "#P#", transl_part, NullS); + strxmov(out, in1, "=P=", transl_part, NullS); else if (name_variant == TEMP_PART_NAME) - strxmov(out, in1, "#P#", transl_part, "#TMP#", NullS); + strxmov(out, in1, "=P=", transl_part, "=TMP=", NullS); else if (name_variant == RENAMED_PART_NAME) - strxmov(out, in1, "#P#", transl_part, "#REN#", NullS); + strxmov(out, in1, "=P=", transl_part, "=REN=", NullS); } @@ -7216,14 +7216,14 @@ tablename_to_filename(in2, transl_part_name, FN_REFLEN); tablename_to_filename(in3, transl_subpart_name, FN_REFLEN); if (name_variant == NORMAL_PART_NAME) - strxmov(out, in1, "#P#", transl_part_name, - "#SP#", transl_subpart_name, NullS); + strxmov(out, in1, "=P=", transl_part_name, + "=SP=", transl_subpart_name, NullS); else if (name_variant == TEMP_PART_NAME) - strxmov(out, in1, "#P#", transl_part_name, - "#SP#", transl_subpart_name, "#TMP#", NullS); + strxmov(out, in1, "=P=", transl_part_name, + "=SP=", transl_subpart_name, "=TMP=", NullS); else if (name_variant == RENAMED_PART_NAME) - strxmov(out, in1, "#P#", transl_part_name, - "#SP#", transl_subpart_name, "#REN#", NullS); + strxmov(out, in1, "=P=", transl_part_name, + "=SP=", transl_subpart_name, "=REN=", NullS); } #endif diff -ur porting_base.2.0/mysql/sql/sql_show.cc rebuild.2.0/mysql/sql/sql_show.cc --- porting_base.2.0/mysql/sql/sql_show.cc Thu Jun 3 11:50:11 2010 +++ rebuild.2.0/mysql/sql/sql_show.cc Fri Apr 15 13:04:35 2011 @@ -2288,7 +2288,14 @@ end= int10_to_str(*(long*) value, buff, 10); break; case SHOW_LONGLONG_STATUS: +#if SIZEOF_OFF_T > 4 + /* Using sizeof(off_t) as a proxy for the max size of a file or + address space. perhaps we should check SIZEOF_UINTPTR_T, but + it does not exist. */ value= ((char *) status_var + (ulonglong) value); +#else + value= ((char *) status_var + (ulong) value); +#endif /* fall through */ case SHOW_LONGLONG: end= longlong10_to_str(*(longlong*) value, buff, 10); diff -ur porting_base.2.0/mysql/sql/sql_table.cc rebuild.2.0/mysql/sql/sql_table.cc --- porting_base.2.0/mysql/sql/sql_table.cc Thu Jun 3 11:50:11 2010 +++ rebuild.2.0/mysql/sql/sql_table.cc Mon Nov 8 13:29:47 2010 @@ -152,8 +152,8 @@ @details Break down the path name to its logic parts (database, table, partition, subpartition). filename_to_tablename cannot be used on partitions, due to the #P# part. - There can be up to 6 '#', #P# for partition, #SP# for subpartition - and #TMP# or #REN# for temporary or renamed partitions. + There can be up to 6 '=', =P= for partition, =SP= for subpartition + and =TMP= or =REN= for temporary or renamed partitions. This should be used when something should be presented to a user in a diagnostic, error etc. when it would be useful to know what a particular file [and directory] means. Such as SHOW ENGINE STATUS, error messages etc. @@ -215,13 +215,21 @@ table_name= tmp_p; } tmp_p= table_name; +#ifdef __VOS__ + while (!res && (tmp_p= strchr(tmp_p, '='))) +#else while (!res && (tmp_p= strchr(tmp_p, '#'))) +#endif { tmp_p++; switch (tmp_p[0]) { case 'P': case 'p': +#ifdef __VOS__ + if (tmp_p[1] == '=') +#else if (tmp_p[1] == '#') +#endif part_name= tmp_p + 2; else res= 1; @@ -229,7 +237,11 @@ break; case 'S': case 's': +#ifdef __VOS__ + if ((tmp_p[1] == 'P' || tmp_p[1] == 'p') && tmp_p[2] == '=') +#else if ((tmp_p[1] == 'P' || tmp_p[1] == 'p') && tmp_p[2] == '#') +#endif { part_name_len= tmp_p - part_name - 1; subpart_name= tmp_p + 3; @@ -242,7 +254,11 @@ case 't': if ((tmp_p[1] == 'M' || tmp_p[1] == 'm') && (tmp_p[2] == 'P' || tmp_p[2] == 'p') && +#ifdef __VOS__ + tmp_p[3] == '=' && !tmp_p[4]) +#else tmp_p[3] == '#' && !tmp_p[4]) +#endif name_type= TEMP; else res= 3; @@ -252,7 +268,11 @@ case 'r': if ((tmp_p[1] == 'E' || tmp_p[1] == 'e') && (tmp_p[2] == 'N' || tmp_p[2] == 'n') && +#ifdef __VOS__ + tmp_p[3] == '=' && !tmp_p[4]) +#else tmp_p[3] == '#' && !tmp_p[4]) +#endif name_type= RENAMED; else res= 4; @@ -404,14 +424,18 @@ bool check_mysql50_prefix(const char *name) { +#ifdef __VOS__ + return (name[0] == '=' && +#else return (name[0] == '#' && +#endif !strncmp(name, MYSQL50_TABLE_NAME_PREFIX, MYSQL50_TABLE_NAME_PREFIX_LENGTH)); } /** - Check if given string begins with "#mysql50#" prefix, cut it if so. + Check if given string begins with "=mysql50=" prefix, cut it if so. @param from string to check and cut @param to[out] buffer for result string diff -ur porting_base.2.0/mysql/sql/table.cc rebuild.2.0/mysql/sql/table.cc --- porting_base.2.0/mysql/sql/table.cc Thu Jun 3 11:50:28 2010 +++ rebuild.2.0/mysql/sql/table.cc Mon Nov 8 13:29:44 2010 @@ -2203,7 +2203,11 @@ switch (error) { case 7: case 1: +#ifdef __VOS__ + if (db_errno == ENOENT || db_errno == ENAMETOOLONG) +#else if (db_errno == ENOENT) +#endif my_error(ER_NO_SUCH_TABLE, MYF(0), share->db.str, share->table_name.str); else { @@ -2226,7 +2230,11 @@ datext= ""; } } +#ifdef __VOS__ + err_no= (db_errno == ENOENT || db_errno == ENAMETOOLONG) ? ER_FILE_NOT_FOUND : (db_errno == EAGAIN) ? +#else err_no= (db_errno == ENOENT) ? ER_FILE_NOT_FOUND : (db_errno == EAGAIN) ? +#endif ER_FILE_USED : ER_CANT_OPEN_FILE; strxmov(buff, share->normalized_path.str, datext, NullS); my_error(err_no,errortype, buff, db_errno); diff -ur porting_base.2.0/mysql/storage/archive/ha_archive.cc rebuild.2.0/mysql/storage/archive/ha_archive.cc --- porting_base.2.0/mysql/storage/archive/ha_archive.cc Thu Jun 3 11:50:02 2010 +++ rebuild.2.0/mysql/storage/archive/ha_archive.cc Mon Nov 8 13:22:30 2010 @@ -629,7 +629,11 @@ /* We reuse name_buff since it is available. */ +#ifdef __VOS__ + if (create_info->data_file_name && create_info->data_file_name[0] != '=') +#else if (create_info->data_file_name && create_info->data_file_name[0] != '#') +#endif { DBUG_PRINT("ha_archive", ("archive will create stream file %s", create_info->data_file_name)); diff -ur porting_base.2.0/mysql/storage/innobase/fil/fil0fil.c rebuild.2.0/mysql/storage/innobase/fil/fil0fil.c --- porting_base.2.0/mysql/storage/innobase/fil/fil0fil.c Thu Jun 3 11:49:59 2010 +++ rebuild.2.0/mysql/storage/innobase/fil/fil0fil.c Mon Nov 8 13:28:00 2010 @@ -27,6 +27,11 @@ #include "mtr0log.h" #include "dict0dict.h" +#ifdef __VOS__ +#define tmp_file_prefix "=sql" /* Prefix for tmp tables */ +#else +#define tmp_file_prefix "#sql" /* Prefix for tmp tables */ +#endif /* IMPLEMENTATION OF THE TABLESPACE MEMORY CACHE @@ -2746,7 +2751,7 @@ "InnoDB: commands DISCARD TABLESPACE and" " IMPORT TABLESPACE?\n" "InnoDB: It is also possible that this is" - " a temporary table #sql...,\n" + " a temporary table " tmp_file_prefix "...,\n" "InnoDB: and MySQL removed the .ibd file for this.\n" "InnoDB: Please refer to\n" "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/" diff -ur porting_base.2.0/mysql/storage/innobase/os/os0file.c rebuild.2.0/mysql/storage/innobase/os/os0file.c --- porting_base.2.0/mysql/storage/innobase/os/os0file.c Thu Jun 3 11:49:59 2010 +++ rebuild.2.0/mysql/storage/innobase/os/os0file.c Fri Apr 15 13:04:07 2011 @@ -1710,13 +1710,13 @@ return(FALSE); } - if (sizeof(off_t) > 4) { - *size = (ulint)(offs & 0xFFFFFFFFUL); - *size_high = (ulint)(offs >> 32); - } else { - *size = (ulint) offs; - *size_high = 0; - } +#if SIZEOF_OFF_T > 4 + *size = (ulint)(offs & 0xFFFFFFFFUL); + *size_high = (ulint)(offs >> 32); +#else + *size = (ulint) offs; + *size_high = 0; +#endif return(TRUE); #endif @@ -2022,17 +2022,16 @@ /* If off_t is > 4 bytes in size, then we assume we can pass a 64-bit address */ - if (sizeof(off_t) > 4) { - offs = (off_t)offset + (((off_t)offset_high) << 32); - - } else { - offs = (off_t)offset; +#if SIZEOF_OFF_T > 4 + offs = (off_t)offset + (((off_t)offset_high) << 32); +#else + offs = (off_t)offset; - if (offset_high > 0) { - fprintf(stderr, - "InnoDB: Error: file read at offset > 4 GB\n"); - } + if (offset_high > 0) { + fprintf(stderr, + "InnoDB: Error: file read at offset > 4 GB\n"); } +#endif os_n_file_reads++; @@ -2107,17 +2106,17 @@ /* If off_t is > 4 bytes in size, then we assume we can pass a 64-bit address */ - if (sizeof(off_t) > 4) { - offs = (off_t)offset + (((off_t)offset_high) << 32); - } else { - offs = (off_t)offset; +#if SIZEOF_OFF_T > 4 + offs = (off_t)offset + (((off_t)offset_high) << 32); +#else + offs = (off_t)offset; - if (offset_high > 0) { - fprintf(stderr, - "InnoDB: Error: file write" - " at offset > 4 GB\n"); - } + if (offset_high > 0) { + fprintf(stderr, + "InnoDB: Error: file write" + " at offset > 4 GB\n"); } +#endif os_n_file_writes++; diff -ur porting_base.2.0/mysql/storage/innobase/row/row0mysql.c rebuild.2.0/mysql/storage/innobase/row/row0mysql.c --- porting_base.2.0/mysql/storage/innobase/row/row0mysql.c Thu Jun 3 11:50:08 2010 +++ rebuild.2.0/mysql/storage/innobase/row/row0mysql.c Mon Nov 8 13:28:24 2010 @@ -32,6 +32,12 @@ #include "fil0fil.h" #include "ibuf0ibuf.h" +#ifdef __VOS__ +#define tmp_file_prefix "=sql" /* Prefix for tmp tables */ +#else +#define tmp_file_prefix "#sql" /* Prefix for tmp tables */ +#endif + /* A dummy variable used to fool the compiler */ ibool row_mysql_identically_false = FALSE; @@ -3520,7 +3526,7 @@ const char* name) /* in: table name in the form 'database/tablename' */ { - return(strstr(name, "/#sql") != NULL); + return(strstr(name, "/" tmp_file_prefix) != NULL); /* return(strstr(name, "/@0023sql") != NULL); */ } @@ -3834,7 +3840,7 @@ "innodb-troubleshooting.html\n" "InnoDB: If table ", stderr); ut_print_name(stderr, trx, TRUE, new_name); - fputs(" is a temporary table #sql..., then" + fputs(" is a temporary table " tmp_file_prefix "..., then" " it can be that\n" "InnoDB: there are still queries running" " on the table, and it will be\n" diff -ur porting_base.2.0/mysql/storage/innobase/srv/srv0srv.c rebuild.2.0/mysql/storage/innobase/srv/srv0srv.c --- porting_base.2.0/mysql/storage/innobase/srv/srv0srv.c Thu Jun 3 11:50:08 2010 +++ rebuild.2.0/mysql/storage/innobase/srv/srv0srv.c Mon Nov 8 13:28:00 2010 @@ -71,7 +71,11 @@ const char* srv_main_thread_op_info = ""; /* Prefix used by MySQL to indicate pre-5.1 table name encoding */ +#ifdef __VOS__ +const char srv_mysql50_table_name_prefix[9] = "=mysql50="; +#else const char srv_mysql50_table_name_prefix[9] = "#mysql50#"; +#endif /* Server parameters which are read from the initfile */ diff -ur porting_base.2.0/mysql/storage/innodb_plugin/fil/fil0fil.c rebuild.2.0/mysql/storage/innodb_plugin/fil/fil0fil.c --- porting_base.2.0/mysql/storage/innodb_plugin/fil/fil0fil.c Thu Jun 3 11:50:08 2010 +++ rebuild.2.0/mysql/storage/innodb_plugin/fil/fil0fil.c Mon Nov 8 13:27:21 2010 @@ -3000,7 +3000,11 @@ "InnoDB: commands DISCARD TABLESPACE and" " IMPORT TABLESPACE?\n" "InnoDB: It is also possible that this is" +#ifdef __VOS__ + " a temporary table =sql...,\n" +#else " a temporary table #sql...,\n" +#endif "InnoDB: and MySQL removed the .ibd file for this.\n" "InnoDB: Please refer to\n" "InnoDB: " REFMAN "innodb-troubleshooting-datadict.html\n" diff -ur porting_base.2.0/mysql/storage/innodb_plugin/handler/ha_innodb.cc rebuild.2.0/mysql/storage/innodb_plugin/handler/ha_innodb.cc --- porting_base.2.0/mysql/storage/innodb_plugin/handler/ha_innodb.cc Thu Jun 3 11:50:27 2010 +++ rebuild.2.0/mysql/storage/innodb_plugin/handler/ha_innodb.cc Mon Nov 8 13:27:25 2010 @@ -11022,6 +11022,25 @@ {buf, 4, "ab@0060cd", 9, NULL, TRUE, "\"ab\""}, {buf, sizeof(buf), "ab\"cd", 5, NULL, TRUE, +#ifdef __VOS__ + "\"=mysql50=ab\"\"cd\""}, + {buf, 17, "ab\"cd", 5, NULL, TRUE, + "\"=mysql50=ab\"\"cd\""}, + {buf, 16, "ab\"cd", 5, NULL, TRUE, + "\"=mysql50=ab\"\"c\""}, + {buf, 15, "ab\"cd", 5, NULL, TRUE, + "\"=mysql50=ab\"\"\""}, + {buf, 14, "ab\"cd", 5, NULL, TRUE, + "\"=mysql50=ab\""}, + {buf, 13, "ab\"cd", 5, NULL, TRUE, + "\"=mysql50=ab\""}, + {buf, 12, "ab\"cd", 5, NULL, TRUE, + "\"=mysql50=a\""}, + {buf, 11, "ab\"cd", 5, NULL, TRUE, + "\"=mysql50=\""}, + {buf, 10, "ab\"cd", 5, NULL, TRUE, + "\"=mysql50\""}, +#else "\"#mysql50#ab\"\"cd\""}, {buf, 17, "ab\"cd", 5, NULL, TRUE, "\"#mysql50#ab\"\"cd\""}, @@ -11039,6 +11058,7 @@ "\"#mysql50#\""}, {buf, 10, "ab\"cd", 5, NULL, TRUE, "\"#mysql50\""}, +#endif {buf, sizeof(buf), "ab/cd", 5, NULL, TRUE, "\"ab\".\"cd\""}, {buf, 9, "ab/cd", 5, NULL, TRUE, "\"ab\".\"cd\""}, diff -ur porting_base.2.0/mysql/storage/innodb_plugin/os/os0file.c rebuild.2.0/mysql/storage/innodb_plugin/os/os0file.c --- porting_base.2.0/mysql/storage/innodb_plugin/os/os0file.c Thu Jun 3 11:49:59 2010 +++ rebuild.2.0/mysql/storage/innodb_plugin/os/os0file.c Fri Apr 15 13:04:01 2011 @@ -1761,13 +1761,13 @@ return(FALSE); } - if (sizeof(off_t) > 4) { - *size = (ulint)(offs & 0xFFFFFFFFUL); - *size_high = (ulint)(offs >> 32); - } else { - *size = (ulint) offs; - *size_high = 0; - } +#if SIZEOF_OFF_T > 4 + *size = (ulint)(offs & 0xFFFFFFFFUL); + *size_high = (ulint)(offs >> 32); +#else + *size = (ulint) offs; + *size_high = 0; +#endif return(TRUE); #endif @@ -2075,17 +2075,16 @@ /* If off_t is > 4 bytes in size, then we assume we can pass a 64-bit address */ - if (sizeof(off_t) > 4) { - offs = (off_t)offset + (((off_t)offset_high) << 32); - - } else { - offs = (off_t)offset; +#if SIZEOF_OFF_T > 4 + offs = (off_t)offset + (((off_t)offset_high) << 32); +#else + offs = (off_t)offset; - if (offset_high > 0) { - fprintf(stderr, - "InnoDB: Error: file read at offset > 4 GB\n"); - } + if (offset_high > 0) { + fprintf(stderr, + "InnoDB: Error: file read at offset > 4 GB\n"); } +#endif os_n_file_reads++; @@ -2166,17 +2165,17 @@ /* If off_t is > 4 bytes in size, then we assume we can pass a 64-bit address */ - if (sizeof(off_t) > 4) { - offs = (off_t)offset + (((off_t)offset_high) << 32); - } else { - offs = (off_t)offset; +#if SIZEOF_OFF_T > 4 + offs = (off_t)offset + (((off_t)offset_high) << 32); +#else + offs = (off_t)offset; - if (offset_high > 0) { - fprintf(stderr, - "InnoDB: Error: file write" - " at offset > 4 GB\n"); - } + if (offset_high > 0) { + fprintf(stderr, + "InnoDB: Error: file write" + " at offset > 4 GB\n"); } +#endif os_n_file_writes++; diff -ur porting_base.2.0/mysql/storage/innodb_plugin/row/row0mysql.c rebuild.2.0/mysql/storage/innodb_plugin/row/row0mysql.c --- porting_base.2.0/mysql/storage/innodb_plugin/row/row0mysql.c Thu Jun 3 11:50:27 2010 +++ rebuild.2.0/mysql/storage/innodb_plugin/row/row0mysql.c Mon Nov 8 13:27:49 2010 @@ -3584,7 +3584,11 @@ const char* name) /*!< in: table name in the form 'database/tablename' */ { +#ifdef __VOS__ + return(strstr(name, "/=sql") != NULL); +#else return(strstr(name, "/#sql") != NULL); +#endif /* return(strstr(name, "/@0023sql") != NULL); */ } @@ -3879,7 +3883,11 @@ "InnoDB: " REFMAN "innodb-troubleshooting.html\n" "InnoDB: If table ", stderr); ut_print_name(stderr, trx, TRUE, new_name); +#ifdef __VOS__ + fputs(" is a temporary table =sql..., then" +#else fputs(" is a temporary table #sql..., then" +#endif " it can be that\n" "InnoDB: there are still queries running" " on the table, and it will be\n" diff -ur porting_base.2.0/mysql/storage/innodb_plugin/srv/srv0srv.c rebuild.2.0/mysql/storage/innodb_plugin/srv/srv0srv.c --- porting_base.2.0/mysql/storage/innodb_plugin/srv/srv0srv.c Thu Jun 3 11:50:08 2010 +++ rebuild.2.0/mysql/storage/innodb_plugin/srv/srv0srv.c Mon Nov 8 13:27:21 2010 @@ -108,7 +108,11 @@ UNIV_INTERN const char* srv_main_thread_op_info = ""; /** Prefix used by MySQL to indicate pre-5.1 table name encoding */ +#ifdef __VOS__ +UNIV_INTERN const char srv_mysql50_table_name_prefix[9] = "=mysql50="; +#else UNIV_INTERN const char srv_mysql50_table_name_prefix[9] = "#mysql50#"; +#endif /* Server parameters which are read from the initfile */ diff -ur porting_base.2.0/mysql/storage/myisam/mi_dynrec.c rebuild.2.0/mysql/storage/myisam/mi_dynrec.c --- porting_base.2.0/mysql/storage/myisam/mi_dynrec.c Thu Jun 3 11:50:02 2010 +++ rebuild.2.0/mysql/storage/myisam/mi_dynrec.c Tue Nov 30 14:02:37 2010 @@ -122,6 +122,20 @@ info->s->file_write= mi_nommap_pwrite; info->s->file_map= 0; info->s->mmaped_length= 0; + +#ifdef __VOS__ + /* Close and re-open the fd after unmapping the file because + mysqld will try to write using the same file handle which + VOS does not support. */ + if(my_close(info->dfile, MYF(0)) == -1){ + DBUG_RETURN(-1); + } + + if((info->dfile=my_open(my_file_info[info->dfile].name, O_RDWR, MYF(0))) == -1){ + DBUG_RETURN(-1); + } +#endif + DBUG_RETURN(0); } diff -ur porting_base.2.0/mysql/support-files/my-huge.cnf.sh rebuild.2.0/mysql/support-files/my-huge.cnf.sh --- porting_base.2.0/mysql/support-files/my-huge.cnf.sh Thu Jun 3 11:50:20 2010 +++ rebuild.2.0/mysql/support-files/my-huge.cnf.sh Fri Apr 15 13:04:13 2011 @@ -25,7 +25,7 @@ [mysqld] port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ -skip-locking +skip-external-locking key_buffer_size = 384M max_allowed_packet = 1M table_open_cache = 512 @@ -120,6 +120,8 @@ # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend +# Uncomment the following if your database needs more than 2GB +#innodb_file_per_table #innodb_log_group_home_dir = @localstatedir@/ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high diff -ur porting_base.2.0/mysql/support-files/my-innodb-heavy-4G.cnf.sh rebuild.2.0/mysql/support-files/my-innodb-heavy-4G.cnf.sh --- porting_base.2.0/mysql/support-files/my-innodb-heavy-4G.cnf.sh Thu Jun 3 11:50:20 2010 +++ rebuild.2.0/mysql/support-files/my-innodb-heavy-4G.cnf.sh Fri Apr 15 13:04:14 2011 @@ -380,6 +380,9 @@ # about this. innodb_data_file_path = ibdata1:10M:autoextend +# Set this option if your database needs more than 2GB. +#innodb_file_per_table + # Set this option if you would like the InnoDB tablespace files to be # stored in another location. By default this is the MySQL datadir. #innodb_data_home_dir = diff -ur porting_base.2.0/mysql/support-files/my-large.cnf.sh rebuild.2.0/mysql/support-files/my-large.cnf.sh --- porting_base.2.0/mysql/support-files/my-large.cnf.sh Thu Jun 3 11:50:21 2010 +++ rebuild.2.0/mysql/support-files/my-large.cnf.sh Fri Apr 15 13:04:14 2011 @@ -25,7 +25,7 @@ [mysqld] port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ -skip-locking +skip-external-locking key_buffer_size = 256M max_allowed_packet = 1M table_open_cache = 256 @@ -120,6 +120,8 @@ # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:10M:autoextend +# Uncomment the following if your database needs more than 2GB +#innodb_file_per_table #innodb_log_group_home_dir = @localstatedir@/ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high diff -ur porting_base.2.0/mysql/support-files/my-medium.cnf.sh rebuild.2.0/mysql/support-files/my-medium.cnf.sh --- porting_base.2.0/mysql/support-files/my-medium.cnf.sh Thu Jun 3 11:50:21 2010 +++ rebuild.2.0/mysql/support-files/my-medium.cnf.sh Fri Apr 15 13:04:13 2011 @@ -26,7 +26,7 @@ [mysqld] port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ -skip-locking +skip-external-locking key_buffer_size = 16M max_allowed_packet = 1M table_open_cache = 64 @@ -118,6 +118,8 @@ # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:10M:autoextend +# Uncomment the following if your database needs more than 2GB +#innodb_file_per_table #innodb_log_group_home_dir = @localstatedir@/ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high diff -ur porting_base.2.0/mysql/support-files/my-small.cnf.sh rebuild.2.0/mysql/support-files/my-small.cnf.sh --- porting_base.2.0/mysql/support-files/my-small.cnf.sh Thu Jun 3 11:50:21 2010 +++ rebuild.2.0/mysql/support-files/my-small.cnf.sh Fri Apr 15 13:04:14 2011 @@ -26,7 +26,7 @@ [mysqld] port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ -skip-locking +skip-external-locking key_buffer_size = 16K max_allowed_packet = 1M table_open_cache = 4 @@ -54,6 +54,8 @@ # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:10M:autoextend +# Uncomment the following if your database needs more than 2GB +#innodb_file_per_table #innodb_log_group_home_dir = @localstatedir@/ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high diff -ur porting_base.2.0/mysql/tests/Makefile.in rebuild.2.0/mysql/tests/Makefile.in --- porting_base.2.0/mysql/tests/Makefile.in Thu Jun 3 11:54:40 2010 +++ rebuild.2.0/mysql/tests/Makefile.in Fri Jan 7 12:58:01 2011 @@ -483,17 +483,17 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-binPROGRAMS: $(bin_PROGRAMS) +install-binPROGRAMS: @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ + @list='$(bin_PROGRAMS)'; if [ "${host_os}" = "vos" ]; then exe_dir="./.libs/"; else exe_dir=""; fi; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) $$exe_dir'$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) $$exe_dir"$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -673,7 +673,7 @@ install-data: install-data-am uninstall: uninstall-am -install-am: all-am +install-am: @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am diff -ur porting_base.2.0/mysql/tests/mysql_client_test.c rebuild.2.0/mysql/tests/mysql_client_test.c --- porting_base.2.0/mysql/tests/mysql_client_test.c Thu Jun 3 11:50:27 2010 +++ rebuild.2.0/mysql/tests/mysql_client_test.c Mon Nov 8 13:22:15 2010 @@ -17265,13 +17265,19 @@ #define LARGE_BUFFER_SIZE 2048 +#ifdef __VOS__ +#define BUG31669_NAME_LEN 32 +#else +#define BUG31669_NAME_LEN NAME_CHAR_LEN +#endif + static void test_bug31669() { int rc; static char buff[LARGE_BUFFER_SIZE+1]; #ifndef EMBEDDED_LIBRARY static char user[USERNAME_CHAR_LENGTH+1]; - static char db[NAME_CHAR_LEN+1]; + static char db[BUG31669_NAME_LEN+1]; static char query[LARGE_BUFFER_SIZE*2]; #endif @@ -17294,7 +17300,7 @@ #ifndef EMBEDDED_LIBRARY memset(db, 'a', sizeof(db)); - db[NAME_CHAR_LEN]= 0; + db[BUG31669_NAME_LEN]= 0; strxmov(query, "CREATE DATABASE IF NOT EXISTS ", db, NullS); rc= mysql_query(mysql, query); myquery(rc); @@ -17329,11 +17335,11 @@ DIE_UNLESS(rc); buff[LARGE_BUFFER_SIZE-1]= 'c'; - db[NAME_CHAR_LEN-1]= 'e'; + db[BUG31669_NAME_LEN-1]= 'e'; rc= mysql_change_user(mysql, user, buff, db); DIE_UNLESS(rc); - db[NAME_CHAR_LEN-1]= 'a'; + db[BUG31669_NAME_LEN-1]= 'a'; rc= mysql_change_user(mysql, user, buff, db); DIE_UNLESS(!rc); @@ -18079,7 +18085,11 @@ result= mysql_list_fields(mysql, "../client_test_db/t1", NULL); DIE_IF(result); +#ifdef __VOS__ + result= mysql_list_fields(mysql, "=mysql50=/../client_test_db/t1", NULL); +#else result= mysql_list_fields(mysql, "#mysql50#/../client_test_db/t1", NULL); +#endif DIE_IF(result); rc= mysql_change_user(mysql, opt_user, opt_password, current_db); diff -ur porting_base.2.0/mysql/unittest/unit.pl rebuild.2.0/mysql/unittest/unit.pl --- porting_base.2.0/mysql/unittest/unit.pl Thu Jun 3 11:50:26 2010 +++ rebuild.2.0/mysql/unittest/unit.pl Mon Nov 8 13:28:36 2010 @@ -56,7 +56,7 @@ my @files; find sub { $File::Find::prune = 1 if /^SCCS$/; - push(@files, $File::Find::name) if -x _ && /-t\z/; + push(@files, $File::Find::name) if -x _ && /-t.pm\z/; }, @dirs; return @files; } @@ -94,6 +94,10 @@ foreach (@files) { s!^\./!! } $ENV{'HARNESS_PERL_SWITCHES'} .= q" -e 'exec @ARGV'"; runtests @files; + } + else + { + print "No tests found.\n"; } }