[packages/mysql/MYSQL_5_0] Rediff patches / changes for newer rpms
arekm
arekm at pld-linux.org
Tue Oct 18 08:39:34 CEST 2022
commit 4e026dffe93d53518a4b45056b13dcd38ac9c930
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Oct 18 08:36:30 2022 +0200
Rediff patches / changes for newer rpms
bison3.patch | 15 ++-
community-mysql-dh1024.patch | 14 +-
mysql-align.patch | 21 +--
mysql-atomic.patch | 280 ++++++++++++++++-----------------------
mysql-build.patch | 10 +-
mysql-fix_privilege_tables.patch | 10 +-
mysql-info.patch | 9 +-
mysql-innodb_io_pattern.patch | 202 ++++++++++++++--------------
mysql-microsec_process.patch | 74 +++++------
mysql-noproc.patch | 17 +--
mysql-show_patches.patch | 108 +++++++--------
mysql-sphinx.patch | 224 ++++++++++++++++---------------
mysql.spec | 12 +-
13 files changed, 481 insertions(+), 515 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index d52de6b..5c053cc 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -17,7 +17,6 @@
%bcond_without sphinx # Sphinx storage engine support
%bcond_with xtrabackup # XtraBackup
-%include /usr/lib/rpm/macros.perl
Summary: MySQL: a very fast and reliable SQL database engine
Summary(de.UTF-8): MySQL: ist eine SQL-Datenbank
Summary(fr.UTF-8): MySQL: un serveur SQL rapide et fiable
@@ -131,7 +130,7 @@ Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires(triggerpostun): sed >= 4.0
+Requires(postun): sed >= 4.0
Requires: %{name}-charsets = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: /usr/bin/setsid
@@ -154,7 +153,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _mysqlhome /home/services/mysql
# CFLAGS for innodb are altered
-%unglobal configure_cache
+%undefine configure_cache
%define filterout_c -Werror=format-security
@@ -578,7 +577,7 @@ mv sphinx-*/mysqlse sql/sphinx
%patch119 -p1
# </percona>
-%patch21 -p0
+%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
@@ -840,7 +839,8 @@ fi
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%triggerpostun -- mysql < 4.0.20-2.4
+%triggerpostun -- mysql < 4.1.1
+# mysql < 4.0.20-2.4
# For clusters in /etc/%{name}/clusters.conf
if [ -f /etc/sysconfig/mysql ]; then
. /etc/sysconfig/mysql
@@ -855,7 +855,7 @@ if [ -f /etc/sysconfig/mysql ]; then
fi
fi
-%triggerpostun -- mysql < 4.1.1
+# mysql < 4.1.1
# For better compatibility with prevoius versions:
for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
if echo "$config" | grep -q '^/'; then
diff --git a/bison3.patch b/bison3.patch
index ae889df..b96bb51 100644
--- a/bison3.patch
+++ b/bison3.patch
@@ -1,6 +1,7 @@
---- Percona-Server-5.5.32-rel31.0/sql/sql_yacc.yy.orig 2013-07-01 05:16:34.000000000 +0200
-+++ Percona-Server-5.5.32-rel31.0/sql/sql_yacc.yy 2013-08-18 21:33:19.181583895 +0200
-@@ -26,8 +26,6 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_yacc.yy mysql-5.0.96/sql/sql_yacc.yy
+--- mysql-5.0.96.org/sql/sql_yacc.yy 2022-10-18 08:35:15.302731318 +0200
++++ mysql-5.0.96/sql/sql_yacc.yy 2022-10-18 08:35:16.586064652 +0200
+@@ -21,8 +21,6 @@
** The type will be void*, so it must be cast to (THD*) when used.
** Use the YYTHD macro for this.
*/
@@ -8,8 +9,8 @@
-#define YYLEX_PARAM yythd
#define YYTHD ((THD *)yythd)
#define YYLIP (& YYTHD->m_parser_state->m_lip)
- #define YYPS (& YYTHD->m_parser_state->m_yacc)
-@@ -50,7 +50,7 @@
+
+@@ -52,7 +50,7 @@ int yylex(void *yylval, void *yythd);
const LEX_STRING null_lex_str={0,0};
@@ -18,7 +19,7 @@
#undef WARN_DEPRECATED /* this macro is also defined in mysql_priv.h */
#define WARN_DEPRECATED(A,B) \
-@@ -174,7 +172,7 @@
+@@ -123,7 +121,7 @@ void my_parse_error(const char *s)
to abort from the parser.
*/
@@ -27,7 +28,7 @@
{
THD *thd= current_thd;
-@@ -490,7 +490,9 @@
+@@ -492,7 +490,9 @@ static bool add_create_index (LEX *lex,
bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%}
diff --git a/community-mysql-dh1024.patch b/community-mysql-dh1024.patch
index 620ee0b..815d74a 100644
--- a/community-mysql-dh1024.patch
+++ b/community-mysql-dh1024.patch
@@ -5,12 +5,12 @@ mode is on, but it doesn't seem worth the trouble.)
The new parameter value was generated using "openssl dhparam -C 1024".
-diff -Naur mysql-5.5.28.orig/vio/viosslfactories.c mysql-5.5.28/vio/viosslfactories.c
---- mysql-5.5.28.orig/vio/viosslfactories.c 2012-08-29 04:50:46.000000000 -0400
-+++ mysql-5.5.28/vio/viosslfactories.c 2012-11-15 11:19:38.575701435 -0500
-@@ -20,27 +20,32 @@
- static my_bool ssl_algorithms_added = FALSE;
- static my_bool ssl_error_strings_loaded= FALSE;
+diff -urNp -x '*.orig' mysql-5.0.96.org/vio/viosslfactories.c mysql-5.0.96/vio/viosslfactories.c
+--- mysql-5.0.96.org/vio/viosslfactories.c 2022-10-18 08:35:47.736064643 +0200
++++ mysql-5.0.96/vio/viosslfactories.c 2022-10-18 08:35:48.949397977 +0200
+@@ -24,27 +24,32 @@ static bool ssl_algorithms_added
+ static bool ssl_error_strings_loaded= FALSE;
+ static int verify_depth = 0;
-static unsigned char dh512_p[]=
+static unsigned char dh1024_p[]=
@@ -52,7 +52,7 @@ diff -Naur mysql-5.5.28.orig/vio/viosslfactories.c mysql-5.5.28/vio/viosslfactor
if (! dh->p || ! dh->g)
{
DH_free(dh);
-@@ -255,7 +260,7 @@
+@@ -265,7 +270,7 @@ new_VioSSLFd(const char *key_file, const
}
/* DH stuff */
diff --git a/mysql-align.patch b/mysql-align.patch
index ac032a3..23f12d7 100644
--- a/mysql-align.patch
+++ b/mysql-align.patch
@@ -1,6 +1,7 @@
---- mysql-4.1.10/mysys/my_getopt.c.orig 2005-02-12 21:37:32.000000000 +0100
-+++ mysql-4.1.10/mysys/my_getopt.c 2005-03-04 10:52:33.000000000 +0100
-@@ -34,7 +34,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysys/my_getopt.c mysql-5.0.96/mysys/my_getopt.c
+--- mysql-5.0.96.org/mysys/my_getopt.c 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/mysys/my_getopt.c 2022-10-18 08:27:24.192731450 +0200
+@@ -36,7 +36,7 @@ static longlong getopt_ll_limit_value(lo
static ulonglong getopt_ull(char *arg, const struct my_option *optp,
int *err);
static void init_variables(const struct my_option *options);
@@ -9,8 +10,8 @@
my_bool set_maximum_value);
static char *check_struct_option(char *cur_arg, char *key_name);
-@@ -96,7 +96,7 @@
- char **pos, **pos_end, *optend, *prev_found,
+@@ -104,7 +104,7 @@ int handle_options(int *argc, char ***ar
+ char **pos, **pos_end, *optend, *UNINIT_VAR(prev_found),
*opt_str, key_name[FN_REFLEN];
const struct my_option *optp;
- gptr *value;
@@ -18,7 +19,7 @@
int error;
LINT_INIT(opt_found);
-@@ -537,14 +537,14 @@
+@@ -560,14 +560,14 @@ static char *check_struct_option(char *c
Will set the option value to given value
*/
@@ -35,7 +36,7 @@
opts->u_max_value : value);
if (!result_pos)
-@@ -864,7 +864,7 @@
+@@ -865,7 +865,7 @@ ulonglong getopt_ull_limit_value(ulonglo
value Pointer to variable
*/
@@ -44,7 +45,7 @@
longlong value)
{
DBUG_ENTER("init_one_value");
-@@ -793,12 +793,12 @@
+@@ -927,12 +927,12 @@ static void init_variables(const struct
set the value to default value.
*/
if (options->u_max_value)
@@ -58,9 +59,9 @@
- init_one_value(options, variable, options->def_value);
+ init_one_value(options, (gptr)variable, options->def_value);
}
+ DBUG_VOID_RETURN;
}
-
-@@ -898,7 +898,7 @@
+@@ -1033,7 +1033,7 @@ void my_print_variables(const struct my_
printf("--------------------------------- -----------------------------\n");
for (optp= options; optp->id; optp++)
{
diff --git a/mysql-atomic.patch b/mysql-atomic.patch
index 353c412..dc79b0b 100644
--- a/mysql-atomic.patch
+++ b/mysql-atomic.patch
@@ -5,9 +5,10 @@ timestamp: Wed 2006-05-31 18:44:09 +0200
message:
WL#2595 - atomic operations
=== modified file 'configure.in'
---- configure.in 2006-05-26 11:17:09 +0000
-+++ configure.in 2006-05-31 16:44:09 +0000
-@@ -778,48 +778,6 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/configure.in mysql-5.0.96/configure.in
+--- mysql-5.0.96.org/configure.in 2022-10-18 08:34:20.032731324 +0200
++++ mysql-5.0.96/configure.in 2022-10-18 08:34:21.369397991 +0200
+@@ -972,48 +972,6 @@ struct request_info *req;
AC_SUBST(WRAPLIBS)
if test "$TARGET_LINUX" = "true"; then
@@ -56,8 +57,8 @@ message:
AC_ARG_WITH(pstack,
[ --with-pstack Use the pstack backtrace library],
[ USE_PSTACK=$withval ],
-@@ -1631,6 +1589,20 @@
- fi
+@@ -1849,6 +1807,44 @@ else
+ CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
fi
+AC_ARG_WITH([atomic-ops],
@@ -73,16 +74,75 @@ message:
+ "smp") ;;
+ *) AC_MSG_ERROR(["$with_atomic_ops" is not a valid value for --with-atomic-ops]) ;;
+esac
++
++AC_CACHE_CHECK([whether the compiler provides atomic builtins],
++ [mysql_cv_gcc_atomic_builtins], [AC_TRY_RUN([
++ int main()
++ {
++ int foo= -10; int bar= 10;
++ if (!__sync_fetch_and_add(&foo, bar) || foo)
++ return -1;
++ bar= __sync_lock_test_and_set(&foo, bar);
++ if (bar || foo != 10)
++ return -1;
++ bar= __sync_val_compare_and_swap(&bar, foo, 15);
++ if (bar)
++ return -1;
++ return 0;
++ }
++], [mysql_cv_gcc_atomic_builtins=yes],
++ [mysql_cv_gcc_atomic_builtins=no],
++ [mysql_cv_gcc_atomic_builtins=no])])
++
++if test "x$mysql_cv_gcc_atomic_builtins" = xyes; then
++ AC_DEFINE(HAVE_ATOMIC_BUILTINS, 1,
++ [Define to 1 if compiler provides atomic builtins.])
++fi
+
# Force static compilation to avoid linking problems/get more speed
AC_ARG_WITH(mysqld-ldflags,
[ --with-mysqld-ldflags Extra linking arguments for mysqld],
-
-=== added directory 'include/atomic'
-=== added file 'include/atomic/nolock.h'
---- include/atomic/nolock.h 1970-01-01 00:00:00 +0000
-+++ include/atomic/nolock.h 2006-05-31 16:44:09 +0000
-@@ -0,0 +1,169 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/include/atomic/gcc_builtins.h mysql-5.0.96/include/atomic/gcc_builtins.h
+--- mysql-5.0.96.org/include/atomic/gcc_builtins.h 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/include/atomic/gcc_builtins.h 2022-10-18 08:34:21.369397991 +0200
+@@ -0,0 +1,33 @@
++/* Copyright (C) 2008 MySQL AB
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; version 2 of the License.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
++
++#define make_atomic_add_body(S) \
++ v= __sync_fetch_and_add(a, v);
++#define make_atomic_swap_body(S) \
++ v= __sync_lock_test_and_set(a, v);
++#define make_atomic_cas_body(S) \
++ int ## S sav; \
++ sav= __sync_val_compare_and_swap(a, *cmp, set); \
++ if (!(ret= (sav == *cmp))) *cmp= sav;
++
++#ifdef MY_ATOMIC_MODE_DUMMY
++#define make_atomic_load_body(S) ret= *a
++#define make_atomic_store_body(S) *a= v
++#else
++#define make_atomic_load_body(S) \
++ ret= __sync_fetch_and_or(a, 0);
++#define make_atomic_store_body(S) \
++ (void) __sync_lock_test_and_set(a, v);
++#endif
+diff -urNp -x '*.orig' mysql-5.0.96.org/include/atomic/nolock.h mysql-5.0.96/include/atomic/nolock.h
+--- mysql-5.0.96.org/include/atomic/nolock.h 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/include/atomic/nolock.h 2022-10-18 08:34:21.369397991 +0200
+@@ -0,0 +1,171 @@
+/* Copyright (C) 2006 MySQL AB
+
+ This program is free software; you can redistribute it and/or modify
@@ -99,13 +159,15 @@ message:
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+
-+#if defined(__i386__) || defined(_M_IX86)
++#if defined(__i386__) || defined(_M_IX86) || defined(HAVE_ATOMIC_BUILTINS)
+#ifdef MY_ATOMIC_MODE_DUMMY
+# define LOCK ""
+#else
+# define LOCK "lock "
+#endif
-+#ifdef __GNUC__
++#ifdef HAVE_ATOMIC_BUILTINS
++#include "gcc_builtins.h"
++#elif __GNUC__
+#include "x86-gcc.h"
+#elif defined(_MSC_VER)
+#include "x86-msvc.h"
@@ -252,10 +314,9 @@ message:
+
+#endif
+
-
-=== added file 'include/atomic/rwlock.h'
---- include/atomic/rwlock.h 1970-01-01 00:00:00 +0000
-+++ include/atomic/rwlock.h 2006-05-31 16:44:09 +0000
+diff -urNp -x '*.orig' mysql-5.0.96.org/include/atomic/rwlock.h mysql-5.0.96/include/atomic/rwlock.h
+--- mysql-5.0.96.org/include/atomic/rwlock.h 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/include/atomic/rwlock.h 2022-10-18 08:34:21.369397991 +0200
@@ -0,0 +1,161 @@
+/* Copyright (C) 2006 MySQL AB
+
@@ -418,10 +479,9 @@ message:
+#undef CHECK_RW
+
+
-
-=== added file 'include/atomic/x86-gcc.h'
---- include/atomic/x86-gcc.h 1970-01-01 00:00:00 +0000
-+++ include/atomic/x86-gcc.h 2006-05-31 16:44:09 +0000
+diff -urNp -x '*.orig' mysql-5.0.96.org/include/atomic/x86-gcc.h mysql-5.0.96/include/atomic/x86-gcc.h
+--- mysql-5.0.96.org/include/atomic/x86-gcc.h 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/include/atomic/x86-gcc.h 2022-10-18 08:34:21.369397991 +0200
@@ -0,0 +1,56 @@
+/* Copyright (C) 2006 MySQL AB
+
@@ -479,10 +539,9 @@ message:
+#define make_atomic_swap_body16 make_atomic_swap_body8
+#define make_atomic_swap_body32 make_atomic_swap_body8
+
-
-=== added file 'include/atomic/x86-msvc.h'
---- include/atomic/x86-msvc.h 1970-01-01 00:00:00 +0000
-+++ include/atomic/x86-msvc.h 2006-05-31 16:44:09 +0000
+diff -urNp -x '*.orig' mysql-5.0.96.org/include/atomic/x86-msvc.h mysql-5.0.96/include/atomic/x86-msvc.h
+--- mysql-5.0.96.org/include/atomic/x86-msvc.h 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/include/atomic/x86-msvc.h 2022-10-18 08:34:21.369397991 +0200
@@ -0,0 +1,85 @@
+/* Copyright (C) 2006 MySQL AB
+
@@ -569,10 +628,9 @@ message:
+#define make_atomic_swap_body16 make_atomic_swap_body(ax)
+#define make_atomic_swap_body32 make_atomic_swap_body(eax)
+
-
-=== added file 'include/my_atomic.h'
---- include/my_atomic.h 1970-01-01 00:00:00 +0000
-+++ include/my_atomic.h 2006-05-31 16:44:09 +0000
+diff -urNp -x '*.orig' mysql-5.0.96.org/include/my_atomic.h mysql-5.0.96/include/my_atomic.h
+--- mysql-5.0.96.org/include/my_atomic.h 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/include/my_atomic.h 2022-10-18 08:34:21.369397991 +0200
@@ -0,0 +1,46 @@
+/* Copyright (C) 2006 MySQL AB
+
@@ -620,13 +678,12 @@ message:
+
+#endif
+
-
-=== modified file 'include/my_global.h'
---- include/my_global.h 2006-05-02 09:36:05 +0000
-+++ include/my_global.h 2006-05-31 16:44:09 +0000
-@@ -181,6 +181,17 @@
- #define HOT_DATA
- #endif
+diff -urNp -x '*.orig' mysql-5.0.96.org/include/my_global.h mysql-5.0.96/include/my_global.h
+--- mysql-5.0.96.org/include/my_global.h 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/include/my_global.h 2022-10-18 08:34:21.369397991 +0200
+@@ -152,6 +152,17 @@
+ #define likely(x) __builtin_expect((x),1)
+ #define unlikely(x) __builtin_expect((x),0)
+/*
+ now let's figure out if inline functions are supported
@@ -640,9 +697,9 @@ message:
+#undef inline_test_2
+#undef inline_test_1
- /*
- The following macros are used to control inlining a bit more than
-@@ -889,6 +900,8 @@
+ /* Fix problem with S_ISLNK() on Linux */
+ #if defined(TARGET_OS_LINUX) || defined(__GLIBC__)
+@@ -931,6 +942,8 @@ typedef unsigned long ulonglong; /* ul
typedef long longlong;
#endif
#endif
@@ -651,20 +708,19 @@ message:
#if defined(NO_CLIENT_LONG_LONG)
typedef unsigned long my_ulonglong;
-
-=== modified file 'mysys/Makefile.am'
---- mysys/Makefile.am 2006-05-12 08:51:07 +0000
-+++ mysys/Makefile.am 2006-05-31 16:44:09 +0000
-@@ -19,7 +19,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysys/Makefile.am mysql-5.0.96/mysys/Makefile.am
+--- mysql-5.0.96.org/mysys/Makefile.am 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/mysys/Makefile.am 2022-10-18 08:34:21.369397991 +0200
+@@ -19,7 +19,7 @@ MYSQLBASEdir= $(prefix)
INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-I$(top_srcdir)/include -I$(srcdir)
pkglib_LIBRARIES = libmysys.a
-LDADD = libmysys.a ../dbug/libdbug.a \
+LDADD = libmysys.a \
../strings/libmystrings.a
- noinst_HEADERS = mysys_priv.h my_static.h \
- my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
-@@ -33,7 +33,7 @@
+ noinst_HEADERS = mysys_priv.h my_static.h
+ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
+@@ -30,7 +30,7 @@ libmysys_a_SOURCES = my_init.c my_get
mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \
mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \
my_malloc.c my_realloc.c my_once.c mulalloc.c \
@@ -673,19 +729,18 @@ message:
my_fopen.c my_fstream.c my_getsystime.c \
my_error.c errors.c my_div.c my_messnc.c \
mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \
-@@ -64,7 +63,7 @@
+@@ -61,7 +61,7 @@ libmysys_a_LIBADD = @THREAD_LOBJECTS@
# testhash_DEPENDENCIES= $(LIBRARIES)
# test_charset_DEPENDENCIES= $(LIBRARIES)
# charset2html_DEPENDENCIES= $(LIBRARIES)
-EXTRA_PROGRAMS =
+noinst_PROGRAMS= test_atomic$(EXEEXT)
DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-
-=== added file 'mysys/my_atomic.c'
---- mysys/my_atomic.c 1970-01-01 00:00:00 +0000
-+++ mysys/my_atomic.c 2006-05-31 16:44:09 +0000
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysys/my_atomic.c mysql-5.0.96/mysys/my_atomic.c
+--- mysql-5.0.96.org/mysys/my_atomic.c 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/mysys/my_atomic.c 2022-10-18 08:34:21.369397991 +0200
@@ -0,0 +1,46 @@
+/* Copyright (C) 2006 MySQL AB
+
@@ -733,10 +788,9 @@ message:
+#endif
+}
+
-
-=== added file 'mysys/my_getncpus.c'
---- mysys/my_getncpus.c 1970-01-01 00:00:00 +0000
-+++ mysys/my_getncpus.c 2006-05-31 16:44:09 +0000
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysys/my_getncpus.c mysql-5.0.96/mysys/my_getncpus.c
+--- mysql-5.0.96.org/mysys/my_getncpus.c 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/mysys/my_getncpus.c 2022-10-18 08:34:21.369397991 +0200
@@ -0,0 +1,40 @@
+/* Copyright (C) 2006 MySQL AB
+
@@ -778,10 +832,9 @@ message:
+
+#endif
+
-
-=== added file 'mysys/test_atomic.c'
---- mysys/test_atomic.c 1970-01-01 00:00:00 +0000
-+++ mysys/test_atomic.c 2006-05-31 16:44:09 +0000
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysys/test_atomic.c mysql-5.0.96/mysys/test_atomic.c
+--- mysql-5.0.96.org/mysys/test_atomic.c 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/mysys/test_atomic.c 2022-10-18 08:34:21.369397991 +0200
@@ -0,0 +1,133 @@
+#include <my_global.h>
+#include <my_sys.h>
@@ -916,108 +969,3 @@ message:
+ return 0;
+}
+
-------------------------------------------------------------
-revno: 2476.749.1
-committer: davi at mysql.com/endora.local
-timestamp: Fri 2008-01-11 20:34:36 -0200
-message:
- Bug#33728 Atomic builtins
-
- Use compiler provided atomic builtins as a 'backend' for
- MySQL's atomic primitives. The builtins are available on
- a handful of platforms and compilers.
-diff:
-=== modified file 'configure.in'
---- configure.in 2007-12-14 17:03:44 +0000
-+++ configure.in 2008-01-11 22:34:36 +0000
-@@ -1688,6 +1688,30 @@
- *) AC_MSG_ERROR(["$with_atomic_ops" is not a valid value for --with-atomic-ops]) ;;
- esac
-
-+AC_CACHE_CHECK([whether the compiler provides atomic builtins],
-+ [mysql_cv_gcc_atomic_builtins], [AC_TRY_RUN([
-+ int main()
-+ {
-+ int foo= -10; int bar= 10;
-+ if (!__sync_fetch_and_add(&foo, bar) || foo)
-+ return -1;
-+ bar= __sync_lock_test_and_set(&foo, bar);
-+ if (bar || foo != 10)
-+ return -1;
-+ bar= __sync_val_compare_and_swap(&bar, foo, 15);
-+ if (bar)
-+ return -1;
-+ return 0;
-+ }
-+], [mysql_cv_gcc_atomic_builtins=yes],
-+ [mysql_cv_gcc_atomic_builtins=no],
-+ [mysql_cv_gcc_atomic_builtins=no])])
-+
-+if test "x$mysql_cv_gcc_atomic_builtins" = xyes; then
-+ AC_DEFINE(HAVE_ATOMIC_BUILTINS, 1,
-+ [Define to 1 if compiler provides atomic builtins.])
-+fi
-+
- # Force static compilation to avoid linking problems/get more speed
- AC_ARG_WITH(mysqld-ldflags,
- [ --with-mysqld-ldflags Extra linking arguments for mysqld],
-
-=== added file 'include/atomic/gcc_builtins.h'
---- include/atomic/gcc_builtins.h 1970-01-01 00:00:00 +0000
-+++ include/atomic/gcc_builtins.h 2008-01-11 22:34:36 +0000
-@@ -0,0 +1,33 @@
-+/* Copyright (C) 2008 MySQL AB
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; version 2 of the License.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-+
-+#define make_atomic_add_body(S) \
-+ v= __sync_fetch_and_add(a, v);
-+#define make_atomic_swap_body(S) \
-+ v= __sync_lock_test_and_set(a, v);
-+#define make_atomic_cas_body(S) \
-+ int ## S sav; \
-+ sav= __sync_val_compare_and_swap(a, *cmp, set); \
-+ if (!(ret= (sav == *cmp))) *cmp= sav;
-+
-+#ifdef MY_ATOMIC_MODE_DUMMY
-+#define make_atomic_load_body(S) ret= *a
-+#define make_atomic_store_body(S) *a= v
-+#else
-+#define make_atomic_load_body(S) \
-+ ret= __sync_fetch_and_or(a, 0);
-+#define make_atomic_store_body(S) \
-+ (void) __sync_lock_test_and_set(a, v);
-+#endif
-
-=== modified file 'include/atomic/nolock.h'
---- include/atomic/nolock.h 2006-12-27 01:23:51 +0000
-+++ include/atomic/nolock.h 2008-01-11 22:34:36 +0000
-@@ -14,13 +14,15 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
--#if defined(__i386__) || defined(_M_IX86)
-+#if defined(__i386__) || defined(_M_IX86) || defined(HAVE_ATOMIC_BUILTINS)
- #ifdef MY_ATOMIC_MODE_DUMMY
- # define LOCK ""
- #else
- # define LOCK "lock "
- #endif
--#ifdef __GNUC__
-+#ifdef HAVE_ATOMIC_BUILTINS
-+#include "gcc_builtins.h"
-+#elif __GNUC__
- #include "x86-gcc.h"
- #elif defined(_MSC_VER)
- #include "x86-msvc.h"
diff --git a/mysql-build.patch b/mysql-build.patch
index 11ef6ee..ea5d3a4 100644
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -1,8 +1,8 @@
-diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc
---- mysql-5.0.13-rc.org/sql/mysqld.cc 2005-09-22 21:39:56.000000000 +0200
-+++ mysql-5.0.13-rc/sql/mysqld.cc 2005-09-29 19:29:59.991454000 +0200
-@@ -3183,7 +3183,7 @@
- init_ssl();
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/mysqld.cc mysql-5.0.96/sql/mysqld.cc
+--- mysql-5.0.96.org/sql/mysqld.cc 2022-10-18 08:27:46.716064781 +0200
++++ mysql-5.0.96/sql/mysqld.cc 2022-10-18 08:27:47.712731447 +0200
+@@ -3766,7 +3766,7 @@ int main(int argc, char **argv)
+ select_thread_in_use=1;
#ifdef HAVE_LIBWRAP
- libwrapName= my_progname+dirname_length(my_progname);
diff --git a/mysql-fix_privilege_tables.patch b/mysql-fix_privilege_tables.patch
index 2ee99ba..274e245 100644
--- a/mysql-fix_privilege_tables.patch
+++ b/mysql-fix_privilege_tables.patch
@@ -1,12 +1,12 @@
-diff -urN mysql-4.1.7.org/scripts/mysql_fix_privilege_tables.sh mysql-4.1.7/scripts/mysql_fix_privilege_tables.sh
---- mysql-4.1.7.org/scripts/mysql_fix_privilege_tables.sh 2004-10-27 01:35:56.000000000 +0200
-+++ mysql-4.1.7/scripts/mysql_fix_privilege_tables.sh 2004-10-27 12:13:42.159439392 +0200
-@@ -5,7 +5,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/scripts/mysql_fix_privilege_tables.sh mysql-5.0.96/scripts/mysql_fix_privilege_tables.sh
+--- mysql-5.0.96.org/scripts/mysql_fix_privilege_tables.sh 2012-03-02 15:04:12.000000000 +0100
++++ mysql-5.0.96/scripts/mysql_fix_privilege_tables.sh 2022-10-18 08:26:46.659398128 +0200
+@@ -20,7 +20,7 @@
# Default values (Can be changed in my.cnf)
password=""
host="localhost"
-user="root"
+user="mysql"
sql_only=0
- basedir=""
+ basedir="@prefix@"
verbose=0
diff --git a/mysql-info.patch b/mysql-info.patch
index 179f823..978b4d4 100644
--- a/mysql-info.patch
+++ b/mysql-info.patch
@@ -1,7 +1,8 @@
---- mysql-4.1.12/Docs/mysql.info~ 2005-05-16 08:05:46.000000000 +0300
-+++ mysql-4.1.12/Docs/mysql.info 2005-05-16 08:06:36.000000000 +0300
+diff -urNp -x '*.orig' mysql-5.0.96.org/Docs/mysql.info mysql-5.0.96/Docs/mysql.info
+--- mysql-5.0.96.org/Docs/mysql.info 2012-03-02 15:04:57.000000000 +0100
++++ mysql-5.0.96/Docs/mysql.info 2022-10-18 08:25:51.826064806 +0200
@@ -1,8 +1,9 @@
- This is mysql.info, produced by makeinfo version 4.7 from manual.texi.
+ This is manual.info, produced by makeinfo version 4.8 from manual.texi.
-START-INFO-DIR-ENTRY
-* mysql: (mysql). MySQL documentation.
@@ -12,4 +13,4 @@
+ at end direntry
- File: mysql.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
+ File: manual.info, Node: Top, Next: preface, Prev: (dir), Up: (dir)
diff --git a/mysql-innodb_io_pattern.patch b/mysql-innodb_io_pattern.patch
index 31235b5..0e1a7d9 100644
--- a/mysql-innodb_io_pattern.patch
+++ b/mysql-innodb_io_pattern.patch
@@ -1,7 +1,7 @@
-diff -ruN a/include/mysql_com.h b/include/mysql_com.h
---- a/include/mysql_com.h Wed Jul 29 09:58:58 2009 -0700
-+++ b/include/mysql_com.h Wed Jul 29 10:00:12 2009 -0700
-@@ -123,6 +123,9 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/include/mysql_com.h mysql-5.0.96/include/mysql_com.h
+--- mysql-5.0.96.org/include/mysql_com.h 2022-10-18 08:29:10.939398097 +0200
++++ mysql-5.0.96/include/mysql_com.h 2022-10-18 08:29:12.116064764 +0200
+@@ -123,6 +123,9 @@ enum enum_server_command
#define REFRESH_DES_KEY_FILE 0x40000L
#define REFRESH_USER_RESOURCES 0x80000L
@@ -11,10 +11,10 @@ diff -ruN a/include/mysql_com.h b/include/mysql_com.h
#define CLIENT_LONG_PASSWORD 1 /* new more secure passwords */
#define CLIENT_FOUND_ROWS 2 /* Found instead of affected rows */
#define CLIENT_LONG_FLAG 4 /* Get all column flags */
-diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
---- a/innobase/buf/buf0buf.c Wed Jul 29 09:58:58 2009 -0700
-+++ b/innobase/buf/buf0buf.c Wed Jul 29 10:00:12 2009 -0700
-@@ -654,6 +654,9 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/innobase/buf/buf0buf.c mysql-5.0.96/innobase/buf/buf0buf.c
+--- mysql-5.0.96.org/innobase/buf/buf0buf.c 2022-10-18 08:29:11.002731431 +0200
++++ mysql-5.0.96/innobase/buf/buf0buf.c 2022-10-18 08:29:12.116064764 +0200
+@@ -654,6 +654,9 @@ buf_pool_init(
}
buf_pool->page_hash = hash_create(2 * max_size);
@@ -24,7 +24,7 @@ diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
buf_pool->n_pend_reads = 0;
-@@ -1967,6 +1970,9 @@
+@@ -1967,6 +1970,9 @@ buf_page_io_complete(
ulint io_type;
ulint read_page_no;
@@ -34,7 +34,7 @@ diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
ut_ad(block);
ut_a(block->state == BUF_BLOCK_FILE_PAGE);
-@@ -2068,6 +2074,26 @@
+@@ -2068,6 +2074,26 @@ buf_page_io_complete(
buf_pool->n_pages_read++;
rw_lock_x_unlock_gen(&(block->lock), BUF_IO_READ);
@@ -61,7 +61,7 @@ diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
#ifdef UNIV_DEBUG
if (buf_debug_prints) {
-@@ -2083,6 +2109,26 @@
+@@ -2083,6 +2109,26 @@ buf_page_io_complete(
buf_flush_write_complete(block);
rw_lock_s_unlock_gen(&(block->lock), BUF_IO_WRITE);
@@ -88,7 +88,7 @@ diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
buf_pool->n_pages_written++;
-@@ -2657,3 +2703,58 @@
+@@ -2657,3 +2703,58 @@ buf_pool_get_nth_block_no_inline(
return buf_pool_get_nth_block(buf_pool, i);
}
@@ -147,10 +147,10 @@ diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
+ }
+ mutex_exit(&(buf_pool->mutex));
+}
-diff -ruN a/innobase/include/buf0buf.h b/innobase/include/buf0buf.h
---- a/innobase/include/buf0buf.h Wed Jul 29 09:58:58 2009 -0700
-+++ b/innobase/include/buf0buf.h Wed Jul 29 10:00:12 2009 -0700
-@@ -709,6 +709,18 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/innobase/include/buf0buf.h mysql-5.0.96/innobase/include/buf0buf.h
+--- mysql-5.0.96.org/innobase/include/buf0buf.h 2022-10-18 08:29:11.002731431 +0200
++++ mysql-5.0.96/innobase/include/buf0buf.h 2022-10-18 08:29:12.116064764 +0200
+@@ -709,6 +709,18 @@ buf_get_free_list_len(void);
void buf_pool_dump(void);
buf_block_t* buf_pool_get_nth_block_no_inline(buf_pool_t* pool, ulint i);
@@ -169,7 +169,7 @@ diff -ruN a/innobase/include/buf0buf.h b/innobase/include/buf0buf.h
/* The buffer control block structure */
-@@ -930,6 +942,9 @@
+@@ -930,6 +942,9 @@ struct buf_pool_struct{
ulint curr_size; /* current pool size in pages;
currently always the same as
max_size */
@@ -179,7 +179,7 @@ diff -ruN a/innobase/include/buf0buf.h b/innobase/include/buf0buf.h
hash_table_t* page_hash; /* hash table of the file pages */
ulint n_pend_reads; /* number of pending read operations */
-@@ -1015,6 +1030,15 @@
+@@ -1015,6 +1030,15 @@ struct buf_pool_struct{
locki table, are not in this list */
};
@@ -195,10 +195,10 @@ diff -ruN a/innobase/include/buf0buf.h b/innobase/include/buf0buf.h
/* States of a control block */
#define BUF_BLOCK_NOT_USED 211 /* is in the free list */
#define BUF_BLOCK_READY_FOR_USE 212 /* when buf_get_free_block returns
-diff -ruN a/innobase/include/buf0types.h b/innobase/include/buf0types.h
---- a/innobase/include/buf0types.h Wed Jul 29 09:58:58 2009 -0700
-+++ b/innobase/include/buf0types.h Wed Jul 29 10:00:12 2009 -0700
-@@ -12,6 +12,8 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/innobase/include/buf0types.h mysql-5.0.96/innobase/include/buf0types.h
+--- mysql-5.0.96.org/innobase/include/buf0types.h 2012-03-02 15:04:10.000000000 +0100
++++ mysql-5.0.96/innobase/include/buf0types.h 2022-10-18 08:29:12.116064764 +0200
+@@ -12,6 +12,8 @@ Created 11/17/1995 Heikki Tuuri
typedef struct buf_block_struct buf_block_t;
typedef struct buf_pool_struct buf_pool_t;
@@ -207,10 +207,10 @@ diff -ruN a/innobase/include/buf0types.h b/innobase/include/buf0types.h
/* The 'type' used of a buffer frame */
typedef byte buf_frame_t;
-diff -ruN a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
---- a/innobase/include/srv0srv.h Wed Jul 29 09:58:58 2009 -0700
-+++ b/innobase/include/srv0srv.h Wed Jul 29 10:00:12 2009 -0700
-@@ -146,6 +146,11 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/innobase/include/srv0srv.h mysql-5.0.96/innobase/include/srv0srv.h
+--- mysql-5.0.96.org/innobase/include/srv0srv.h 2022-10-18 08:29:10.996064764 +0200
++++ mysql-5.0.96/innobase/include/srv0srv.h 2022-10-18 08:29:12.116064764 +0200
+@@ -146,6 +146,11 @@ extern ulint srv_flush_neighbor_pages;
extern ulint srv_enable_unsafe_group_commit;
extern uint srv_read_ahead;
extern uint srv_adaptive_checkpoint;
@@ -222,10 +222,10 @@ diff -ruN a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
/*-------------------------------------------*/
extern ulint srv_n_rows_inserted;
-diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
---- a/innobase/srv/srv0srv.c Wed Jul 29 09:58:58 2009 -0700
-+++ b/innobase/srv/srv0srv.c Wed Jul 29 10:00:12 2009 -0700
-@@ -352,6 +352,11 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/innobase/srv/srv0srv.c mysql-5.0.96/innobase/srv/srv0srv.c
+--- mysql-5.0.96.org/innobase/srv/srv0srv.c 2022-10-18 08:29:10.996064764 +0200
++++ mysql-5.0.96/innobase/srv/srv0srv.c 2022-10-18 08:29:12.116064764 +0200
+@@ -352,6 +352,11 @@ ulint srv_enable_unsafe_group_commit = 0
uint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */
uint srv_adaptive_checkpoint = 0; /* 0: none 1: reflex 2: estimate */
@@ -237,10 +237,10 @@ diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
/*-------------------------------------------*/
ulong srv_n_spin_wait_rounds = 20;
ulong srv_n_free_tickets_to_enter = 500;
-diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
---- a/mysql-test/r/information_schema.result Wed Jul 29 09:58:58 2009 -0700
-+++ b/mysql-test/r/information_schema.result Wed Jul 29 10:00:12 2009 -0700
-@@ -59,6 +59,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysql-test/r/information_schema.result mysql-5.0.96/mysql-test/r/information_schema.result
+--- mysql-5.0.96.org/mysql-test/r/information_schema.result 2022-10-18 08:29:11.006064764 +0200
++++ mysql-5.0.96/mysql-test/r/information_schema.result 2022-10-18 08:29:12.119398097 +0200
+@@ -59,6 +59,7 @@ TRIGGERS
USER_PRIVILEGES
USER_STATISTICS
VIEWS
@@ -248,7 +248,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
columns_priv
db
func
-@@ -742,7 +743,7 @@
+@@ -742,7 +743,7 @@ CREATE TABLE t_crashme ( f1 BIGINT);
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
count(*)
@@ -257,7 +257,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
drop view a2, a1;
drop table t_crashme;
select table_schema,table_name, column_name from
-@@ -812,12 +813,13 @@
+@@ -812,12 +813,13 @@ TABLE_CONSTRAINTS TABLE_NAME select
TABLE_PRIVILEGES TABLE_NAME select
TABLE_STATISTICS TABLE_NAME select
VIEWS TABLE_NAME select
@@ -272,7 +272,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
mysql 17
create table t1 (i int, j int);
create trigger trg1 before insert on t1 for each row
-@@ -1225,6 +1227,7 @@
+@@ -1227,6 +1229,7 @@ TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER
VIEWS TABLE_SCHEMA
@@ -280,7 +280,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
SELECT t.table_name, c1.column_name
FROM information_schema.tables t
INNER JOIN
-@@ -1263,6 +1266,7 @@
+@@ -1265,6 +1268,7 @@ TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER
VIEWS TABLE_SCHEMA
@@ -288,7 +288,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
SELECT MAX(table_name) FROM information_schema.tables;
MAX(table_name)
VIEWS
-@@ -1337,6 +1341,7 @@
+@@ -1339,6 +1343,7 @@ COLUMNS information_schema.COLUMNS 1
COLUMN_PRIVILEGES information_schema.COLUMN_PRIVILEGES 1
INDEX_STATISTICS information_schema.INDEX_STATISTICS 1
INNODB_BUFFER_POOL_CONTENT information_schema.INNODB_BUFFER_POOL_CONTENT 1
@@ -296,10 +296,10 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
PROCESSLIST information_schema.PROCESSLIST 1
PROFILING information_schema.PROFILING 1
-diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
---- a/mysql-test/r/information_schema_db.result Wed Jul 29 09:58:58 2009 -0700
-+++ b/mysql-test/r/information_schema_db.result Wed Jul 29 10:00:12 2009 -0700
-@@ -28,6 +28,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysql-test/r/information_schema_db.result mysql-5.0.96/mysql-test/r/information_schema_db.result
+--- mysql-5.0.96.org/mysql-test/r/information_schema_db.result 2022-10-18 08:29:11.006064764 +0200
++++ mysql-5.0.96/mysql-test/r/information_schema_db.result 2022-10-18 08:29:12.119398097 +0200
+@@ -28,6 +28,7 @@ TRIGGERS
USER_PRIVILEGES
USER_STATISTICS
VIEWS
@@ -307,10 +307,10 @@ diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information
show tables from INFORMATION_SCHEMA like 'T%';
Tables_in_information_schema (T%)
TABLES
-diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
---- a/mysql-test/r/mysqlshow.result Wed Jul 29 09:58:58 2009 -0700
-+++ b/mysql-test/r/mysqlshow.result Wed Jul 29 10:00:12 2009 -0700
-@@ -102,6 +102,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysql-test/r/mysqlshow.result mysql-5.0.96/mysql-test/r/mysqlshow.result
+--- mysql-5.0.96.org/mysql-test/r/mysqlshow.result 2022-10-18 08:29:11.006064764 +0200
++++ mysql-5.0.96/mysql-test/r/mysqlshow.result 2022-10-18 08:29:12.119398097 +0200
+@@ -102,6 +102,7 @@ Database: information_schema
| USER_PRIVILEGES |
| USER_STATISTICS |
| VIEWS |
@@ -318,7 +318,7 @@ diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
+---------------------------------------+
Database: INFORMATION_SCHEMA
+---------------------------------------+
-@@ -130,6 +131,7 @@
+@@ -130,6 +131,7 @@ Database: INFORMATION_SCHEMA
| USER_PRIVILEGES |
| USER_STATISTICS |
| VIEWS |
@@ -326,9 +326,9 @@ diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
+---------------------------------------+
Wildcard: inf_rmation_schema
+--------------------+
-diff -ruN /dev/null b/patch_info/innodb_io_pattern.info
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patch_info/innodb_io_pattern.info Wed Jul 29 10:00:12 2009 -0700
+diff -urNp -x '*.orig' mysql-5.0.96.org/patch_info/innodb_io_pattern.info mysql-5.0.96/patch_info/innodb_io_pattern.info
+--- mysql-5.0.96.org/patch_info/innodb_io_pattern.info 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/patch_info/innodb_io_pattern.info 2022-10-18 08:29:12.119398097 +0200
@@ -0,0 +1,8 @@
+File=innodb_io_pattern.patch
+Name=Information schema table of InnoDB IO counts for each datafile pages
@@ -338,10 +338,10 @@ diff -ruN /dev/null b/patch_info/innodb_io_pattern.info
+Comment=INFORMATION_SCHEMA.INNODB_IO_PATTERN
+2008-12-01
+YK: fix for mysql-test
-diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
---- a/sql/ha_innodb.cc Wed Jul 29 09:58:58 2009 -0700
-+++ b/sql/ha_innodb.cc Wed Jul 29 10:00:12 2009 -0700
-@@ -1568,6 +1568,8 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/ha_innodb.cc mysql-5.0.96/sql/ha_innodb.cc
+--- mysql-5.0.96.org/sql/ha_innodb.cc 2022-10-18 08:29:11.012731431 +0200
++++ mysql-5.0.96/sql/ha_innodb.cc 2022-10-18 08:29:12.119398097 +0200
+@@ -1568,6 +1568,8 @@ innobase_init(void)
pthread_cond_init(&commit_cond, NULL);
innodb_inited= 1;
@@ -350,10 +350,11 @@ diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
/* If this is a replication slave and we needed to do a crash recovery,
set the master binlog position to what InnoDB internally knew about
how far we got transactions durable inside InnoDB. There is a
-@@ -6548,6 +6550,28 @@
+@@ -6547,6 +6549,28 @@ innodb_export_status(void)
+ }
}
- /****************************************************************************
++/****************************************************************************
+Controls the internal hash table for IO pattern tracing
+along innodb_io_pattern_trace value.*/
+
@@ -375,14 +376,13 @@ diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
+ }
+}
+
-+/****************************************************************************
+ /****************************************************************************
Implements the SHOW INNODB STATUS command. Sends the output of the InnoDB
Monitor to the client. */
-
-diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
---- a/sql/ha_innodb.h Wed Jul 29 09:58:58 2009 -0700
-+++ b/sql/ha_innodb.h Wed Jul 29 10:00:12 2009 -0700
-@@ -245,6 +245,9 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/ha_innodb.h mysql-5.0.96/sql/ha_innodb.h
+--- mysql-5.0.96.org/sql/ha_innodb.h 2022-10-18 08:29:11.006064764 +0200
++++ mysql-5.0.96/sql/ha_innodb.h 2022-10-18 08:29:12.119398097 +0200
+@@ -245,6 +245,9 @@ extern uint srv_read_ahead;
extern uint srv_adaptive_checkpoint;
extern ulong srv_show_locks_held;
extern ulong srv_show_verbose_locks;
@@ -392,7 +392,7 @@ diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
/* An option to enable the fix for "Bug#43660 SHOW INDEXES/ANALYZE does
NOT update cardinality for indexes of InnoDB table". By default we are
-@@ -278,6 +281,9 @@
+@@ -278,6 +281,9 @@ bool innodb_I_S_buffer_pool_content(THD*
bool innodb_mutex_show_status(THD* thd);
void innodb_export_status(void);
@@ -402,10 +402,10 @@ diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
void innobase_release_temporary_latches(THD *thd);
void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset);
-diff -ruN a/sql/lex.h b/sql/lex.h
---- a/sql/lex.h Wed Jul 29 09:58:58 2009 -0700
-+++ b/sql/lex.h Wed Jul 29 10:00:12 2009 -0700
-@@ -244,6 +244,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/lex.h mysql-5.0.96/sql/lex.h
+--- mysql-5.0.96.org/sql/lex.h 2022-10-18 08:29:10.959398097 +0200
++++ mysql-5.0.96/sql/lex.h 2022-10-18 08:29:12.119398097 +0200
+@@ -244,6 +244,7 @@ static SYMBOL symbols[] = {
{ "INNER", SYM(INNER_SYM)},
{ "INNOBASE", SYM(INNOBASE_SYM)},
{ "INNODB", SYM(INNOBASE_SYM)},
@@ -413,10 +413,10 @@ diff -ruN a/sql/lex.h b/sql/lex.h
{ "INOUT", SYM(INOUT_SYM)},
{ "INSENSITIVE", SYM(INSENSITIVE_SYM)},
{ "INSERT", SYM(INSERT)},
-diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc Wed Jul 29 09:58:58 2009 -0700
-+++ b/sql/mysqld.cc Wed Jul 29 10:00:12 2009 -0700
-@@ -5046,6 +5046,9 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/mysqld.cc mysql-5.0.96/sql/mysqld.cc
+--- mysql-5.0.96.org/sql/mysqld.cc 2022-10-18 08:29:11.016064764 +0200
++++ mysql-5.0.96/sql/mysqld.cc 2022-10-18 08:29:12.122731431 +0200
+@@ -5060,6 +5060,9 @@ enum options_mysqld
OPT_INNODB_SYNC_SPIN_LOOPS,
OPT_INNODB_CONCURRENCY_TICKETS,
OPT_INNODB_THREAD_SLEEP_DELAY,
@@ -426,7 +426,7 @@ diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
OPT_BDB_CACHE_SIZE,
OPT_BDB_LOG_BUFFER_SIZE,
OPT_BDB_MAX_LOCK,
-@@ -5479,6 +5482,18 @@
+@@ -5493,6 +5496,18 @@ Disable with --skip-innodb-doublewrite."
"Number of background write I/O threads in InnoDB.",
(gptr*) &innobase_write_io_threads, (gptr*) &innobase_write_io_threads,
0, GET_LONG, REQUIRED_ARG, 8, 1, 64, 0, 0, 0},
@@ -445,10 +445,10 @@ diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
#endif /* End HAVE_INNOBASE_DB */
{"isam", OPT_ISAM, "Obsolete. ISAM storage engine is no longer supported.",
(gptr*) &opt_isam, (gptr*) &opt_isam, 0, GET_BOOL, NO_ARG, 0, 0, 0,
-diff -ruN a/sql/set_var.cc b/sql/set_var.cc
---- a/sql/set_var.cc Wed Jul 29 09:58:58 2009 -0700
-+++ b/sql/set_var.cc Wed Jul 29 10:00:12 2009 -0700
-@@ -547,6 +547,12 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/set_var.cc mysql-5.0.96/sql/set_var.cc
+--- mysql-5.0.96.org/sql/set_var.cc 2022-10-18 08:29:10.999398097 +0200
++++ mysql-5.0.96/sql/set_var.cc 2022-10-18 08:29:12.122731431 +0200
+@@ -547,6 +547,12 @@ sys_var_long_ptr sys_innodb_show_locks_
sys_var_long_ptr sys_innodb_show_verbose_locks(
"innodb_show_verbose_locks",
&srv_show_verbose_locks);
@@ -461,7 +461,7 @@ diff -ruN a/sql/set_var.cc b/sql/set_var.cc
sys_var_const_os_str_ptr sys_innodb_data_file_path("innodb_data_file_path",
&innobase_data_file_path);
sys_var_const_os_str_ptr sys_innodb_data_home_dir("innodb_data_home_dir",
-@@ -932,6 +938,9 @@
+@@ -932,6 +938,9 @@ sys_var *sys_variables[]=
&sys_innodb_adaptive_checkpoint,
&sys_innodb_show_locks_held,
&sys_innodb_show_verbose_locks,
@@ -471,7 +471,7 @@ diff -ruN a/sql/set_var.cc b/sql/set_var.cc
#endif
&sys_trust_routine_creators,
&sys_trust_function_creators,
-@@ -1081,6 +1090,9 @@
+@@ -1082,6 +1091,9 @@ struct show_var_st init_vars[]= {
{sys_innodb_adaptive_checkpoint.name, (char*) &sys_innodb_adaptive_checkpoint, SHOW_SYS},
{"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
{"innodb_write_io_threads", (char*) &innobase_write_io_threads, SHOW_LONG},
@@ -481,7 +481,7 @@ diff -ruN a/sql/set_var.cc b/sql/set_var.cc
{sys_innodb_use_legacy_cardinality_algorithm.name,
(char*) &sys_innodb_use_legacy_cardinality_algorithm, SHOW_SYS},
#endif
-@@ -3217,6 +3229,19 @@
+@@ -3234,6 +3246,19 @@ void sys_var_thd_lc_time_names::set_defa
thd->variables.lc_time_names= global_system_variables.lc_time_names;
}
@@ -501,10 +501,10 @@ diff -ruN a/sql/set_var.cc b/sql/set_var.cc
/*
Functions to update thd->options bits
*/
-diff -ruN a/sql/set_var.h b/sql/set_var.h
---- a/sql/set_var.h Wed Jul 29 09:58:58 2009 -0700
-+++ b/sql/set_var.h Wed Jul 29 10:00:12 2009 -0700
-@@ -1012,6 +1012,17 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/set_var.h mysql-5.0.96/sql/set_var.h
+--- mysql-5.0.96.org/sql/set_var.h 2022-10-18 08:29:10.992731431 +0200
++++ mysql-5.0.96/sql/set_var.h 2022-10-18 08:29:12.122731431 +0200
+@@ -1013,6 +1013,17 @@ public:
virtual void set_default(THD *thd, enum_var_type type);
};
@@ -522,10 +522,10 @@ diff -ruN a/sql/set_var.h b/sql/set_var.h
/****************************************************************************
Classes for parsing of the SET command
****************************************************************************/
-diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
---- a/sql/sql_parse.cc Wed Jul 29 09:58:58 2009 -0700
-+++ b/sql/sql_parse.cc Wed Jul 29 10:00:12 2009 -0700
-@@ -8134,6 +8134,13 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_parse.cc mysql-5.0.96/sql/sql_parse.cc
+--- mysql-5.0.96.org/sql/sql_parse.cc 2022-10-18 08:29:11.009398098 +0200
++++ mysql-5.0.96/sql/sql_parse.cc 2022-10-18 08:29:12.122731431 +0200
+@@ -8174,6 +8174,13 @@ bool reload_acl_and_cache(THD *thd, ulon
}
pthread_mutex_unlock(&LOCK_global_user_client_stats);
}
@@ -539,9 +539,9 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
*write_to_binlog= tmp_write_to_binlog;
return result;
}
-diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc Wed Jul 29 09:58:58 2009 -0700
-+++ b/sql/sql_show.cc Wed Jul 29 10:00:12 2009 -0700
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_show.cc mysql-5.0.96/sql/sql_show.cc
+--- mysql-5.0.96.org/sql/sql_show.cc 2022-10-18 08:29:11.009398098 +0200
++++ mysql-5.0.96/sql/sql_show.cc 2022-10-18 08:29:12.126064764 +0200
@@ -33,6 +33,17 @@
#include "ha_innodb.h"
#endif
@@ -560,7 +560,7 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
#ifndef NO_EMBEDDED_ACCESS_CHECKS
static const char *grant_names[]={
"select","insert","update","delete","create","drop","reload","shutdown",
-@@ -4109,6 +4120,72 @@
+@@ -4145,6 +4156,72 @@ int fill_innodb_bp_content(THD *thd, TAB
DBUG_RETURN(res);
}
@@ -633,7 +633,7 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
/*
Find schema_tables elment by name
-@@ -4915,6 +4992,19 @@
+@@ -4951,6 +5028,19 @@ ST_FIELD_INFO triggers_fields_info[]=
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -653,9 +653,9 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
ST_FIELD_INFO variables_fields_info[]=
{
-@@ -5090,6 +5180,10 @@
+@@ -5126,6 +5216,10 @@ ST_SCHEMA_TABLE schema_tables[]=
make_old_format, 0, -1, -1, 1},
- {"VIEWS", view_fields_info, create_schema_table,
+ {"VIEWS", view_fields_info, create_schema_table,
get_all_tables, 0, get_schema_views_record, 1, 2, 0},
+#ifdef HAVE_INNOBASE_DB
+ {"INNODB_IO_PATTERN", innodb_io_pattern_field_info, create_schema_table,
@@ -664,10 +664,10 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
{0, 0, 0, 0, 0, 0, 0, 0, 0}
};
-diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
---- a/sql/sql_yacc.yy Wed Jul 29 09:58:58 2009 -0700
-+++ b/sql/sql_yacc.yy Wed Jul 29 10:00:12 2009 -0700
-@@ -719,6 +719,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_yacc.yy mysql-5.0.96/sql/sql_yacc.yy
+--- mysql-5.0.96.org/sql/sql_yacc.yy 2022-10-18 08:29:10.976064764 +0200
++++ mysql-5.0.96/sql/sql_yacc.yy 2022-10-18 08:29:12.126064764 +0200
+@@ -720,6 +720,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
%token INFILE
%token INNER_SYM
%token INNOBASE_SYM
@@ -675,7 +675,7 @@ diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
%token INOUT_SYM
%token INSENSITIVE_SYM
%token INSERT
-@@ -8526,6 +8527,7 @@
+@@ -8530,6 +8531,7 @@ flush_option:
| MASTER_SYM { Lex->type|= REFRESH_MASTER; }
| DES_KEY_FILE { Lex->type|= REFRESH_DES_KEY_FILE; }
| RESOURCES { Lex->type|= REFRESH_USER_RESOURCES; }
@@ -683,7 +683,7 @@ diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
| CLIENT_STATS_SYM { Lex->type|= REFRESH_CLIENT_STATS; }
| USER_STATS_SYM { Lex->type|= REFRESH_USER_STATS; }
| TABLE_STATS_SYM { Lex->type|= REFRESH_TABLE_STATS; }
-@@ -9579,6 +9581,7 @@
+@@ -9583,6 +9585,7 @@ keyword_sp:
| ISOLATION {}
| ISSUER_SYM {}
| INNOBASE_SYM {}
diff --git a/mysql-microsec_process.patch b/mysql-microsec_process.patch
index 4731a66..c142080 100644
--- a/mysql-microsec_process.patch
+++ b/mysql-microsec_process.patch
@@ -1,7 +1,7 @@
-diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
---- a/mysql-test/r/information_schema.result Mon May 18 18:44:04 2009 -0700
-+++ b/mysql-test/r/information_schema.result Mon May 18 18:48:11 2009 -0700
-@@ -44,6 +44,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysql-test/r/information_schema.result mysql-5.0.96/mysql-test/r/information_schema.result
+--- mysql-5.0.96.org/mysql-test/r/information_schema.result 2022-10-18 08:28:42.889398102 +0200
++++ mysql-5.0.96/mysql-test/r/information_schema.result 2022-10-18 08:28:43.982731435 +0200
+@@ -44,6 +44,7 @@ COLUMNS
COLUMN_PRIVILEGES
INDEX_STATISTICS
KEY_COLUMN_USAGE
@@ -9,7 +9,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
PROFILING
ROUTINES
SCHEMATA
-@@ -740,7 +741,7 @@
+@@ -740,7 +741,7 @@ CREATE TABLE t_crashme ( f1 BIGINT);
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
count(*)
@@ -18,7 +18,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
drop view a2, a1;
drop table t_crashme;
select table_schema,table_name, column_name from
-@@ -749,6 +750,7 @@
+@@ -749,6 +750,7 @@ where data_type = 'longtext';
table_schema table_name column_name
information_schema COLUMNS COLUMN_DEFAULT
information_schema COLUMNS COLUMN_TYPE
@@ -26,7 +26,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
information_schema ROUTINES ROUTINE_DEFINITION
information_schema ROUTINES SQL_MODE
information_schema TRIGGERS ACTION_CONDITION
-@@ -813,7 +815,7 @@
+@@ -813,7 +815,7 @@ delete from mysql.db where user='mysqlte
flush privileges;
SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
table_schema count(*)
@@ -35,7 +35,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
mysql 17
create table t1 (i int, j int);
create trigger trg1 before insert on t1 for each row
-@@ -1206,6 +1208,7 @@
+@@ -1208,6 +1210,7 @@ COLUMNS TABLE_SCHEMA
COLUMN_PRIVILEGES TABLE_SCHEMA
INDEX_STATISTICS TABLE_SCHEMA
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
@@ -43,7 +43,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
PROFILING QUERY_ID
ROUTINES ROUTINE_SCHEMA
SCHEMATA SCHEMA_NAME
-@@ -1242,6 +1245,7 @@
+@@ -1244,6 +1247,7 @@ COLUMNS TABLE_SCHEMA
COLUMN_PRIVILEGES TABLE_SCHEMA
INDEX_STATISTICS TABLE_SCHEMA
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
@@ -51,7 +51,7 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
PROFILING QUERY_ID
ROUTINES ROUTINE_SCHEMA
SCHEMATA SCHEMA_NAME
-@@ -1329,6 +1333,7 @@
+@@ -1331,6 +1335,7 @@ COLUMNS information_schema.COLUMNS 1
COLUMN_PRIVILEGES information_schema.COLUMN_PRIVILEGES 1
INDEX_STATISTICS information_schema.INDEX_STATISTICS 1
KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
@@ -59,10 +59,10 @@ diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_sc
PROFILING information_schema.PROFILING 1
ROUTINES information_schema.ROUTINES 1
SCHEMATA information_schema.SCHEMATA 1
-diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
---- a/mysql-test/r/information_schema_db.result Mon May 18 18:44:04 2009 -0700
-+++ b/mysql-test/r/information_schema_db.result Mon May 18 18:48:11 2009 -0700
-@@ -13,6 +13,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysql-test/r/information_schema_db.result mysql-5.0.96/mysql-test/r/information_schema_db.result
+--- mysql-5.0.96.org/mysql-test/r/information_schema_db.result 2022-10-18 08:28:42.889398102 +0200
++++ mysql-5.0.96/mysql-test/r/information_schema_db.result 2022-10-18 08:28:43.982731435 +0200
+@@ -13,6 +13,7 @@ COLUMNS
COLUMN_PRIVILEGES
INDEX_STATISTICS
KEY_COLUMN_USAGE
@@ -70,10 +70,10 @@ diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information
PROFILING
ROUTINES
SCHEMATA
-diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
---- a/mysql-test/r/mysqlshow.result Mon May 18 18:44:04 2009 -0700
-+++ b/mysql-test/r/mysqlshow.result Mon May 18 18:48:11 2009 -0700
-@@ -87,6 +87,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/mysql-test/r/mysqlshow.result mysql-5.0.96/mysql-test/r/mysqlshow.result
+--- mysql-5.0.96.org/mysql-test/r/mysqlshow.result 2022-10-18 08:28:42.889398102 +0200
++++ mysql-5.0.96/mysql-test/r/mysqlshow.result 2022-10-18 08:28:43.982731435 +0200
+@@ -87,6 +87,7 @@ Database: information_schema
| COLUMN_PRIVILEGES |
| INDEX_STATISTICS |
| KEY_COLUMN_USAGE |
@@ -81,7 +81,7 @@ diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
| PROFILING |
| ROUTINES |
| SCHEMATA |
-@@ -113,6 +114,7 @@
+@@ -113,6 +114,7 @@ Database: INFORMATION_SCHEMA
| COLUMN_PRIVILEGES |
| INDEX_STATISTICS |
| KEY_COLUMN_USAGE |
@@ -89,9 +89,9 @@ diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
| PROFILING |
| ROUTINES |
| SCHEMATA |
-diff -ruN /dev/null b/patch_info/microsec_process.info
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patch_info/microsec_process.info Mon May 18 18:48:11 2009 -0700
+diff -urNp -x '*.orig' mysql-5.0.96.org/patch_info/microsec_process.info mysql-5.0.96/patch_info/microsec_process.info
+--- mysql-5.0.96.org/patch_info/microsec_process.info 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/patch_info/microsec_process.info 2022-10-18 08:28:43.982731435 +0200
@@ -0,0 +1,6 @@
+File=microsec_process.patch
+Name=Adds INFOMATION_SCHEMA.PROCESSLIST with TIME_MS column
@@ -99,10 +99,10 @@ diff -ruN /dev/null b/patch_info/microsec_process.info
+Author=Percona <info at percona.com>
+License=GPL
+Comment=
-diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
---- a/sql/mysql_priv.h Mon May 18 18:44:04 2009 -0700
-+++ b/sql/mysql_priv.h Mon May 18 18:48:11 2009 -0700
-@@ -249,6 +249,8 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/mysql_priv.h mysql-5.0.96/sql/mysql_priv.h
+--- mysql-5.0.96.org/sql/mysql_priv.h 2022-10-18 08:28:42.906064768 +0200
++++ mysql-5.0.96/sql/mysql_priv.h 2022-10-18 08:28:43.982731435 +0200
+@@ -249,6 +249,8 @@ MY_LOCALE *my_locale_by_number(uint numb
/* Characters shown for the command in 'show processlist' */
#define PROCESS_LIST_WIDTH 100
@@ -111,10 +111,10 @@ diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
#define PRECISION_FOR_DOUBLE 53
#define PRECISION_FOR_FLOAT 24
-diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc Mon May 18 18:44:04 2009 -0700
-+++ b/sql/sql_show.cc Mon May 18 18:48:11 2009 -0700
-@@ -1493,6 +1493,122 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_show.cc mysql-5.0.96/sql/sql_show.cc
+--- mysql-5.0.96.org/sql/sql_show.cc 2022-10-18 08:28:42.916064769 +0200
++++ mysql-5.0.96/sql/sql_show.cc 2022-10-18 08:28:43.986064769 +0200
+@@ -1493,6 +1493,122 @@ void mysqld_list_processes(THD *thd,cons
DBUG_VOID_RETURN;
}
@@ -237,7 +237,7 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
/*****************************************************************************
Status functions
*****************************************************************************/
-@@ -4862,6 +4978,22 @@
+@@ -4898,6 +5014,22 @@ ST_FIELD_INFO index_stats_fields_info[]=
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -260,19 +260,19 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
/*
Description of ST_FIELD_INFO in table.h
*/
-@@ -4886,6 +5018,8 @@
+@@ -4922,6 +5054,8 @@ ST_SCHEMA_TABLE schema_tables[]=
get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
{"OPEN_TABLES", open_tables_fields_info, create_schema_table,
fill_open_tables, make_old_format, 0, -1, -1, 1},
+ {"PROCESSLIST", processlist_fields_info, create_schema_table,
+ fill_schema_processlist, make_old_format, 0, -1, -1, 0},
{"PROFILING", query_profile_statistics_info, create_schema_table,
- fill_query_profile_statistics_info, make_profile_table_for_show,
+ fill_query_profile_statistics_info, make_profile_table_for_show,
NULL, -1, -1, false},
-diff -ruN a/sql/table.h b/sql/table.h
---- a/sql/table.h Mon May 18 18:44:04 2009 -0700
-+++ b/sql/table.h Mon May 18 18:48:11 2009 -0700
-@@ -379,6 +379,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/table.h mysql-5.0.96/sql/table.h
+--- mysql-5.0.96.org/sql/table.h 2022-10-18 08:28:42.919398102 +0200
++++ mysql-5.0.96/sql/table.h 2022-10-18 08:28:43.986064769 +0200
+@@ -378,6 +378,7 @@ enum enum_schema_tables
SCH_INDEX_STATS,
SCH_KEY_COLUMN_USAGE,
SCH_OPEN_TABLES,
diff --git a/mysql-noproc.patch b/mysql-noproc.patch
index 90b7878..6efd779 100644
--- a/mysql-noproc.patch
+++ b/mysql-noproc.patch
@@ -1,15 +1,16 @@
---- mysql-4.0.13/configure.in.orig Fri Jul 11 11:59:51 2003
-+++ mysql-4.0.13/configure.in Fri Jul 11 14:06:50 2003
-@@ -431,6 +431,7 @@
- # Lock for PS
+diff -urNp -x '*.orig' mysql-5.0.96.org/configure.in mysql-5.0.96/configure.in
+--- mysql-5.0.96.org/configure.in 2022-10-18 08:26:19.179398132 +0200
++++ mysql-5.0.96/configure.in 2022-10-18 08:26:20.232731465 +0200
+@@ -517,6 +517,7 @@ AC_SUBST(ICHECK)
+ # no unprotected single quotes should appear in the expression.
AC_PATH_PROG(PS, ps, ps)
AC_MSG_CHECKING("how to check if pid exists")
+if test -z "$FIND_PROC"; then
PS=$ac_cv_path_PS
# Linux style
- if $PS p $$ 2> /dev/null | grep $0 > /dev/null
-@@ -467,12 +468,14 @@
- AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
+ if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
+@@ -556,12 +557,14 @@ else
+ 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
fi
+fi
@@ -23,7 +24,7 @@
if $ac_cv_path_KILL -0 $$
then
CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
-@@ -483,6 +486,7 @@
+@@ -572,6 +575,7 @@ else
AC_MSG_WARN([kill -0 to check for pid seems to fail])
CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
fi
diff --git a/mysql-show_patches.patch b/mysql-show_patches.patch
index b2e31d9..111778d 100644
--- a/mysql-show_patches.patch
+++ b/mysql-show_patches.patch
@@ -1,6 +1,6 @@
-diff -ruN /dev/null b/patch_info/show_patches.info
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patch_info/show_patches.info Mon Dec 22 00:25:06 2008 -0800
+diff -urNp -x '*.orig' mysql-5.0.96.org/patch_info/show_patches.info mysql-5.0.96/patch_info/show_patches.info
+--- mysql-5.0.96.org/patch_info/show_patches.info 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/patch_info/show_patches.info 2022-10-18 08:28:16.729398106 +0200
@@ -0,0 +1,6 @@
+File=show_patches.patch
+Name=SHOW PATCHES
@@ -8,10 +8,10 @@ diff -ruN /dev/null b/patch_info/show_patches.info
+Author=Jeremy Cole
+License=N/A
+Comment
-diff -ruN a/sql/Makefile.am b/sql/Makefile.am
---- a/sql/Makefile.am Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/Makefile.am Mon Dec 22 00:25:06 2008 -0800
-@@ -118,7 +118,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/Makefile.am mysql-5.0.96/sql/Makefile.am
+--- mysql-5.0.96.org/sql/Makefile.am 2022-10-18 08:28:15.669398106 +0200
++++ mysql-5.0.96/sql/Makefile.am 2022-10-18 08:28:16.729398106 +0200
+@@ -121,7 +121,7 @@ DEFS = -DMYSQL_SERVER \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
@DEFS@
@@ -20,19 +20,19 @@ diff -ruN a/sql/Makefile.am b/sql/Makefile.am
EXTRA_DIST = $(BUILT_SOURCES) nt_servc.cc nt_servc.h \
message.mc message.h message.rc MSG00001.bin \
examples/CMakeLists.txt CMakeLists.txt \
-@@ -175,6 +175,8 @@
- udf_example_la_SOURCES= udf_example.c
- udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
+@@ -182,6 +182,8 @@ pkglib_LTLIBRARIES = sphinx/sphinx.la
+ sphinx_sphinx_la_SOURCES = sphinx/snippets_udf.cc
+ sphinx_sphinx_la_LDFLAGS = -module
+patch_info.h: patch_info.h.pl
+ $(PERL) $< > $@
# Don't update the files from bitkeeper
%::SCCS/s.%
-diff -ruN a/sql/Makefile.in b/sql/Makefile.in
---- a/sql/Makefile.in Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/Makefile.in Mon Dec 22 00:25:06 2008 -0800
-@@ -566,7 +566,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/Makefile.in mysql-5.0.96/sql/Makefile.in
+--- mysql-5.0.96.org/sql/Makefile.in 2012-03-02 15:05:22.000000000 +0100
++++ mysql-5.0.96/sql/Makefile.in 2022-10-18 08:28:16.732731440 +0200
+@@ -568,7 +568,7 @@ gen_lex_hash_SOURCES = gen_lex_hash.cc
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql.cc
mysql_tzinfo_to_sql_LDADD = @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS)
@@ -41,7 +41,7 @@ diff -ruN a/sql/Makefile.in b/sql/Makefile.in
EXTRA_DIST = $(BUILT_SOURCES) nt_servc.cc nt_servc.h \
message.mc message.h message.rc MSG00001.bin \
examples/CMakeLists.txt CMakeLists.txt \
-@@ -1227,6 +1227,9 @@
+@@ -1229,6 +1229,9 @@ lex_hash.h: gen_lex_hash.cc lex.h
./gen_lex_hash$(EXEEXT) > $@-t
$(MV) $@-t $@
@@ -51,10 +51,10 @@ diff -ruN a/sql/Makefile.in b/sql/Makefile.in
# Don't update the files from bitkeeper
%::SCCS/s.%
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -ruN a/sql/lex.h b/sql/lex.h
---- a/sql/lex.h Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/lex.h Mon Dec 22 00:25:06 2008 -0800
-@@ -367,6 +367,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/lex.h mysql-5.0.96/sql/lex.h
+--- mysql-5.0.96.org/sql/lex.h 2012-03-02 15:04:12.000000000 +0100
++++ mysql-5.0.96/sql/lex.h 2022-10-18 08:28:16.732731440 +0200
+@@ -367,6 +367,7 @@ static SYMBOL symbols[] = {
{ "PACK_KEYS", SYM(PACK_KEYS_SYM)},
{ "PARTIAL", SYM(PARTIAL)},
{ "PASSWORD", SYM(PASSWORD)},
@@ -62,10 +62,10 @@ diff -ruN a/sql/lex.h b/sql/lex.h
{ "PHASE", SYM(PHASE_SYM)},
{ "POINT", SYM(POINT_SYM)},
{ "POLYGON", SYM(POLYGON)},
-diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
---- a/sql/mysql_priv.h Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/mysql_priv.h Mon Dec 22 00:25:06 2008 -0800
-@@ -987,6 +987,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/mysql_priv.h mysql-5.0.96/sql/mysql_priv.h
+--- mysql-5.0.96.org/sql/mysql_priv.h 2022-10-18 08:28:15.672731440 +0200
++++ mysql-5.0.96/sql/mysql_priv.h 2022-10-18 08:28:16.732731440 +0200
+@@ -987,6 +987,7 @@ void mysqld_list_processes(THD *thd,cons
int mysqld_show_status(THD *thd);
int mysqld_show_variables(THD *thd,const char *wild);
bool mysqld_show_storage_engines(THD *thd);
@@ -73,9 +73,9 @@ diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
bool mysqld_show_privileges(THD *thd);
bool mysqld_show_column_types(THD *thd);
bool mysqld_help (THD *thd, const char *text);
-diff -ruN /dev/null b/sql/patch_info.h.pl
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/sql/patch_info.h.pl Mon Dec 22 00:25:06 2008 -0800
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/patch_info.h.pl mysql-5.0.96/sql/patch_info.h.pl
+--- mysql-5.0.96.org/sql/patch_info.h.pl 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/sql/patch_info.h.pl 2022-10-18 08:28:16.732731440 +0200
@@ -0,0 +1,65 @@
+use strict;
+
@@ -142,10 +142,10 @@ diff -ruN /dev/null b/sql/patch_info.h.pl
+};
+
+HEADER
-diff -ruN a/sql/sp_head.cc b/sql/sp_head.cc
---- a/sql/sp_head.cc Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/sp_head.cc Mon Dec 22 00:25:06 2008 -0800
-@@ -191,6 +191,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sp_head.cc mysql-5.0.96/sql/sp_head.cc
+--- mysql-5.0.96.org/sql/sp_head.cc 2012-03-02 15:04:07.000000000 +0100
++++ mysql-5.0.96/sql/sp_head.cc 2022-10-18 08:28:16.732731440 +0200
+@@ -191,6 +191,7 @@ sp_get_flags_for_command(LEX *lex)
case SQLCOM_SHOW_MUTEX_STATUS:
case SQLCOM_SHOW_NEW_MASTER:
case SQLCOM_SHOW_OPEN_TABLES:
@@ -153,10 +153,10 @@ diff -ruN a/sql/sp_head.cc b/sql/sp_head.cc
case SQLCOM_SHOW_PRIVILEGES:
case SQLCOM_SHOW_PROCESSLIST:
case SQLCOM_SHOW_SLAVE_HOSTS:
-diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h
---- a/sql/sql_lex.h Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/sql_lex.h Mon Dec 22 00:25:06 2008 -0800
-@@ -95,6 +95,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_lex.h mysql-5.0.96/sql/sql_lex.h
+--- mysql-5.0.96.org/sql/sql_lex.h 2022-10-18 08:28:15.672731440 +0200
++++ mysql-5.0.96/sql/sql_lex.h 2022-10-18 08:28:16.732731440 +0200
+@@ -96,6 +96,7 @@ enum enum_sql_command {
SQLCOM_XA_COMMIT, SQLCOM_XA_ROLLBACK, SQLCOM_XA_RECOVER,
SQLCOM_SHOW_PROC_CODE, SQLCOM_SHOW_FUNC_CODE,
SQLCOM_SHOW_PROFILE, SQLCOM_SHOW_PROFILES,
@@ -164,10 +164,10 @@ diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h
/*
When a command is added here, be sure it's also added in mysqld.cc
-diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
---- a/sql/sql_parse.cc Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/sql_parse.cc Mon Dec 22 00:25:06 2008 -0800
-@@ -4081,6 +4081,9 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_parse.cc mysql-5.0.96/sql/sql_parse.cc
+--- mysql-5.0.96.org/sql/sql_parse.cc 2022-10-18 08:28:15.676064773 +0200
++++ mysql-5.0.96/sql/sql_parse.cc 2022-10-18 08:28:16.732731440 +0200
+@@ -4120,6 +4120,9 @@ end_with_restore_list:
case SQLCOM_SHOW_STORAGE_ENGINES:
res= mysqld_show_storage_engines(thd);
break;
@@ -177,10 +177,10 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
case SQLCOM_SHOW_PRIVILEGES:
res= mysqld_show_privileges(thd);
break;
-diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
---- a/sql/sql_prepare.cc Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/sql_prepare.cc Mon Dec 22 00:25:06 2008 -0800
-@@ -1790,6 +1790,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_prepare.cc mysql-5.0.96/sql/sql_prepare.cc
+--- mysql-5.0.96.org/sql/sql_prepare.cc 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/sql_prepare.cc 2022-10-18 08:28:16.736064773 +0200
+@@ -1818,6 +1818,7 @@ static bool check_prepared_statement(Pre
case SQLCOM_SHOW_DATABASES:
case SQLCOM_SHOW_PROCESSLIST:
case SQLCOM_SHOW_STORAGE_ENGINES:
@@ -188,9 +188,9 @@ diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
case SQLCOM_SHOW_PRIVILEGES:
case SQLCOM_SHOW_COLUMN_TYPES:
case SQLCOM_SHOW_STATUS:
-diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/sql_show.cc Mon Dec 22 00:25:06 2008 -0800
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_show.cc mysql-5.0.96/sql/sql_show.cc
+--- mysql-5.0.96.org/sql/sql_show.cc 2022-10-18 08:28:15.676064773 +0200
++++ mysql-5.0.96/sql/sql_show.cc 2022-10-18 08:28:16.736064773 +0200
@@ -22,6 +22,7 @@
#include "sp.h"
#include "sp_head.h"
@@ -199,7 +199,7 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
#include <my_dir.h>
#ifdef HAVE_BERKELEY_DB
-@@ -46,6 +47,47 @@
+@@ -46,6 +47,47 @@ static int
view_store_create_info(THD *thd, TABLE_LIST *table, String *buff);
bool schema_table_store_record(THD *thd, TABLE *table);
@@ -246,11 +246,11 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
+
/***************************************************************************
- ** List all table types supported
-diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
---- a/sql/sql_yacc.yy Mon Dec 22 00:20:06 2008 -0800
-+++ b/sql/sql_yacc.yy Mon Dec 22 00:25:06 2008 -0800
-@@ -858,6 +858,7 @@
+ ** List all table types supported
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_yacc.yy mysql-5.0.96/sql/sql_yacc.yy
+--- mysql-5.0.96.org/sql/sql_yacc.yy 2022-10-18 08:28:15.679398106 +0200
++++ mysql-5.0.96/sql/sql_yacc.yy 2022-10-18 08:28:16.736064773 +0200
+@@ -859,6 +859,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
%token PAGE_SYM
%token PARTIAL
%token PASSWORD
@@ -258,7 +258,7 @@ diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
%token PARAM_MARKER
%token PHASE_SYM
%token POINTFROMTEXT
-@@ -8060,7 +8061,7 @@
+@@ -8061,7 +8062,7 @@ show: SHOW
;
show_param:
@@ -267,7 +267,7 @@ diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
-@@ -8161,6 +8162,10 @@
+@@ -8162,6 +8163,10 @@ show_param:
lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
WARN_DEPRECATED("SHOW TABLE TYPES", "SHOW [STORAGE] ENGINES");
}
@@ -278,7 +278,7 @@ diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
| opt_storage ENGINES_SYM
{
LEX *lex=Lex;
-@@ -9592,6 +9597,7 @@
+@@ -9596,6 +9601,7 @@ keyword_sp:
| PAGE_SYM {}
| PARTIAL {}
| PASSWORD {}
diff --git a/mysql-sphinx.patch b/mysql-sphinx.patch
index 09a801c..cb11dc1 100644
--- a/mysql-sphinx.patch
+++ b/mysql-sphinx.patch
@@ -1,5 +1,6 @@
---- mysql-5.0.67/config/ac-macros/ha_sphinx.m4 1970-01-01 10:00:00.000000000 +1000
-+++ mysql-5.0.67-sphinx/config/ac-macros/ha_sphinx.m4 2009-02-14 09:15:48.000000000 +1000
+diff -urNp -x '*.orig' mysql-5.0.96.org/config/ac-macros/ha_sphinx.m4 mysql-5.0.96/config/ac-macros/ha_sphinx.m4
+--- mysql-5.0.96.org/config/ac-macros/ha_sphinx.m4 1970-01-01 01:00:00.000000000 +0100
++++ mysql-5.0.96/config/ac-macros/ha_sphinx.m4 2022-10-18 08:24:57.662731482 +0200
@@ -0,0 +1,30 @@
+dnl ---------------------------------------------------------------------------
+dnl Macro: MYSQL_CHECK_EXAMPLEDB
@@ -31,9 +32,10 @@
+dnl END OF MYSQL_CHECK_EXAMPLE SECTION
+dnl ---------------------------------------------------------------------------
+
---- mysql-5.0.67/configure.in 2008-08-04 23:19:07.000000000 +1100
-+++ mysql-5.0.67-sphinx/configure.in 2009-02-14 09:15:48.000000000 +1000
-@@ -58,6 +58,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/configure.in mysql-5.0.96/configure.in
+--- mysql-5.0.96.org/configure.in 2022-10-18 08:24:56.409398149 +0200
++++ mysql-5.0.96/configure.in 2022-10-18 08:24:57.662731482 +0200
+@@ -60,6 +60,7 @@ sinclude(config/ac-macros/ha_archive.m4)
sinclude(config/ac-macros/ha_berkeley.m4)
sinclude(config/ac-macros/ha_blackhole.m4)
sinclude(config/ac-macros/ha_example.m4)
@@ -41,7 +43,7 @@
sinclude(config/ac-macros/ha_federated.m4)
sinclude(config/ac-macros/ha_innodb.m4)
sinclude(config/ac-macros/ha_ndbcluster.m4)
-@@ -2625,6 +2626,7 @@
+@@ -2709,6 +2710,7 @@ MYSQL_CHECK_MAX_INDEXES
MYSQL_CHECK_BDB
MYSQL_CHECK_INNODB
MYSQL_CHECK_EXAMPLEDB
@@ -49,9 +51,10 @@
MYSQL_CHECK_ARCHIVEDB
MYSQL_CHECK_CSVDB
MYSQL_CHECK_BLACKHOLEDB
---- mysql-5.0.67/libmysqld/Makefile.am 2008-08-04 23:19:18.000000000 +1100
-+++ mysql-5.0.67-sphinx/libmysqld/Makefile.am 2009-02-14 09:15:48.000000000 +1000
-@@ -29,6 +29,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/libmysqld/Makefile.am mysql-5.0.96/libmysqld/Makefile.am
+--- mysql-5.0.96.org/libmysqld/Makefile.am 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/libmysqld/Makefile.am 2022-10-18 08:24:57.662731482 +0200
+@@ -30,6 +30,7 @@ INCLUDES= @bdb_includes@ @innodb_inclu
-I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/sql -I$(top_srcdir)/sql \
-I$(top_srcdir)/sql/examples \
@@ -59,7 +62,7 @@
-I$(top_srcdir)/regex \
$(openssl_includes) @ZLIB_INCLUDES@
-@@ -39,6 +40,7 @@
+@@ -40,6 +41,7 @@ libmysqld_sources= libmysqld.c lib_sql.c
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
my_time.c
sqlexamplessources = ha_example.cc ha_tina.cc
@@ -67,7 +70,7 @@
noinst_HEADERS = embedded_priv.h emb_qcache.h
-@@ -67,7 +69,7 @@
+@@ -68,7 +70,7 @@ sqlsources = derror.cc field.cc field_co
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
ha_blackhole.cc ha_archive.cc my_user.c
@@ -76,7 +79,7 @@
libmysqld_a_SOURCES=
# automake misses these
-@@ -147,12 +149,16 @@
+@@ -148,12 +150,16 @@ link_sources:
rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/sql/examples/$$f $$f; \
done; \
@@ -94,9 +97,40 @@
$(top_srcdir)/linked_libmysqld_sources; \
rm -f client_settings.h
---- mysql-5.0.67/sql/handler.cc 2008-08-04 23:20:04.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/handler.cc 2009-02-14 09:15:48.000000000 +1000
-@@ -77,6 +77,15 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/Makefile.am mysql-5.0.96/sql/Makefile.am
+--- mysql-5.0.96.org/sql/Makefile.am 2022-10-18 08:24:56.412731482 +0200
++++ mysql-5.0.96/sql/Makefile.am 2022-10-18 08:24:57.662731482 +0200
+@@ -69,6 +69,7 @@ noinst_HEADERS = item.h item_func.h item
+ sql_array.h sql_cursor.h \
+ examples/ha_example.h ha_archive.h \
+ examples/ha_tina.h ha_blackhole.h \
++ sphinx/ha_sphinx.h \
+ ha_federated.h
+ mysqld_SOURCES = sql_lex.cc sql_handler.cc \
+ item.cc item_sum.cc item_buff.cc item_func.cc \
+@@ -106,6 +107,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.
+ sp_cache.cc parse_file.cc sql_trigger.cc \
+ examples/ha_example.cc ha_archive.cc \
+ examples/ha_tina.cc ha_blackhole.cc \
++ sphinx/ha_sphinx.cc \
+ ha_federated.cc
+
+ gen_lex_hash_SOURCES = gen_lex_hash.cc
+@@ -176,6 +178,10 @@ noinst_LTLIBRARIES= udf_example.la
+ udf_example_la_SOURCES= udf_example.c
+ udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
+
++pkglib_LTLIBRARIES = sphinx/sphinx.la
++sphinx_sphinx_la_SOURCES = sphinx/snippets_udf.cc
++sphinx_sphinx_la_LDFLAGS = -module
++
+
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/handler.cc mysql-5.0.96/sql/handler.cc
+--- mysql-5.0.96.org/sql/handler.cc 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/handler.cc 2022-10-18 08:24:57.662731482 +0200
+@@ -78,6 +78,15 @@ handlerton tina_hton = { "CSV", SHOW_OPT
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
HTON_NO_FLAGS };
#endif
@@ -112,7 +146,7 @@
#ifdef HAVE_INNOBASE_DB
#include "ha_innodb.h"
extern handlerton innobase_hton;
-@@ -141,6 +150,7 @@
+@@ -142,6 +151,7 @@ handlerton *sys_table_types[]=
&example_hton,
&archive_hton,
&tina_hton,
@@ -120,7 +154,7 @@
&ndbcluster_hton,
&federated_hton,
&myisammrg_hton,
-@@ -341,6 +351,12 @@
+@@ -343,6 +353,12 @@ handler *get_new_handler(TABLE *table, M
return new (alloc) ha_tina(table);
return NULL;
#endif
@@ -133,9 +167,10 @@
#ifdef HAVE_NDBCLUSTER_DB
case DB_TYPE_NDBCLUSTER:
if (have_ndbcluster == SHOW_OPTION_YES)
---- mysql-5.0.67/sql/handler.h 2008-08-04 23:20:04.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/handler.h 2009-02-14 09:15:48.000000000 +1000
-@@ -186,8 +186,9 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/handler.h mysql-5.0.96/sql/handler.h
+--- mysql-5.0.96.org/sql/handler.h 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/handler.h 2022-10-18 08:24:57.662731482 +0200
+@@ -187,8 +187,9 @@ enum db_type
DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB,
DB_TYPE_GEMINI, DB_TYPE_NDBCLUSTER,
DB_TYPE_EXAMPLE_DB, DB_TYPE_ARCHIVE_DB, DB_TYPE_CSV_DB,
@@ -146,37 +181,25 @@
DB_TYPE_DEFAULT // Must be last
};
---- mysql-5.0.67/sql/Makefile.am 2008-08-04 23:20:02.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/Makefile.am 2009-02-14 09:23:28.000000000 +1000
-@@ -68,6 +68,7 @@
- sql_array.h sql_cursor.h \
- examples/ha_example.h ha_archive.h \
- examples/ha_tina.h ha_blackhole.h \
-+ sphinx/ha_sphinx.h \
- ha_federated.h
- mysqld_SOURCES = sql_lex.cc sql_handler.cc \
- item.cc item_sum.cc item_buff.cc item_func.cc \
-@@ -105,6 +106,7 @@
- sp_cache.cc parse_file.cc sql_trigger.cc \
- examples/ha_example.cc ha_archive.cc \
- examples/ha_tina.cc ha_blackhole.cc \
-+ sphinx/ha_sphinx.cc \
- ha_federated.cc
-
- gen_lex_hash_SOURCES = gen_lex_hash.cc
-@@ -174,6 +176,10 @@
- udf_example_la_SOURCES= udf_example.c
- udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
-
-+pkglib_LTLIBRARIES = sphinx/sphinx.la
-+sphinx_sphinx_la_SOURCES = sphinx/snippets_udf.cc
-+sphinx_sphinx_la_LDFLAGS = -module
-+
-
- # Don't update the files from bitkeeper
- %::SCCS/s.%
---- mysql-5.0.91/sql/mysqld.cc~ 2010-07-24 16:03:55.000000000 +0300
-+++ mysql-5.0.91/sql/mysqld.cc 2010-07-24 16:04:41.004813770 +0300
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/mysql_priv.h mysql-5.0.96/sql/mysql_priv.h
+--- mysql-5.0.96.org/sql/mysql_priv.h 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/mysql_priv.h 2022-10-18 08:24:57.666064815 +0200
+@@ -1457,6 +1457,12 @@ extern handlerton tina_hton;
+ #else
+ extern SHOW_COMP_OPTION have_csv_db;
+ #endif
++#ifdef HAVE_SPHINX_DB
++extern handlerton sphinx_hton;
++#define have_sphinx_db sphinx_hton.state
++#else
++extern SHOW_COMP_OPTION have_sphinx_db;
++#endif
+ #ifdef HAVE_FEDERATED_DB
+ extern handlerton federated_hton;
+ #define have_federated_db federated_hton.state
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/mysqld.cc mysql-5.0.96/sql/mysqld.cc
+--- mysql-5.0.96.org/sql/mysqld.cc 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/mysqld.cc 2022-10-18 08:24:57.666064815 +0200
@@ -36,6 +36,10 @@
#include <sys/prctl.h>
#endif
@@ -188,7 +211,7 @@
#ifdef HAVE_INNOBASE_DB
#define OPT_INNODB_DEFAULT 1
#else
-@@ -6725,6 +6725,13 @@
+@@ -6731,6 +6735,13 @@ struct show_var_st status_vars[]= {
#ifdef COMMUNITY_SERVER
{"Uptime_since_flush_status",(char*) 0, SHOW_FLUSHTIME},
#endif
@@ -202,7 +225,7 @@
{NullS, NullS, SHOW_LONG}
};
-@@ -6875,6 +6886,11 @@
+@@ -6970,6 +6981,11 @@ static void mysql_init_variables(void)
#else
have_csv_db= SHOW_OPTION_NO;
#endif
@@ -214,7 +237,7 @@
#ifdef HAVE_NDBCLUSTER_DB
have_ndbcluster=SHOW_OPTION_DISABLED;
#else
-@@ -7983,6 +7999,7 @@
+@@ -8165,6 +8181,7 @@ void refresh_status(THD *thd)
#undef have_example_db
#undef have_archive_db
#undef have_csv_db
@@ -222,7 +245,7 @@
#undef have_federated_db
#undef have_partition_db
#undef have_blackhole_db
-@@ -7993,6 +8010,7 @@
+@@ -8175,6 +8192,7 @@ SHOW_COMP_OPTION have_ndbcluster= SHOW_O
SHOW_COMP_OPTION have_example_db= SHOW_OPTION_NO;
SHOW_COMP_OPTION have_archive_db= SHOW_OPTION_NO;
SHOW_COMP_OPTION have_csv_db= SHOW_OPTION_NO;
@@ -230,34 +253,21 @@
SHOW_COMP_OPTION have_federated_db= SHOW_OPTION_NO;
SHOW_COMP_OPTION have_partition_db= SHOW_OPTION_NO;
SHOW_COMP_OPTION have_blackhole_db= SHOW_OPTION_NO;
---- mysql-5.0.67/sql/mysql_priv.h 2008-08-04 23:20:07.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/mysql_priv.h 2009-02-14 09:15:48.000000000 +1000
-@@ -1439,6 +1439,12 @@
- #else
- extern SHOW_COMP_OPTION have_csv_db;
- #endif
-+#ifdef HAVE_SPHINX_DB
-+extern handlerton sphinx_hton;
-+#define have_sphinx_db sphinx_hton.state
-+#else
-+extern SHOW_COMP_OPTION have_sphinx_db;
-+#endif
- #ifdef HAVE_FEDERATED_DB
- extern handlerton federated_hton;
- #define have_federated_db federated_hton.state
---- mysql-5.0.67/sql/set_var.cc 2008-08-04 23:20:08.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/set_var.cc 2009-02-14 09:15:48.000000000 +1000
-@@ -888,6 +888,7 @@
- {"have_compress", (char*) &have_compress, SHOW_HAVE},
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/set_var.cc mysql-5.0.96/sql/set_var.cc
+--- mysql-5.0.96.org/sql/set_var.cc 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/set_var.cc 2022-10-18 08:24:57.669398149 +0200
+@@ -913,6 +913,7 @@ struct show_var_st init_vars[]= {
+ {"have_profiling", (char*) &have_profiling, SHOW_HAVE},
{"have_crypt", (char*) &have_crypt, SHOW_HAVE},
{"have_csv", (char*) &have_csv_db, SHOW_HAVE},
+ {"have_sphinx", (char*) &have_sphinx_db, SHOW_HAVE},
{"have_dynamic_loading", (char*) &have_dlopen, SHOW_HAVE},
{"have_example_engine", (char*) &have_example_db, SHOW_HAVE},
{"have_federated_engine", (char*) &have_federated_db, SHOW_HAVE},
---- mysql-5.0.67/sql/sql_lex.h 2008-08-04 23:20:10.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/sql_lex.h 2009-02-14 09:15:48.000000000 +1000
-@@ -57,6 +57,7 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_lex.h mysql-5.0.96/sql/sql_lex.h
+--- mysql-5.0.96.org/sql/sql_lex.h 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/sql_lex.h 2022-10-18 08:24:57.669398149 +0200
+@@ -57,6 +57,7 @@ enum enum_sql_command {
SQLCOM_SHOW_DATABASES, SQLCOM_SHOW_TABLES, SQLCOM_SHOW_FIELDS,
SQLCOM_SHOW_KEYS, SQLCOM_SHOW_VARIABLES, SQLCOM_SHOW_LOGS, SQLCOM_SHOW_STATUS,
SQLCOM_SHOW_INNODB_STATUS, SQLCOM_SHOW_NDBCLUSTER_STATUS, SQLCOM_SHOW_MUTEX_STATUS,
@@ -265,8 +275,9 @@
SQLCOM_SHOW_PROCESSLIST, SQLCOM_SHOW_MASTER_STAT, SQLCOM_SHOW_SLAVE_STAT,
SQLCOM_SHOW_GRANTS, SQLCOM_SHOW_CREATE, SQLCOM_SHOW_CHARSETS,
SQLCOM_SHOW_COLLATIONS, SQLCOM_SHOW_CREATE_DB, SQLCOM_SHOW_TABLE_STATUS,
---- mysql-5.0.67/sql/sql_parse.cc 2008-08-04 23:20:10.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/sql_parse.cc 2009-02-14 09:15:48.000000000 +1000
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_parse.cc mysql-5.0.96/sql/sql_parse.cc
+--- mysql-5.0.96.org/sql/sql_parse.cc 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/sql_parse.cc 2022-10-18 08:24:57.669398149 +0200
@@ -24,6 +24,9 @@
#ifdef HAVE_INNOBASE_DB
#include "ha_innodb.h"
@@ -277,7 +288,7 @@
#ifdef HAVE_NDBCLUSTER_DB
#include "ha_ndbcluster.h"
-@@ -3006,6 +3009,15 @@
+@@ -3193,6 +3196,15 @@ mysql_execute_command(THD *thd)
break;
}
#endif
@@ -293,9 +304,30 @@
#ifdef HAVE_REPLICATION
case SQLCOM_LOAD_MASTER_TABLE:
{
---- mysql-5.0.67/sql/sql_yacc.yy 2008-08-04 23:20:12.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/sql_yacc.yy 2009-02-14 09:15:48.000000000 +1000
-@@ -7393,6 +7393,9 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_show.cc mysql-5.0.96/sql/sql_show.cc
+--- mysql-5.0.96.org/sql/sql_show.cc 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/sql_show.cc 2022-10-18 08:24:57.679398148 +0200
+@@ -1500,6 +1500,16 @@ static bool show_status_array(THD *thd,
+ value= (char*) var->value_ptr(thd, value_type, &null_lex_str);
+ charset= var->charset(thd);
+ }
++ #ifdef HAVE_SPHINX_DB
++ else if (show_type == SHOW_SPHINX_FUNC)
++ {
++ SHOW_VAR var;
++ ((int (*)(THD *, SHOW_VAR *, char *))value)(thd, &var, buff);
++
++ value = var.value;
++ show_type = var.type;
++ }
++ #endif /* HAVE_SPHINX_DB */
+
+ pos= end= buff;
+ switch (show_type) {
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/sql_yacc.yy mysql-5.0.96/sql/sql_yacc.yy
+--- mysql-5.0.96.org/sql/sql_yacc.yy 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/sql_yacc.yy 2022-10-18 08:24:57.672731482 +0200
+@@ -8343,6 +8343,9 @@ show_engine_param:
case DB_TYPE_INNODB:
Lex->sql_command = SQLCOM_SHOW_INNODB_STATUS;
break;
@@ -305,9 +337,10 @@
default:
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "STATUS");
MYSQL_YYABORT;
---- mysql-5.0.67/sql/structs.h 2008-08-04 23:20:12.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/structs.h 2009-02-14 09:15:48.000000000 +1000
-@@ -188,6 +188,9 @@
+diff -urNp -x '*.orig' mysql-5.0.96.org/sql/structs.h mysql-5.0.96/sql/structs.h
+--- mysql-5.0.96.org/sql/structs.h 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/sql/structs.h 2022-10-18 08:24:57.672731482 +0200
+@@ -195,6 +195,9 @@ enum SHOW_TYPE
SHOW_SSL_CTX_SESS_TIMEOUTS, SHOW_SSL_CTX_SESS_CACHE_FULL,
SHOW_SSL_GET_CIPHER_LIST,
#endif /* HAVE_OPENSSL */
@@ -317,22 +350,3 @@
SHOW_NET_COMPRESSION,
SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_SLAVE_RETRIED_TRANS,
SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, SHOW_KEY_CACHE_LONGLONG,
---- mysql-5.0.67/sql/sql_show.cc 2008-08-04 23:20:11.000000000 +1100
-+++ mysql-5.0.67-sphinx/sql/sql_show.cc 2009-02-14 09:15:48.000000000 +1000
-@@ -1473,6 +1473,16 @@
- value= (char*) ((sys_var*) value)->value_ptr(thd, value_type,
- &null_lex_str);
- }
-+ #ifdef HAVE_SPHINX_DB
-+ else if (show_type == SHOW_SPHINX_FUNC)
-+ {
-+ SHOW_VAR var;
-+ ((int (*)(THD *, SHOW_VAR *, char *))value)(thd, &var, buff);
-+
-+ value = var.value;
-+ show_type = var.type;
-+ }
-+ #endif /* HAVE_SPHINX_DB */
-
- pos= end= buff;
- switch (show_type) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/4e026dffe93d53518a4b45056b13dcd38ac9c930
More information about the pld-cvs-commit
mailing list