Update to MySQL 5.1.30
This commit is contained in:
Tom Lane
Michal Schorm
parent
2dceb7c1c5
commit
f74a10ff4d
@ -1 +1 @@
|
||||
mysql-5.0.67.tar.gz
|
||||
mysql-5.1.30.tar.gz
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
Fix link flags, per RH bug #199368.
|
||||
|
||||
Probably no point in filing this upstream, since MySQL AB is dropping BDB
|
||||
support; we won't need it ourselves when we move to mysql 5.1.
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.27.orig/bdb/dist/Makefile.in mysql-5.0.27/bdb/dist/Makefile.in
|
||||
--- mysql-5.0.27.orig/bdb/dist/Makefile.in 2006-10-20 20:22:38.000000000 -0400
|
||||
+++ mysql-5.0.27/bdb/dist/Makefile.in 2006-11-08 19:25:24.000000000 -0500
|
||||
@@ -52,8 +52,9 @@
|
||||
##################################################
|
||||
CPPFLAGS= -I$(builddir) -I$(srcdir) -I$(srcdir)/dbinc @CPPFLAGS@
|
||||
CFLAGS= -c $(CPPFLAGS) @CFLAGS@
|
||||
+LOPTFLAGS= $(CPPFLAGS) @CFLAGS@
|
||||
CC= @MAKEFILE_CC@
|
||||
-CCLINK= @MAKEFILE_CCLINK@
|
||||
+CCLINK= @MAKEFILE_CCLINK@ $(LOPTFLAGS)
|
||||
|
||||
LDFLAGS= @LDFLAGS@
|
||||
LIBS= @LIBS@
|
||||
@@ -74,8 +75,8 @@
|
||||
##################################################
|
||||
CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@
|
||||
CXX= @MAKEFILE_CXX@
|
||||
-CXXLINK= @MAKEFILE_CXXLINK@
|
||||
-XSOLINK= @MAKEFILE_XSOLINK@
|
||||
+CXXLINK= @MAKEFILE_CXXLINK@ $(LOPTFLAGS)
|
||||
+XSOLINK= @MAKEFILE_XSOLINK@ $(LOPTFLAGS)
|
||||
LIBXSO_LIBS= @LIBXSO_LIBS@
|
||||
|
||||
libcxx= libdb_cxx.a
|
||||
@ -1,619 +0,0 @@
|
||||
Work around recent Fedora change that makes "open" a macro name.
|
||||
|
||||
Unlikely that upstream would consider fixing this since they're deprecating
|
||||
BDB anyway. At some point we should probably just remove --with-berkeley-db
|
||||
from our configuration, but I'll hold the line a little longer.
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db/db.c mysql-5.0.45/bdb/db/db.c
|
||||
--- mysql-5.0.45.orig/bdb/db/db.c 2007-07-04 09:06:08.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db/db.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -431,7 +431,7 @@
|
||||
dbenv, 0, dbp->pgsize * DB_MINPAGECACHE, 0)) != 0)
|
||||
return (ret);
|
||||
|
||||
- if ((ret = dbenv->open(dbenv, NULL, DB_CREATE |
|
||||
+ if ((ret = dbenv->open_(dbenv, NULL, DB_CREATE |
|
||||
DB_INIT_MPOOL | DB_PRIVATE | LF_ISSET(DB_THREAD), 0)) != 0)
|
||||
return (ret);
|
||||
}
|
||||
@@ -517,7 +517,7 @@
|
||||
pgcookie.size = sizeof(DB_PGINFO);
|
||||
(void)mpf->set_pgcookie(mpf, &pgcookie);
|
||||
|
||||
- if ((ret = mpf->open(mpf, name,
|
||||
+ if ((ret = mpf->open_(mpf, name,
|
||||
LF_ISSET(DB_RDONLY | DB_NOMMAP | DB_ODDFILESIZE | DB_TRUNCATE) |
|
||||
(F_ISSET(dbenv, DB_ENV_DIRECT_DB) ? DB_DIRECT : 0),
|
||||
0, dbp->pgsize)) != 0)
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db/db_method.c mysql-5.0.45/bdb/db/db_method.c
|
||||
--- mysql-5.0.45.orig/bdb/db/db_method.c 2007-07-04 09:05:56.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db/db_method.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -168,7 +168,7 @@
|
||||
dbp->get_type = __db_get_type;
|
||||
dbp->join = __db_join;
|
||||
dbp->key_range = __db_key_range;
|
||||
- dbp->open = __db_open;
|
||||
+ dbp->open_ = __db_open;
|
||||
dbp->pget = __db_pget;
|
||||
dbp->put = __db_put;
|
||||
dbp->remove = __db_remove;
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db/db_vrfyutil.c mysql-5.0.45/bdb/db/db_vrfyutil.c
|
||||
--- mysql-5.0.45.orig/bdb/db/db_vrfyutil.c 2007-07-04 09:05:39.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db/db_vrfyutil.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -61,7 +61,7 @@
|
||||
goto err;
|
||||
|
||||
if ((ret =
|
||||
- cdbp->open(cdbp, NULL, NULL, NULL, DB_BTREE, DB_CREATE, 0600)) != 0)
|
||||
+ cdbp->open_(cdbp, NULL, NULL, NULL, DB_BTREE, DB_CREATE, 0600)) != 0)
|
||||
goto err;
|
||||
|
||||
if ((ret = db_create(&pgdbp, dbenv, 0)) != 0)
|
||||
@@ -70,7 +70,7 @@
|
||||
if ((ret = pgdbp->set_pagesize(pgdbp, pgsize)) != 0)
|
||||
goto err;
|
||||
|
||||
- if ((ret = pgdbp->open(pgdbp,
|
||||
+ if ((ret = pgdbp->open_(pgdbp,
|
||||
NULL, NULL, NULL, DB_BTREE, DB_CREATE, 0600)) != 0)
|
||||
goto err;
|
||||
|
||||
@@ -284,7 +284,7 @@
|
||||
return (ret);
|
||||
if ((ret = dbp->set_pagesize(dbp, pgsize)) != 0)
|
||||
goto err;
|
||||
- if ((ret = dbp->open(dbp,
|
||||
+ if ((ret = dbp->open_(dbp,
|
||||
NULL, NULL, NULL, DB_BTREE, DB_CREATE, 0600)) == 0)
|
||||
*dbpp = dbp;
|
||||
else
|
||||
@@ -648,7 +648,7 @@
|
||||
if ((ret = dbp->set_pagesize(dbp, 1024)) != 0)
|
||||
goto err;
|
||||
|
||||
- if ((ret = dbp->open(dbp,
|
||||
+ if ((ret = dbp->open_(dbp,
|
||||
NULL, NULL, NULL, DB_BTREE, DB_CREATE, 0)) != 0)
|
||||
goto err;
|
||||
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_archive/db_archive.c mysql-5.0.45/bdb/db_archive/db_archive.c
|
||||
--- mysql-5.0.45.orig/bdb/db_archive/db_archive.c 2007-07-04 09:06:10.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_archive/db_archive.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -116,9 +116,9 @@
|
||||
* If attaching to a pre-existing environment fails, create a
|
||||
* private one and try again.
|
||||
*/
|
||||
- if ((ret = dbenv->open(dbenv,
|
||||
+ if ((ret = dbenv->open_(dbenv,
|
||||
home, DB_JOINENV | DB_USE_ENVIRON, 0)) != 0 &&
|
||||
- (ret = dbenv->open(dbenv, home, DB_CREATE |
|
||||
+ (ret = dbenv->open_(dbenv, home, DB_CREATE |
|
||||
DB_INIT_LOG | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0) {
|
||||
dbenv->err(dbenv, ret, "open");
|
||||
goto shutdown;
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_checkpoint/db_checkpoint.c mysql-5.0.45/bdb/db_checkpoint/db_checkpoint.c
|
||||
--- mysql-5.0.45.orig/bdb/db_checkpoint/db_checkpoint.c 2007-07-04 09:06:16.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_checkpoint/db_checkpoint.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -155,7 +155,7 @@
|
||||
goto shutdown;
|
||||
}
|
||||
/* Initialize the environment. */
|
||||
- if ((ret = dbenv->open(dbenv,
|
||||
+ if ((ret = dbenv->open_(dbenv,
|
||||
home, DB_JOINENV | DB_USE_ENVIRON, 0)) != 0) {
|
||||
dbenv->err(dbenv, ret, "open");
|
||||
goto shutdown;
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_deadlock/db_deadlock.c mysql-5.0.45/bdb/db_deadlock/db_deadlock.c
|
||||
--- mysql-5.0.45.orig/bdb/db_deadlock/db_deadlock.c 2007-07-04 09:06:57.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_deadlock/db_deadlock.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -161,7 +161,7 @@
|
||||
}
|
||||
|
||||
/* An environment is required. */
|
||||
- if ((ret = dbenv->open(dbenv, home,
|
||||
+ if ((ret = dbenv->open_(dbenv, home,
|
||||
DB_JOINENV | DB_USE_ENVIRON, 0)) != 0) {
|
||||
dbenv->err(dbenv, ret, "open");
|
||||
goto shutdown;
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_dump/db_dump.c mysql-5.0.45/bdb/db_dump/db_dump.c
|
||||
--- mysql-5.0.45.orig/bdb/db_dump/db_dump.c 2007-07-04 09:06:56.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_dump/db_dump.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -204,7 +204,7 @@
|
||||
goto done;
|
||||
}
|
||||
|
||||
- if ((ret = dbp->open(dbp, NULL,
|
||||
+ if ((ret = dbp->open_(dbp, NULL,
|
||||
argv[0], subname, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
|
||||
dbp->err(dbp, ret, "open: %s", argv[0]);
|
||||
goto err;
|
||||
@@ -303,7 +303,7 @@
|
||||
* before we create our own.
|
||||
*/
|
||||
*is_privatep = 0;
|
||||
- if (dbenv->open(dbenv, home,
|
||||
+ if (dbenv->open_(dbenv, home,
|
||||
DB_USE_ENVIRON | (is_salvage ? DB_INIT_MPOOL : DB_JOINENV), 0) == 0)
|
||||
return (0);
|
||||
|
||||
@@ -319,7 +319,7 @@
|
||||
*/
|
||||
*is_privatep = 1;
|
||||
if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) == 0 &&
|
||||
- (ret = dbenv->open(dbenv, home,
|
||||
+ (ret = dbenv->open_(dbenv, home,
|
||||
DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) == 0)
|
||||
return (0);
|
||||
|
||||
@@ -411,7 +411,7 @@
|
||||
free(subdb);
|
||||
return (1);
|
||||
}
|
||||
- if ((ret = dbp->open(dbp, NULL,
|
||||
+ if ((ret = dbp->open_(dbp, NULL,
|
||||
parent_name, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0)
|
||||
dbp->err(dbp, ret,
|
||||
"DB->open: %s:%s", parent_name, subdb);
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_load/db_load.c mysql-5.0.45/bdb/db_load/db_load.c
|
||||
--- mysql-5.0.45.orig/bdb/db_load/db_load.c 2007-07-04 09:05:56.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_load/db_load.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -329,7 +329,7 @@
|
||||
}
|
||||
|
||||
/* Open the DB file. */
|
||||
- if ((ret = dbp->open(dbp, NULL, name, subdb, dbtype,
|
||||
+ if ((ret = dbp->open_(dbp, NULL, name, subdb, dbtype,
|
||||
DB_CREATE | (TXN_ON(dbenv) ? DB_AUTO_COMMIT : 0),
|
||||
__db_omode("rwrwrw"))) != 0) {
|
||||
dbp->err(dbp, ret, "DB->open: %s", name);
|
||||
@@ -517,7 +517,7 @@
|
||||
/* We may be loading into a live environment. Try and join. */
|
||||
flags = DB_USE_ENVIRON |
|
||||
DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN;
|
||||
- if (dbenv->open(dbenv, home, flags, 0) == 0)
|
||||
+ if (dbenv->open_(dbenv, home, flags, 0) == 0)
|
||||
return (0);
|
||||
|
||||
/*
|
||||
@@ -539,7 +539,7 @@
|
||||
dbenv->err(dbenv, ret, "set_cachesize");
|
||||
return (1);
|
||||
}
|
||||
- if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
|
||||
+ if ((ret = dbenv->open_(dbenv, home, flags, 0)) == 0)
|
||||
return (0);
|
||||
|
||||
/* An environment is required. */
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_printlog/db_printlog.c mysql-5.0.45/bdb/db_printlog/db_printlog.c
|
||||
--- mysql-5.0.45.orig/bdb/db_printlog/db_printlog.c 2007-07-04 09:06:08.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_printlog/db_printlog.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -156,17 +156,17 @@
|
||||
* with logging, because we don't want to log the opens.
|
||||
*/
|
||||
if (repflag) {
|
||||
- if ((ret = dbenv->open(dbenv, home,
|
||||
+ if ((ret = dbenv->open_(dbenv, home,
|
||||
DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0 &&
|
||||
- (ret = dbenv->open(dbenv, home,
|
||||
+ (ret = dbenv->open_(dbenv, home,
|
||||
DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0))
|
||||
!= 0) {
|
||||
dbenv->err(dbenv, ret, "open");
|
||||
goto shutdown;
|
||||
}
|
||||
- } else if ((ret = dbenv->open(dbenv, home,
|
||||
+ } else if ((ret = dbenv->open_(dbenv, home,
|
||||
DB_JOINENV | DB_USE_ENVIRON, 0)) != 0 &&
|
||||
- (ret = dbenv->open(dbenv, home,
|
||||
+ (ret = dbenv->open_(dbenv, home,
|
||||
DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0) {
|
||||
dbenv->err(dbenv, ret, "open");
|
||||
goto shutdown;
|
||||
@@ -342,7 +342,7 @@
|
||||
|
||||
dbp = *dbpp;
|
||||
if ((ret =
|
||||
- dbp->open(dbp, NULL, "__db.rep.db", NULL, DB_BTREE, 0, 0)) != 0) {
|
||||
+ dbp->open_(dbp, NULL, "__db.rep.db", NULL, DB_BTREE, 0, 0)) != 0) {
|
||||
dbenv->err(dbenv, ret, "DB->open");
|
||||
goto err;
|
||||
}
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_recover/db_recover.c mysql-5.0.45/bdb/db_recover/db_recover.c
|
||||
--- mysql-5.0.45.orig/bdb/db_recover/db_recover.c 2007-07-04 09:06:40.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_recover/db_recover.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -150,7 +150,7 @@
|
||||
DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON);
|
||||
LF_SET(fatal_recover ? DB_RECOVER_FATAL : DB_RECOVER);
|
||||
LF_SET(retain_env ? 0 : DB_PRIVATE);
|
||||
- if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) {
|
||||
+ if ((ret = dbenv->open_(dbenv, home, flags, 0)) != 0) {
|
||||
dbenv->err(dbenv, ret, "DB_ENV->open");
|
||||
goto shutdown;
|
||||
}
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_stat/db_stat.c mysql-5.0.45/bdb/db_stat/db_stat.c
|
||||
--- mysql-5.0.45.orig/bdb/db_stat/db_stat.c 2007-07-04 09:06:09.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_stat/db_stat.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -245,7 +245,7 @@
|
||||
}
|
||||
d_close = 1;
|
||||
|
||||
- if ((ret = dbp->open(dbp,
|
||||
+ if ((ret = dbp->open_(dbp,
|
||||
NULL, db, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
|
||||
dbp->err(dbp, ret, "DB->open: %s", db);
|
||||
goto shutdown;
|
||||
@@ -287,7 +287,7 @@
|
||||
dbenv->err(dbenv, ret, "db_create");
|
||||
goto shutdown;
|
||||
}
|
||||
- if ((ret = dbp->open(alt_dbp, NULL,
|
||||
+ if ((ret = dbp->open_(alt_dbp, NULL,
|
||||
db, subdb, DB_UNKNOWN, 0, 0)) != 0) {
|
||||
dbenv->err(dbenv,
|
||||
ret, "DB->open: %s:%s", db, subdb);
|
||||
@@ -1187,7 +1187,7 @@
|
||||
*/
|
||||
*is_private = 0;
|
||||
if ((ret =
|
||||
- dbenv->open(dbenv, home, DB_JOINENV | DB_USE_ENVIRON, 0)) == 0)
|
||||
+ dbenv->open_(dbenv, home, DB_JOINENV | DB_USE_ENVIRON, 0)) == 0)
|
||||
return (0);
|
||||
if (ttype != T_DB && ttype != T_LOG) {
|
||||
dbenv->err(dbenv, ret, "DB_ENV->open%s%s",
|
||||
@@ -1215,7 +1215,7 @@
|
||||
oflags |= DB_INIT_MPOOL;
|
||||
if (ttype == T_LOG)
|
||||
oflags |= DB_INIT_LOG;
|
||||
- if ((ret = dbenv->open(dbenv, home, oflags, 0)) == 0)
|
||||
+ if ((ret = dbenv->open_(dbenv, home, oflags, 0)) == 0)
|
||||
return (0);
|
||||
|
||||
/* An environment is required. */
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_upgrade/db_upgrade.c mysql-5.0.45/bdb/db_upgrade/db_upgrade.c
|
||||
--- mysql-5.0.45.orig/bdb/db_upgrade/db_upgrade.c 2007-07-04 09:06:09.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_upgrade/db_upgrade.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -121,9 +121,9 @@
|
||||
* If attaching to a pre-existing environment fails, create a
|
||||
* private one and try again.
|
||||
*/
|
||||
- if ((ret = dbenv->open(dbenv,
|
||||
+ if ((ret = dbenv->open_(dbenv,
|
||||
home, DB_JOINENV | DB_USE_ENVIRON, 0)) != 0 &&
|
||||
- (ret = dbenv->open(dbenv, home,
|
||||
+ (ret = dbenv->open_(dbenv, home,
|
||||
DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0) {
|
||||
dbenv->err(dbenv, ret, "open");
|
||||
goto shutdown;
|
||||
diff -Naur mysql-5.0.45.orig/bdb/db_verify/db_verify.c mysql-5.0.45/bdb/db_verify/db_verify.c
|
||||
--- mysql-5.0.45.orig/bdb/db_verify/db_verify.c 2007-07-04 09:06:26.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/db_verify/db_verify.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -129,13 +129,13 @@
|
||||
*/
|
||||
private = 0;
|
||||
if ((ret =
|
||||
- dbenv->open(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) {
|
||||
+ dbenv->open_(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) {
|
||||
if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) != 0) {
|
||||
dbenv->err(dbenv, ret, "set_cachesize");
|
||||
goto shutdown;
|
||||
}
|
||||
private = 1;
|
||||
- if ((ret = dbenv->open(dbenv, home,
|
||||
+ if ((ret = dbenv->open_(dbenv, home,
|
||||
DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0) {
|
||||
dbenv->err(dbenv, ret, "open");
|
||||
goto shutdown;
|
||||
@@ -160,7 +160,7 @@
|
||||
goto shutdown;
|
||||
}
|
||||
|
||||
- if ((ret = dbp1->open(dbp1, NULL,
|
||||
+ if ((ret = dbp1->open_(dbp1, NULL,
|
||||
argv[0], NULL, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
|
||||
dbenv->err(dbenv, ret, "DB->open: %s", argv[0]);
|
||||
(void)dbp1->close(dbp1, 0);
|
||||
diff -Naur mysql-5.0.45.orig/bdb/dbinc/db.in mysql-5.0.45/bdb/dbinc/db.in
|
||||
--- mysql-5.0.45.orig/bdb/dbinc/db.in 2007-07-04 09:06:33.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/dbinc/db.in 2007-08-02 20:00:58.000000000 -0400
|
||||
@@ -187,10 +187,10 @@
|
||||
* interface specific flags in this range.
|
||||
*
|
||||
* DB_AUTO_COMMIT:
|
||||
- * DB_ENV->set_flags, DB->associate, DB->del, DB->put, DB->open,
|
||||
+ * DB_ENV->set_flags, DB->associate, DB->del, DB->put, DB->open_,
|
||||
* DB->remove, DB->rename, DB->truncate
|
||||
* DB_DIRTY_READ:
|
||||
- * DB->cursor, DB->get, DB->join, DB->open, DBcursor->c_get,
|
||||
+ * DB->cursor, DB->get, DB->join, DB->open_, DBcursor->c_get,
|
||||
* DB_ENV->txn_begin
|
||||
*
|
||||
* Shared flags up to 0x000400 */
|
||||
@@ -208,7 +208,7 @@
|
||||
#define DB_XA_CREATE 0x000001 /* Open in an XA environment. */
|
||||
|
||||
/*
|
||||
- * Flags private to DB_ENV->open.
|
||||
+ * Flags private to DB_ENV->open_.
|
||||
* Shared flags up to 0x000400 */
|
||||
#define DB_INIT_CDB 0x000800 /* Concurrent Access Methods. */
|
||||
#define DB_INIT_LOCK 0x001000 /* Initialize locking. */
|
||||
@@ -222,7 +222,7 @@
|
||||
#define DB_SYSTEM_MEM 0x100000 /* Use system-backed memory. */
|
||||
|
||||
/*
|
||||
- * Flags private to DB->open.
|
||||
+ * Flags private to DB->open_.
|
||||
* Shared flags up to 0x000400 */
|
||||
#define DB_EXCL 0x000800 /* Exclusive open (O_EXCL). */
|
||||
#define DB_FCNTL_LOCKING 0x001000 /* UNDOC: fcntl(2) locking. */
|
||||
@@ -261,7 +261,7 @@
|
||||
#define DB_VERIFY 0x000002 /* Verifying. */
|
||||
|
||||
/*
|
||||
- * Flags private to DB_MPOOLFILE->open.
|
||||
+ * Flags private to DB_MPOOLFILE->open_.
|
||||
* Shared flags up to 0x000400 */
|
||||
#define DB_DIRECT 0x000800 /* Don't buffer the file in the OS. */
|
||||
#define DB_EXTENT 0x001000 /* UNDOC: dealing with an extent. */
|
||||
@@ -614,7 +614,7 @@
|
||||
int (*get) __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, void *));
|
||||
void (*get_fileid) __P((DB_MPOOLFILE *, u_int8_t *));
|
||||
void (*last_pgno) __P((DB_MPOOLFILE *, db_pgno_t *));
|
||||
- int (*open)__P((DB_MPOOLFILE *, const char *, u_int32_t, int, size_t));
|
||||
+ int (*open_)__P((DB_MPOOLFILE *, const char *, u_int32_t, int, size_t));
|
||||
int (*put) __P((DB_MPOOLFILE *, void *, u_int32_t));
|
||||
void (*refcnt) __P((DB_MPOOLFILE *, db_pgno_t *));
|
||||
int (*set) __P((DB_MPOOLFILE *, void *, u_int32_t));
|
||||
@@ -1079,10 +1079,10 @@
|
||||
* Some applications use DB but implement their own locking outside of
|
||||
* DB. If they're using fcntl(2) locking on the underlying database
|
||||
* file, and we open and close a file descriptor for that file, we will
|
||||
- * discard their locks. The DB_FCNTL_LOCKING flag to DB->open is an
|
||||
+ * discard their locks. The DB_FCNTL_LOCKING flag to DB->open_ is an
|
||||
* undocumented interface to support this usage which leaves any file
|
||||
* descriptors we open until DB->close. This will only work with the
|
||||
- * DB->open interface and simple caches, e.g., creating a transaction
|
||||
+ * DB->open_ interface and simple caches, e.g., creating a transaction
|
||||
* thread may open/close file descriptors this flag doesn't protect.
|
||||
* Locking with fcntl(2) on a file that you don't own is a very, very
|
||||
* unsafe thing to do. 'Nuff said.
|
||||
@@ -1186,7 +1186,7 @@
|
||||
int (*join) __P((DB *, DBC **, DBC **, u_int32_t));
|
||||
int (*key_range) __P((DB *,
|
||||
DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
|
||||
- int (*open) __P((DB *, DB_TXN *,
|
||||
+ int (*open_) __P((DB *, DB_TXN *,
|
||||
const char *, const char *, DBTYPE, u_int32_t, int));
|
||||
int (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
|
||||
int (*remove) __P((DB *, const char *, const char *, u_int32_t));
|
||||
@@ -1266,7 +1266,7 @@
|
||||
#define DB_AM_FIXEDLEN 0x00001000 /* Fixed-length records. */
|
||||
#define DB_AM_INMEM 0x00002000 /* In-memory; no sync on close. */
|
||||
#define DB_AM_IN_RENAME 0x00004000 /* File is being renamed. */
|
||||
-#define DB_AM_OPEN_CALLED 0x00008000 /* DB->open called. */
|
||||
+#define DB_AM_OPEN_CALLED 0x00008000 /* DB->open_ called. */
|
||||
#define DB_AM_PAD 0x00010000 /* Fixed-length record pad. */
|
||||
#define DB_AM_PGDEF 0x00020000 /* Page size was defaulted. */
|
||||
#define DB_AM_RDONLY 0x00040000 /* Database is readonly. */
|
||||
@@ -1653,7 +1653,7 @@
|
||||
const char *, const char *, const char *, u_int32_t));
|
||||
void (*err) __P((const DB_ENV *, int, const char *, ...));
|
||||
void (*errx) __P((const DB_ENV *, const char *, ...));
|
||||
- int (*open) __P((DB_ENV *, const char *, u_int32_t, int));
|
||||
+ int (*open_) __P((DB_ENV *, const char *, u_int32_t, int));
|
||||
int (*remove) __P((DB_ENV *, const char *, u_int32_t));
|
||||
int (*set_data_dir) __P((DB_ENV *, const char *));
|
||||
int (*set_alloc) __P((DB_ENV *, void *(*)(size_t),
|
||||
@@ -1777,7 +1777,7 @@
|
||||
#define DB_ENV_NOLOCKING 0x0000200 /* DB_NOLOCKING set. */
|
||||
#define DB_ENV_NOMMAP 0x0000400 /* DB_NOMMAP set. */
|
||||
#define DB_ENV_NOPANIC 0x0000800 /* Okay if panic set. */
|
||||
-#define DB_ENV_OPEN_CALLED 0x0001000 /* DB_ENV->open called. */
|
||||
+#define DB_ENV_OPEN_CALLED 0x0001000 /* DB_ENV->open_ called. */
|
||||
#define DB_ENV_OVERWRITE 0x0002000 /* DB_OVERWRITE set. */
|
||||
#define DB_ENV_PRIVATE 0x0004000 /* DB_PRIVATE set. */
|
||||
#define DB_ENV_REGION_INIT 0x0008000 /* DB_REGION_INIT set. */
|
||||
diff -Naur mysql-5.0.45.orig/bdb/dbm/dbm.c mysql-5.0.45/bdb/dbm/dbm.c
|
||||
--- mysql-5.0.45.orig/bdb/dbm/dbm.c 2007-07-04 09:06:27.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/dbm/dbm.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -240,7 +240,7 @@
|
||||
if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 ||
|
||||
(ret = dbp->set_h_ffactor(dbp, 40)) != 0 ||
|
||||
(ret = dbp->set_h_nelem(dbp, 1)) != 0 ||
|
||||
- (ret = dbp->open(dbp, NULL,
|
||||
+ (ret = dbp->open_(dbp, NULL,
|
||||
path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) {
|
||||
__os_set_errno(ret);
|
||||
return (NULL);
|
||||
diff -Naur mysql-5.0.45.orig/bdb/env/env_method.c mysql-5.0.45/bdb/env/env_method.c
|
||||
--- mysql-5.0.45.orig/bdb/env/env_method.c 2007-07-04 09:05:37.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/env/env_method.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -161,7 +161,7 @@
|
||||
dbenv->close = __dbenv_close;
|
||||
dbenv->dbremove = __dbenv_dbremove;
|
||||
dbenv->dbrename = __dbenv_dbrename;
|
||||
- dbenv->open = __dbenv_open;
|
||||
+ dbenv->open_ = __dbenv_open;
|
||||
dbenv->remove = __dbenv_remove;
|
||||
dbenv->set_alloc = __dbenv_set_alloc;
|
||||
dbenv->set_app_dispatch = __dbenv_set_app_dispatch;
|
||||
diff -Naur mysql-5.0.45.orig/bdb/hsearch/hsearch.c mysql-5.0.45/bdb/hsearch/hsearch.c
|
||||
--- mysql-5.0.45.orig/bdb/hsearch/hsearch.c 2007-07-04 09:05:34.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/hsearch/hsearch.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -84,7 +84,7 @@
|
||||
if ((ret = dbp->set_pagesize(dbp, 512)) != 0 ||
|
||||
(ret = dbp->set_h_ffactor(dbp, 16)) != 0 ||
|
||||
(ret = dbp->set_h_nelem(dbp, (u_int32_t)nel)) != 0 ||
|
||||
- (ret = dbp->open(dbp,
|
||||
+ (ret = dbp->open_(dbp,
|
||||
NULL, NULL, NULL, DB_HASH, DB_CREATE, __db_omode("rw----"))) != 0)
|
||||
__os_set_errno(ret);
|
||||
|
||||
diff -Naur mysql-5.0.45.orig/bdb/mp/mp_fopen.c mysql-5.0.45/bdb/mp/mp_fopen.c
|
||||
--- mysql-5.0.45.orig/bdb/mp/mp_fopen.c 2007-07-04 09:06:04.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/mp/mp_fopen.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -86,7 +86,7 @@
|
||||
dbmfp->get = __memp_fget;
|
||||
dbmfp->get_fileid = __memp_get_fileid;
|
||||
dbmfp->last_pgno = __memp_last_pgno;
|
||||
- dbmfp->open = __memp_fopen;
|
||||
+ dbmfp->open_ = __memp_fopen;
|
||||
dbmfp->put = __memp_fput;
|
||||
dbmfp->refcnt = __memp_refcnt;
|
||||
dbmfp->set = __memp_fset;
|
||||
diff -Naur mysql-5.0.45.orig/bdb/qam/qam_files.c mysql-5.0.45/bdb/qam/qam_files.c
|
||||
--- mysql-5.0.45.orig/bdb/qam/qam_files.c 2007-07-04 09:06:26.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/qam/qam_files.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -207,7 +207,7 @@
|
||||
openflags |= DB_RDONLY;
|
||||
if (F_ISSET(dbenv, DB_ENV_DIRECT_DB))
|
||||
openflags |= DB_DIRECT;
|
||||
- if ((ret = mpf->open(
|
||||
+ if ((ret = mpf->open_(
|
||||
mpf, buf, openflags, qp->mode, dbp->pgsize)) != 0) {
|
||||
array->mpfarray[offset].mpf = NULL;
|
||||
(void)mpf->close(mpf, 0);
|
||||
diff -Naur mysql-5.0.45.orig/bdb/qam/qam_method.c mysql-5.0.45/bdb/qam/qam_method.c
|
||||
--- mysql-5.0.45.orig/bdb/qam/qam_method.c 2007-07-04 09:05:55.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/qam/qam_method.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -260,7 +260,7 @@
|
||||
*/
|
||||
if (txn == NULL)
|
||||
needclose = 1;
|
||||
- if ((ret = tmpdbp->open(tmpdbp,
|
||||
+ if ((ret = tmpdbp->open_(tmpdbp,
|
||||
txn, name, NULL, DB_QUEUE, 0, 0)) != 0)
|
||||
goto err;
|
||||
needclose = 1;
|
||||
@@ -362,7 +362,7 @@
|
||||
/* Copy the incoming locker so we don't self-deadlock. */
|
||||
tmpdbp->lid = dbp->lid;
|
||||
needclose = 1;
|
||||
- if ((ret = tmpdbp->open(tmpdbp, txn, filename, NULL,
|
||||
+ if ((ret = tmpdbp->open_(tmpdbp, txn, filename, NULL,
|
||||
DB_QUEUE, 0, 0)) != 0)
|
||||
goto err;
|
||||
}
|
||||
diff -Naur mysql-5.0.45.orig/bdb/rep/rep_method.c mysql-5.0.45/bdb/rep/rep_method.c
|
||||
--- mysql-5.0.45.orig/bdb/rep/rep_method.c 2007-07-04 09:05:35.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/rep/rep_method.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -327,7 +327,7 @@
|
||||
|
||||
flags = (F_ISSET(dbenv, DB_ENV_THREAD) ? DB_THREAD : 0) |
|
||||
(startup ? DB_CREATE : 0);
|
||||
- if ((ret = dbp->open(dbp, NULL,
|
||||
+ if ((ret = dbp->open_(dbp, NULL,
|
||||
"__db.rep.db", NULL, DB_BTREE, flags, 0)) != 0)
|
||||
goto err;
|
||||
|
||||
diff -Naur mysql-5.0.45.orig/bdb/xa/xa.c mysql-5.0.45/bdb/xa/xa.c
|
||||
--- mysql-5.0.45.orig/bdb/xa/xa.c 2007-07-04 09:06:41.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/xa/xa.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -97,7 +97,7 @@
|
||||
DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN
|
||||
if (db_env_create(&env, 0) != 0)
|
||||
return (XAER_RMERR);
|
||||
- if (env->open(env, xa_info, XA_FLAGS, 0) != 0)
|
||||
+ if (env->open_(env, xa_info, XA_FLAGS, 0) != 0)
|
||||
goto err;
|
||||
|
||||
/* Create the mapping. */
|
||||
diff -Naur mysql-5.0.45.orig/bdb/xa/xa_db.c mysql-5.0.45/bdb/xa/xa_db.c
|
||||
--- mysql-5.0.45.orig/bdb/xa/xa_db.c 2007-07-04 09:06:26.000000000 -0400
|
||||
+++ mysql-5.0.45/bdb/xa/xa_db.c 2007-08-02 20:22:31.000000000 -0400
|
||||
@@ -32,7 +32,7 @@
|
||||
int (*cursor) __P((DB *, DB_TXN *, DBC **, u_int32_t));
|
||||
int (*del) __P((DB *, DB_TXN *, DBT *, u_int32_t));
|
||||
int (*get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
|
||||
- int (*open) __P((DB *, DB_TXN *,
|
||||
+ int (*open_) __P((DB *, DB_TXN *,
|
||||
const char *, const char *, DBTYPE, u_int32_t, int));
|
||||
int (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
|
||||
} XA_METHODS;
|
||||
@@ -58,8 +58,8 @@
|
||||
return (ret);
|
||||
|
||||
dbp->xa_internal = xam;
|
||||
- xam->open = dbp->open;
|
||||
- dbp->open = __xa_open;
|
||||
+ xam->open_ = dbp->open_;
|
||||
+ dbp->open_ = __xa_open;
|
||||
xam->close = dbp->close;
|
||||
dbp->close = __xa_close;
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
xam = (XA_METHODS *)dbp->xa_internal;
|
||||
|
||||
- if ((ret = xam->open(dbp, txn, name, subdb, type, flags, mode)) != 0)
|
||||
+ if ((ret = xam->open_(dbp, txn, name, subdb, type, flags, mode)) != 0)
|
||||
return (ret);
|
||||
|
||||
xam->cursor = dbp->cursor;
|
||||
diff -Naur mysql-5.0.45.orig/sql/ha_berkeley.cc mysql-5.0.45/sql/ha_berkeley.cc
|
||||
--- mysql-5.0.45.orig/sql/ha_berkeley.cc 2007-07-04 09:06:39.000000000 -0400
|
||||
+++ mysql-5.0.45/sql/ha_berkeley.cc 2007-08-02 20:36:06.000000000 -0400
|
||||
@@ -192,7 +192,7 @@
|
||||
if (berkeley_max_lock)
|
||||
db_env->set_lk_max(db_env, berkeley_max_lock);
|
||||
|
||||
- if (db_env->open(db_env,
|
||||
+ if (db_env->open_(db_env,
|
||||
berkeley_home,
|
||||
berkeley_init_flags | DB_INIT_LOCK |
|
||||
DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN |
|
||||
@@ -633,7 +633,7 @@
|
||||
if (!hidden_primary_key)
|
||||
file->app_private= (void*) (table->key_info + table_share->primary_key);
|
||||
if ((error= txn_begin(db_env, 0, (DB_TXN**) &transaction, 0)) ||
|
||||
- (error= (file->open(file, transaction,
|
||||
+ (error= (file->open_(file, transaction,
|
||||
fn_format(name_buff, name, "", ha_berkeley_ext,
|
||||
2 | 4),
|
||||
"main", DB_BTREE, open_mode, 0))) ||
|
||||
@@ -672,7 +672,7 @@
|
||||
(*ptr)->set_flags(*ptr, DB_DUP);
|
||||
}
|
||||
if ((error= txn_begin(db_env, 0, (DB_TXN**) &transaction, 0)) ||
|
||||
- (error=((*ptr)->open(*ptr, transaction, name_buff, part, DB_BTREE,
|
||||
+ (error=((*ptr)->open_(*ptr, transaction, name_buff, part, DB_BTREE,
|
||||
open_mode, 0))) ||
|
||||
(error= transaction->commit(transaction, 0)))
|
||||
{
|
||||
@@ -1996,7 +1996,7 @@
|
||||
if (!(error=db_create(&file, db_env, 0)))
|
||||
{
|
||||
file->set_flags(file, flags);
|
||||
- error=(file->open(file, NULL, table_name, sub_name, type,
|
||||
+ error=(file->open_(file, NULL, table_name, sub_name, type,
|
||||
DB_THREAD | DB_CREATE, my_umask));
|
||||
if (error)
|
||||
{
|
||||
@@ -2052,7 +2052,7 @@
|
||||
DB *status_block;
|
||||
if (!(error=(db_create(&status_block, db_env, 0))))
|
||||
{
|
||||
- if (!(error=(status_block->open(status_block, NULL, name_buff,
|
||||
+ if (!(error=(status_block->open_(status_block, NULL, name_buff,
|
||||
"status", DB_BTREE, DB_CREATE, 0))))
|
||||
{
|
||||
char rec_buff[4+MAX_KEY*4];
|
||||
@@ -2529,7 +2529,7 @@
|
||||
fn_format(name_buff, share->table_name,"", ha_berkeley_ext, 2 | 4);
|
||||
if (!db_create(&share->status_block, db_env, 0))
|
||||
{
|
||||
- if (share->status_block->open(share->status_block, NULL, name_buff,
|
||||
+ if (share->status_block->open_(share->status_block, NULL, name_buff,
|
||||
"status", DB_BTREE, open_mode, 0))
|
||||
{
|
||||
share->status_block->close(share->status_block, 0); /* purecov: inspected */
|
||||
@@ -2606,7 +2606,7 @@
|
||||
if (db_create(&share->status_block, db_env, 0)) /* purecov: inspected */
|
||||
goto end; /* purecov: inspected */
|
||||
share->status_block->set_flags(share->status_block,0); /* purecov: inspected */
|
||||
- if (share->status_block->open(share->status_block, NULL,
|
||||
+ if (share->status_block->open_(share->status_block, NULL,
|
||||
fn_format(name_buff,share->table_name,"",
|
||||
ha_berkeley_ext,2 | 4),
|
||||
"status", DB_BTREE,
|
||||
34
mysql-bogus-ssl-test.patch
Normal file
34
mysql-bogus-ssl-test.patch
Normal file
@ -0,0 +1,34 @@
|
||||
AFAICT this test is simply guaranteed to fail if run with SSL connections
|
||||
enabled. Remove the part that depends on the SSL connection history.
|
||||
|
||||
|
||||
diff -Naur mysql-5.1.30.orig/mysql-test/r/openssl_1.result mysql-5.1.30/mysql-test/r/openssl_1.result
|
||||
--- mysql-5.1.30.orig/mysql-test/r/openssl_1.result 2008-11-14 12:30:53.000000000 -0500
|
||||
+++ mysql-5.1.30/mysql-test/r/openssl_1.result 2009-01-13 12:57:01.000000000 -0500
|
||||
@@ -68,12 +68,10 @@
|
||||
CREATE TABLE thread_status
|
||||
SELECT variable_name, variable_value
|
||||
FROM information_schema.session_status
|
||||
-WHERE variable_name LIKE 'SSL_ACCEPTS' OR
|
||||
-variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||||
+WHERE variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||||
END$$
|
||||
SELECT variable_name, variable_value FROM thread_status;
|
||||
variable_name variable_value
|
||||
-SSL_ACCEPTS 0
|
||||
SSL_CALLBACK_CACHE_HITS 0
|
||||
DROP TABLE thread_status;
|
||||
SET GLOBAL event_scheduler=0;
|
||||
diff -Naur mysql-5.1.30.orig/mysql-test/t/openssl_1.test mysql-5.1.30/mysql-test/t/openssl_1.test
|
||||
--- mysql-5.1.30.orig/mysql-test/t/openssl_1.test 2008-11-14 12:30:15.000000000 -0500
|
||||
+++ mysql-5.1.30/mysql-test/t/openssl_1.test 2009-01-13 12:56:42.000000000 -0500
|
||||
@@ -136,8 +136,7 @@
|
||||
CREATE TABLE thread_status
|
||||
SELECT variable_name, variable_value
|
||||
FROM information_schema.session_status
|
||||
- WHERE variable_name LIKE 'SSL_ACCEPTS' OR
|
||||
- variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||||
+ WHERE variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||||
END$$
|
||||
|
||||
DELIMITER ;$$
|
||||
26
mysql-embedded-check.c
Normal file
26
mysql-embedded-check.c
Normal file
@ -0,0 +1,26 @@
|
||||
/* simple test program to see if we can link the embedded server library */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "mysql.h"
|
||||
|
||||
MYSQL *mysql;
|
||||
|
||||
static char *server_options[] = \
|
||||
{ "mysql_test", "--defaults-file=my.cnf", NULL };
|
||||
int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
|
||||
|
||||
static char *server_groups[] = { "libmysqld_server",
|
||||
"libmysqld_client", NULL };
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
mysql_library_init(num_elements, server_options, server_groups);
|
||||
mysql = mysql_init(NULL);
|
||||
mysql_close(mysql);
|
||||
mysql_library_end();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
"extern int errno" is just a really bad idea.
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.67.orig/include/my_sys.h mysql-5.0.67/include/my_sys.h
|
||||
--- mysql-5.0.67.orig/include/my_sys.h 2008-08-04 08:19:12.000000000 -0400
|
||||
+++ mysql-5.0.67/include/my_sys.h 2008-08-23 14:39:08.000000000 -0400
|
||||
@@ -208,13 +208,8 @@
|
||||
#endif
|
||||
#endif /* MSDOS */
|
||||
diff -Naur mysql-5.1.30.orig/include/my_sys.h mysql-5.1.30/include/my_sys.h
|
||||
--- mysql-5.1.30.orig/include/my_sys.h 2008-11-14 11:34:35.000000000 -0500
|
||||
+++ mysql-5.1.30/include/my_sys.h 2009-01-13 11:04:15.000000000 -0500
|
||||
@@ -201,13 +201,8 @@
|
||||
#define my_afree(PTR) my_free(PTR,MYF(MY_WME))
|
||||
#endif /* HAVE_ALLOCA */
|
||||
|
||||
-#ifndef errno /* did we already get it? */
|
||||
-#ifdef HAVE_ERRNO_AS_DEFINE
|
||||
|
||||
@ -4,9 +4,9 @@ like /usr/share/mysql-test, we have to hack up the paths in install_test_db.
|
||||
This patch also improves the documentation a tad.
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.67.orig/mysql-test/README mysql-5.0.67/mysql-test/README
|
||||
--- mysql-5.0.67.orig/mysql-test/README 2008-08-04 08:19:20.000000000 -0400
|
||||
+++ mysql-5.0.67/mysql-test/README 2008-08-23 16:25:14.000000000 -0400
|
||||
diff -Naur mysql-5.1.30.orig/mysql-test/README mysql-5.1.30/mysql-test/README
|
||||
--- mysql-5.1.30.orig/mysql-test/README 2008-11-14 11:34:38.000000000 -0500
|
||||
+++ mysql-5.1.30/mysql-test/README 2009-01-13 11:30:00.000000000 -0500
|
||||
@@ -6,6 +6,19 @@
|
||||
actually have a co-existing MySQL installation. The tests will not
|
||||
conflict with it.
|
||||
@ -37,9 +37,9 @@ diff -Naur mysql-5.0.67.orig/mysql-test/README mysql-5.0.67/mysql-test/README
|
||||
|
||||
|
||||
You can create your own test cases. To create a test case, create a new
|
||||
diff -Naur mysql-5.0.67.orig/mysql-test/install_test_db.sh mysql-5.0.67/mysql-test/install_test_db.sh
|
||||
--- mysql-5.0.67.orig/mysql-test/install_test_db.sh 2008-08-04 08:19:21.000000000 -0400
|
||||
+++ mysql-5.0.67/mysql-test/install_test_db.sh 2008-08-23 16:21:59.000000000 -0400
|
||||
diff -Naur mysql-5.1.30.orig/mysql-test/install_test_db.sh mysql-5.1.30/mysql-test/install_test_db.sh
|
||||
--- mysql-5.1.30.orig/mysql-test/install_test_db.sh 2008-11-14 11:34:47.000000000 -0500
|
||||
+++ mysql-5.1.30/mysql-test/install_test_db.sh 2009-01-13 11:30:00.000000000 -0500
|
||||
@@ -26,18 +26,15 @@
|
||||
libexecdir=../libexec
|
||||
|
||||
@ -65,7 +65,7 @@ diff -Naur mysql-5.0.67.orig/mysql-test/install_test_db.sh mysql-5.0.67/mysql-te
|
||||
fix_bin=mysql-test
|
||||
else
|
||||
execdir=../sql
|
||||
@@ -97,7 +94,8 @@
|
||||
@@ -96,7 +93,8 @@
|
||||
|
||||
#for error messages
|
||||
if [ x$BINARY_DIST = x1 ] ; then
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur mysql-5.0.28.orig/scripts/mysql_config.sh mysql-5.0.28/scripts/mysql_config.sh
|
||||
--- mysql-5.0.28.orig/scripts/mysql_config.sh 2006-10-24 17:04:01.000000000 -0400
|
||||
+++ mysql-5.0.28/scripts/mysql_config.sh 2006-11-29 17:36:42.000000000 -0500
|
||||
@@ -86,7 +86,6 @@
|
||||
# If installed, search for the compiled in directory first (might be "lib64")
|
||||
pkglibdir='@pkglibdir@'
|
||||
pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
|
||||
-fix_path pkglibdir $pkglibdir_rel lib/mysql lib
|
||||
|
||||
pkgincludedir='@pkgincludedir@'
|
||||
fix_path pkgincludedir include/mysql include
|
||||
@ -1,58 +0,0 @@
|
||||
The idea of userland using <asm/atomic.h> has our kernel hackers all bent
|
||||
out of shape, so don't do it. Suppressing this has another benefit too,
|
||||
which is we avoid the 4-vs-8-byte problem in BDB that formerly required
|
||||
mysql-threads.patch.
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.28.orig/configure.in mysql-5.0.28/configure.in
|
||||
--- mysql-5.0.28.orig/configure.in 2006-10-24 17:03:51.000000000 -0400
|
||||
+++ mysql-5.0.28/configure.in 2006-11-29 17:39:39.000000000 -0500
|
||||
@@ -814,48 +814,6 @@
|
||||
AC_SUBST(WRAPLIBS)
|
||||
|
||||
if test "$TARGET_LINUX" = "true"; then
|
||||
- AC_MSG_CHECKING([for atomic operations])
|
||||
-
|
||||
- AC_LANG_SAVE
|
||||
- AC_LANG_CPLUSPLUS
|
||||
-
|
||||
- atom_ops=
|
||||
- AC_TRY_RUN([
|
||||
-#include <asm/atomic.h>
|
||||
-int main()
|
||||
-{
|
||||
- atomic_t v;
|
||||
-
|
||||
- atomic_set(&v, 23);
|
||||
- atomic_add(5, &v);
|
||||
- return atomic_read(&v) == 28 ? 0 : -1;
|
||||
-}
|
||||
- ],
|
||||
- [AC_DEFINE([HAVE_ATOMIC_ADD], [1],
|
||||
- [atomic_add() from <asm/atomic.h> (Linux only)])
|
||||
- atom_ops="${atom_ops}atomic_add "],
|
||||
- )
|
||||
- AC_TRY_RUN([
|
||||
-#include <asm/atomic.h>
|
||||
-int main()
|
||||
-{
|
||||
- atomic_t v;
|
||||
-
|
||||
- atomic_set(&v, 23);
|
||||
- atomic_sub(5, &v);
|
||||
- return atomic_read(&v) == 18 ? 0 : -1;
|
||||
-}
|
||||
- ],
|
||||
- [AC_DEFINE([HAVE_ATOMIC_SUB], [1],
|
||||
- [atomic_sub() from <asm/atomic.h> (Linux only)])
|
||||
- atom_ops="${atom_ops}atomic_sub "],
|
||||
- )
|
||||
-
|
||||
- if test -z "$atom_ops"; then atom_ops="no"; fi
|
||||
- AC_MSG_RESULT($atom_ops)
|
||||
-
|
||||
- AC_LANG_RESTORE
|
||||
-
|
||||
AC_ARG_WITH(pstack,
|
||||
[ --with-pstack Use the pstack backtrace library],
|
||||
[ USE_PSTACK=$withval ],
|
||||
@ -1,17 +0,0 @@
|
||||
Don't build the dbug manual. We aren't going to install it anyway, so
|
||||
there's no need to do so. Attempting to build it causes crashes if one
|
||||
has built with -DDBUG_OFF, as we do by default. Per bug #437053.
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.51a.orig/dbug/Makefile.am mysql-5.0.51a/dbug/Makefile.am
|
||||
--- mysql-5.0.51a.orig/dbug/Makefile.am 2008-01-11 09:43:29.000000000 -0500
|
||||
+++ mysql-5.0.51a/dbug/Makefile.am 2008-07-27 12:21:56.000000000 -0400
|
||||
@@ -35,7 +35,7 @@
|
||||
factorial_SOURCES = my_main.c factorial.c
|
||||
dbug_analyze_SOURCES = dbug_analyze.c
|
||||
|
||||
-all: user.t user.ps
|
||||
+all:
|
||||
|
||||
user.t: user.r $(NROFF_INC)
|
||||
-nroff -mm user.r > $@
|
||||
13
mysql-plugin-bug.patch
Normal file
13
mysql-plugin-bug.patch
Normal file
@ -0,0 +1,13 @@
|
||||
The plugins stuff has got obscure problems on PPC64 ... figure it out
|
||||
another day ...
|
||||
|
||||
|
||||
diff -Naur mysql-5.1.30.orig/mysql-test/t/disabled.def mysql-5.1.30/mysql-test/t/disabled.def
|
||||
--- mysql-5.1.30.orig/mysql-test/t/disabled.def 2008-11-14 12:30:00.000000000 -0500
|
||||
+++ mysql-5.1.30/mysql-test/t/disabled.def 2009-01-14 01:15:24.000000000 -0500
|
||||
@@ -15,3 +15,5 @@
|
||||
log_tables.test : Bug #37798: main.log_tables fails randomly on powermacg5 and windows
|
||||
slow_query_log_func.test : Bug #37962: *_func tests containing sleeps/race conditions
|
||||
events-bugs.test : Bug #39848, Bug #39863, Bug #39569, Bug #37774
|
||||
+#
|
||||
+plugin_load : gives wrong answer on PPC64
|
||||
@ -1,24 +0,0 @@
|
||||
This patch improves the stability of the mysql regression tests on Red Hat's
|
||||
build servers. I really have no idea why ... it is probably masking a
|
||||
bug in mysqld, but without a better handle on how to reproduce the problem,
|
||||
it's tough to make a bug report. Worth noting is that rpl000001 passes
|
||||
fine when run by itself, or with the immediately preceding tests; but fails
|
||||
when the complete test series is run.
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.18.orig/mysql-test/r/rpl000001.result mysql-5.0.18/mysql-test/r/rpl000001.result
|
||||
--- mysql-5.0.18.orig/mysql-test/r/rpl000001.result 2005-12-21 14:50:25.000000000 -0500
|
||||
+++ mysql-5.0.18/mysql-test/r/rpl000001.result 2006-01-05 01:57:17.000000000 -0500
|
||||
@@ -1,3 +1,4 @@
|
||||
+flush privileges;
|
||||
stop slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
reset master;
|
||||
diff -Naur mysql-5.0.18.orig/mysql-test/t/rpl000001.test mysql-5.0.18/mysql-test/t/rpl000001.test
|
||||
--- mysql-5.0.18.orig/mysql-test/t/rpl000001.test 2005-12-21 14:50:25.000000000 -0500
|
||||
+++ mysql-5.0.18/mysql-test/t/rpl000001.test 2006-01-05 01:57:15.000000000 -0500
|
||||
@@ -1,3 +1,4 @@
|
||||
+flush privileges;
|
||||
source include/master-slave.inc;
|
||||
|
||||
create table t1 (word char(20) not null);
|
||||
@ -1,25 +0,0 @@
|
||||
diff -Naur mysql-5.0.15.orig/mysql-test/r/rpl_ddl.result mysql-5.0.15/mysql-test/r/rpl_ddl.result
|
||||
--- mysql-5.0.15.orig/mysql-test/r/rpl_ddl.result 2005-10-16 21:37:08.000000000 -0400
|
||||
+++ mysql-5.0.15/mysql-test/r/rpl_ddl.result 2005-11-03 17:28:30.000000000 -0500
|
||||
@@ -1688,6 +1688,7 @@
|
||||
-------- switch to slave -------
|
||||
SELECT user FROM mysql.user WHERE user = 'rename1';
|
||||
user
|
||||
+flush privileges;
|
||||
DROP DATABASE IF EXISTS mysqltest1;
|
||||
DROP DATABASE IF EXISTS mysqltest2;
|
||||
DROP DATABASE IF EXISTS mysqltest3;
|
||||
diff -Naur mysql-5.0.15.orig/mysql-test/t/rpl_ddl.test mysql-5.0.15/mysql-test/t/rpl_ddl.test
|
||||
--- mysql-5.0.15.orig/mysql-test/t/rpl_ddl.test 2005-10-16 21:37:08.000000000 -0400
|
||||
+++ mysql-5.0.15/mysql-test/t/rpl_ddl.test 2005-11-03 17:28:28.000000000 -0500
|
||||
@@ -498,6 +498,10 @@
|
||||
SELECT user FROM mysql.user WHERE user = 'rename1';
|
||||
connection master;
|
||||
|
||||
+# Needed to avoid failure in next test on some platforms ...
|
||||
+# this probably indicates an underlying MySQL bug ...
|
||||
+flush privileges;
|
||||
+
|
||||
###############################################################
|
||||
# Cleanup
|
||||
###############################################################
|
||||
20
mysql-ssl-multilib.patch
Normal file
20
mysql-ssl-multilib.patch
Normal file
@ -0,0 +1,20 @@
|
||||
We can do without -L/usr/lib/, especially in 64-bit builds ...
|
||||
|
||||
|
||||
diff -Naur mysql-5.1.30.orig/config/ac-macros/ssl.m4 mysql-5.1.30/config/ac-macros/ssl.m4
|
||||
--- mysql-5.1.30.orig/config/ac-macros/ssl.m4 2008-11-14 11:34:23.000000000 -0500
|
||||
+++ mysql-5.1.30/config/ac-macros/ssl.m4 2009-01-13 19:17:09.000000000 -0500
|
||||
@@ -102,7 +102,12 @@
|
||||
#
|
||||
# Try to link with openSSL libs in <location>
|
||||
#
|
||||
- openssl_libs="-L$location/lib/ -lssl -lcrypto"
|
||||
+ if test "$location" != "/usr"
|
||||
+ then
|
||||
+ openssl_libs="-L$location/lib/ -lssl -lcrypto"
|
||||
+ else
|
||||
+ openssl_libs="-lssl -lcrypto"
|
||||
+ fi
|
||||
MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
|
||||
|
||||
if test "$mysql_ssl_found" == "no"
|
||||
@ -8,13 +8,13 @@ mysqld.cc; is it important to fix any of the others?
|
||||
Filed upstream at http://bugs.mysql.com/bug.php?id=35019
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc
|
||||
--- mysql-5.0.45.orig/sql/mysqld.cc 2007-07-04 09:06:03.000000000 -0400
|
||||
+++ mysql-5.0.45/sql/mysqld.cc 2008-03-03 17:16:25.000000000 -0500
|
||||
@@ -2281,6 +2281,68 @@
|
||||
DBUG_VOID_RETURN;
|
||||
diff -Naur mysql-5.1.30.orig/sql/mysqld.cc mysql-5.1.30/sql/mysqld.cc
|
||||
--- mysql-5.1.30.orig/sql/mysqld.cc 2008-11-14 11:37:13.000000000 -0500
|
||||
+++ mysql-5.1.30/sql/mysqld.cc 2009-01-13 12:08:35.000000000 -0500
|
||||
@@ -2602,6 +2602,70 @@
|
||||
}
|
||||
|
||||
|
||||
+/* pthread_attr_setstacksize without so much platform-dependency */
|
||||
+/* returns the actual stack size if possible */
|
||||
+static size_t my_setstacksize(pthread_attr_t *attr, size_t stacksize)
|
||||
@ -77,10 +77,12 @@ diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc
|
||||
+#endif
|
||||
+ return stacksize;
|
||||
+}
|
||||
|
||||
+
|
||||
+
|
||||
static void start_signal_handler(void)
|
||||
{
|
||||
@@ -2294,15 +2356,7 @@
|
||||
int error;
|
||||
@@ -2614,15 +2678,7 @@
|
||||
(void) pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
|
||||
if (!(opt_specialflag & SPECIAL_NO_PRIOR))
|
||||
my_pthread_attr_setprio(&thr_attr,INTERRUPT_PRIOR);
|
||||
@ -89,15 +91,15 @@ diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc
|
||||
- Peculiar things with ia64 platforms - it seems we only have half the
|
||||
- stack size in reality, so we have to double it here
|
||||
- */
|
||||
- pthread_attr_setstacksize(&thr_attr,thread_stack*2);
|
||||
- pthread_attr_setstacksize(&thr_attr,my_thread_stack_size*2);
|
||||
-#else
|
||||
- pthread_attr_setstacksize(&thr_attr,thread_stack);
|
||||
- pthread_attr_setstacksize(&thr_attr,my_thread_stack_size);
|
||||
-#endif
|
||||
+ (void) my_setstacksize(&thr_attr,thread_stack);
|
||||
+ (void) my_setstacksize(&thr_attr,my_thread_stack_size);
|
||||
#endif
|
||||
|
||||
(void) pthread_mutex_lock(&LOCK_thread_count);
|
||||
@@ -3499,41 +3553,12 @@
|
||||
@@ -4176,40 +4232,12 @@
|
||||
init_signals();
|
||||
if (!(opt_specialflag & SPECIAL_NO_PRIOR))
|
||||
my_pthread_setprio(pthread_self(),CONNECT_PRIOR);
|
||||
@ -106,9 +108,9 @@ diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc
|
||||
- Peculiar things with ia64 platforms - it seems we only have half the
|
||||
- stack size in reality, so we have to double it here
|
||||
- */
|
||||
- pthread_attr_setstacksize(&connection_attrib,thread_stack*2);
|
||||
- pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size*2);
|
||||
-#else
|
||||
- pthread_attr_setstacksize(&connection_attrib,thread_stack);
|
||||
- pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size);
|
||||
-#endif
|
||||
-#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
|
||||
- {
|
||||
@ -119,15 +121,15 @@ diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc
|
||||
- stack_size/= 2;
|
||||
-#endif
|
||||
- /* We must check if stack_size = 0 as Solaris 2.9 can return 0 here */
|
||||
- if (stack_size && stack_size < thread_stack)
|
||||
- if (stack_size && stack_size < my_thread_stack_size)
|
||||
- {
|
||||
- if (global_system_variables.log_warnings)
|
||||
- sql_print_warning("Asked for %lu thread stack, but got %ld",
|
||||
- thread_stack, (long) stack_size);
|
||||
- my_thread_stack_size, (long) stack_size);
|
||||
-#if defined(__ia64__) || defined(__ia64)
|
||||
- thread_stack= stack_size*2;
|
||||
- my_thread_stack_size= stack_size*2;
|
||||
-#else
|
||||
- thread_stack= stack_size;
|
||||
- my_thread_stack_size= stack_size;
|
||||
-#endif
|
||||
- }
|
||||
- }
|
||||
@ -135,10 +137,9 @@ diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc
|
||||
+
|
||||
#ifdef __NETWARE__
|
||||
/* Increasing stacksize of threads on NetWare */
|
||||
-
|
||||
pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE);
|
||||
+#else
|
||||
+ thread_stack = my_setstacksize(&connection_attrib,thread_stack);
|
||||
+ my_thread_stack_size = my_setstacksize(&connection_attrib,my_thread_stack_size);
|
||||
#endif
|
||||
|
||||
(void) thr_setconcurrency(concurrency); // 10 by default
|
||||
|
||||
@ -9,15 +9,15 @@ to provide some headroom, which means that its value can't be raised too much
|
||||
further without increasing the latter as well.
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.45.orig/sql/mysql_priv.h mysql-5.0.45/sql/mysql_priv.h
|
||||
--- mysql-5.0.45.orig/sql/mysql_priv.h 2007-07-04 09:06:41.000000000 -0400
|
||||
+++ mysql-5.0.45/sql/mysql_priv.h 2008-01-08 17:32:22.000000000 -0500
|
||||
@@ -173,7 +173,7 @@
|
||||
diff -Naur mysql-5.1.30.orig/sql/mysql_priv.h mysql-5.1.30/sql/mysql_priv.h
|
||||
--- mysql-5.1.30.orig/sql/mysql_priv.h 2008-11-14 11:37:13.000000000 -0500
|
||||
+++ mysql-5.1.30/sql/mysql_priv.h 2009-01-13 11:07:35.000000000 -0500
|
||||
@@ -286,7 +286,7 @@
|
||||
Feel free to raise this by the smallest amount you can to get the
|
||||
"execution_constants" test to pass.
|
||||
*/
|
||||
-#define STACK_MIN_SIZE 12000 // Abort if less stack during eval.
|
||||
+#define STACK_MIN_SIZE 16384 // Abort if less stack during eval.
|
||||
-#define STACK_MIN_SIZE 12000 ///< Abort if less stack during eval.
|
||||
+#define STACK_MIN_SIZE 16384 ///< Abort if less stack during eval.
|
||||
|
||||
#define STACK_MIN_SIZE_FOR_OPEN 1024*80
|
||||
#define STACK_BUFF_ALLOC 352 // For stack overrun checks
|
||||
#define STACK_BUFF_ALLOC 352 ///< For stack overrun checks
|
||||
|
||||
@ -5,30 +5,22 @@ Also, tweak the Perl test script so that the mysqld daemon gets detached
|
||||
from the calling terminal session. Without this, the ssl_des test hangs up
|
||||
because OpenSSL tries to read a PEM key from /dev/tty.
|
||||
|
||||
Also, tweak the Perl test script to find some files where we install them;
|
||||
without this, the build-time test works but the mysql-test RPM doesn't.
|
||||
|
||||
|
||||
diff -Naur mysql-5.0.67.orig/Makefile.am mysql-5.0.67/Makefile.am
|
||||
--- mysql-5.0.67.orig/Makefile.am 2008-08-04 08:18:47.000000000 -0400
|
||||
+++ mysql-5.0.67/Makefile.am 2008-08-23 13:49:56.000000000 -0400
|
||||
@@ -127,11 +127,11 @@
|
||||
|
||||
test-ps:
|
||||
cd mysql-test ; \
|
||||
- @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol
|
||||
+ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --ps-protocol
|
||||
diff -Naur mysql-5.1.30.orig/Makefile.am mysql-5.1.30/Makefile.am
|
||||
--- mysql-5.1.30.orig/Makefile.am 2008-11-14 11:34:15.000000000 -0500
|
||||
+++ mysql-5.1.30/Makefile.am 2009-01-13 11:13:12.000000000 -0500
|
||||
@@ -98,7 +98,7 @@
|
||||
|
||||
test-ns:
|
||||
cd mysql-test ; \
|
||||
- @PERL@ ./mysql-test-run.pl $(force) $(mem)
|
||||
+ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl
|
||||
- @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
|
||||
+ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed
|
||||
|
||||
test: test-ns test-ps
|
||||
|
||||
diff -Naur mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl mysql-5.0.67/mysql-test/lib/mtr_process.pl
|
||||
--- mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl 2008-08-04 08:32:17.000000000 -0400
|
||||
+++ mysql-5.0.67/mysql-test/lib/mtr_process.pl 2008-08-23 13:48:23.000000000 -0400
|
||||
test-binlog-statement:
|
||||
cd mysql-test ; \
|
||||
diff -Naur mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl mysql-5.1.30/mysql-test/lib/mtr_process.pl
|
||||
--- mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl 2008-11-14 12:31:10.000000000 -0500
|
||||
+++ mysql-5.1.30/mysql-test/lib/mtr_process.pl 2009-01-13 11:14:25.000000000 -0500
|
||||
@@ -150,6 +150,9 @@
|
||||
{
|
||||
# Child, redirect output and exec
|
||||
@ -39,38 +31,10 @@ diff -Naur mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl mysql-5.0.67/mysql-te
|
||||
$SIG{INT}= 'DEFAULT'; # Parent do some stuff, we don't
|
||||
|
||||
my $log_file_open_mode = '>';
|
||||
diff -Naur mysql-5.0.67.orig/mysql-test/mysql-test-run.pl mysql-5.0.67/mysql-test/mysql-test-run.pl
|
||||
--- mysql-5.0.67.orig/mysql-test/mysql-test-run.pl 2008-08-04 08:19:21.000000000 -0400
|
||||
+++ mysql-5.0.67/mysql-test/mysql-test-run.pl 2008-08-23 13:48:23.000000000 -0400
|
||||
@@ -1510,13 +1510,15 @@
|
||||
|
||||
$exe_ndbd=
|
||||
mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd",
|
||||
- "$ndb_path/ndbd");
|
||||
+ "$ndb_path/ndbd",
|
||||
+ "/usr/libexec/ndbd");
|
||||
$exe_ndb_mgm=
|
||||
mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm",
|
||||
"$ndb_path/ndb_mgm");
|
||||
$exe_ndb_mgmd=
|
||||
mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd",
|
||||
- "$ndb_path/ndb_mgmd");
|
||||
+ "$ndb_path/ndb_mgmd",
|
||||
+ "/usr/libexec/ndb_mgmd");
|
||||
$exe_ndb_waiter=
|
||||
mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter",
|
||||
"$ndb_path/ndb_waiter");
|
||||
@@ -1617,7 +1619,8 @@
|
||||
# Look for mysql_fix_privilege_tables.sql script
|
||||
$file_mysql_fix_privilege_tables=
|
||||
mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql",
|
||||
- "$glob_basedir/share/mysql_fix_privilege_tables.sql");
|
||||
+ "$glob_basedir/share/mysql_fix_privilege_tables.sql",
|
||||
+ "$path_share/mysql_fix_privilege_tables.sql");
|
||||
|
||||
if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) {
|
||||
mtr_warning("Could not find all required ndb binaries, " .
|
||||
@@ -4094,7 +4097,7 @@
|
||||
diff -Naur mysql-5.1.30.orig/mysql-test/mysql-test-run.pl mysql-5.1.30/mysql-test/mysql-test-run.pl
|
||||
--- mysql-5.1.30.orig/mysql-test/mysql-test-run.pl 2008-11-14 11:34:48.000000000 -0500
|
||||
+++ mysql-5.1.30/mysql-test/mysql-test-run.pl 2009-01-13 11:17:52.000000000 -0500
|
||||
@@ -4204,7 +4204,7 @@
|
||||
|
||||
if ( defined $exe )
|
||||
{
|
||||
|
||||
88
mysql.spec
88
mysql.spec
@ -1,6 +1,6 @@
|
||||
Name: mysql
|
||||
Version: 5.0.67
|
||||
Release: 2%{?dist}
|
||||
Version: 5.1.30
|
||||
Release: 1%{?dist}
|
||||
Summary: MySQL client programs and shared libraries
|
||||
Group: Applications/Databases
|
||||
URL: http://www.mysql.com
|
||||
@ -11,7 +11,7 @@ License: GPLv2 with exceptions
|
||||
# Regression tests take a long time, you can skip 'em with this
|
||||
%{!?runselftest:%define runselftest 1}
|
||||
|
||||
Source0: http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-%{version}.tar.gz
|
||||
Source0: http://dev.mysql.com/get/Downloads/MySQL-5.1/mysql-%{version}.tar.gz
|
||||
Source1: mysql.init
|
||||
Source3: my.cnf
|
||||
Source4: scriptstub.c
|
||||
@ -19,20 +19,18 @@ Source5: my_config.h
|
||||
Source6: ndbd.init
|
||||
Source7: ndb_mgmd.init
|
||||
Source8: ndb_types.h
|
||||
Source9: mysql-embedded-check.c
|
||||
# Working around perl dependency checking bug in rpm FTTB. Remove later.
|
||||
Source999: filter-requires-mysql.sh
|
||||
Patch1: mysql-libdir.patch
|
||||
Source999: filter-requires-mysql.sh
|
||||
|
||||
Patch1: mysql-ssl-multilib.patch
|
||||
Patch2: mysql-errno.patch
|
||||
Patch3: mysql-stack.patch
|
||||
Patch4: mysql-testing.patch
|
||||
Patch5: mysql-no-atomic.patch
|
||||
Patch6: mysql-rpl_ddl.patch
|
||||
Patch7: mysql-rpl-test.patch
|
||||
Patch8: mysql-install-test.patch
|
||||
Patch9: mysql-bdb-link.patch
|
||||
Patch10: mysql-bdb-open.patch
|
||||
Patch13: mysql-no-dbug.patch
|
||||
Patch15: mysql-stack-guard.patch
|
||||
Patch5: mysql-install-test.patch
|
||||
Patch6: mysql-stack-guard.patch
|
||||
Patch7: mysql-bogus-ssl-test.patch
|
||||
Patch8: mysql-plugin-bug.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: gperf, perl, readline-devel, openssl-devel
|
||||
@ -43,7 +41,7 @@ BuildRequires: time procps
|
||||
# Socket is needed to run regression tests
|
||||
BuildRequires: perl(Socket)
|
||||
|
||||
Prereq: /sbin/install-info, grep, fileutils
|
||||
Requires: /sbin/install-info, grep, fileutils
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires: bash
|
||||
Conflicts: MySQL
|
||||
@ -62,7 +60,7 @@ contains the standard MySQL client programs and generic MySQL files.
|
||||
|
||||
Summary: The shared libraries required for MySQL clients
|
||||
Group: Applications/Databases
|
||||
Prereq: /sbin/ldconfig
|
||||
Requires: /sbin/ldconfig
|
||||
|
||||
%description libs
|
||||
The mysql-libs package provides the essential shared libraries for any
|
||||
@ -74,7 +72,7 @@ MySQL server.
|
||||
|
||||
Summary: The MySQL server and related files
|
||||
Group: Applications/Databases
|
||||
Prereq: /sbin/chkconfig, /usr/sbin/useradd
|
||||
Requires: /sbin/chkconfig, /usr/sbin/useradd
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: sh-utils
|
||||
# mysqlhotcopy needs DBI/DBD support
|
||||
@ -174,10 +172,6 @@ the MySQL sources.
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch13 -p1
|
||||
%patch15 -p1
|
||||
|
||||
libtoolize --force
|
||||
aclocal
|
||||
@ -192,12 +186,15 @@ CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
|
||||
CFLAGS="$CFLAGS -fno-strict-aliasing -fwrapv"
|
||||
# force PIC mode so that we can build libmysqld.so
|
||||
CFLAGS="$CFLAGS -fPIC"
|
||||
CXXFLAGS="$CFLAGS -fno-rtti -fno-exceptions"
|
||||
# extra C++ flags as per recommendations in mysql's INSTALL-SOURCE doc
|
||||
CXXFLAGS="$CFLAGS -felide-constructors -fno-rtti -fno-exceptions"
|
||||
export CFLAGS CXXFLAGS
|
||||
|
||||
# mysql 5.1.30 fails regression tests on x86 unless we use --with-big-tables,
|
||||
# suggesting that upstream doesn't bother to test the other case ...
|
||||
%configure \
|
||||
--with-readline \
|
||||
--with-openssl \
|
||||
--with-ssl=/usr \
|
||||
--without-debug \
|
||||
--enable-shared \
|
||||
--with-bench \
|
||||
@ -206,9 +203,9 @@ export CFLAGS CXXFLAGS
|
||||
--with-unix-socket-path=/var/lib/mysql/mysql.sock \
|
||||
--with-mysqld-user="mysql" \
|
||||
--with-extra-charsets=all \
|
||||
--with-big-tables \
|
||||
--with-innodb \
|
||||
--with-ndbcluster \
|
||||
--with-berkeley-db \
|
||||
--enable-local-infile \
|
||||
--enable-largefile \
|
||||
--enable-thread-safe-client \
|
||||
@ -226,10 +223,14 @@ mkdir libmysqld/work
|
||||
cd libmysqld/work
|
||||
ar -x ../libmysqld.a
|
||||
gcc -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 *.o \
|
||||
../../bdb/build_unix/libdb.a -lpthread -lcrypt -lnsl -lssl -lcrypto -lrt -lstdc++ -lm -lc
|
||||
-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
|
||||
# this is to check that we built a complete library
|
||||
cp %{SOURCE9} .
|
||||
ln -s libmysqld.so.0.0.1 libmysqld.so.0
|
||||
gcc -I../../include mysql-embedded-check.c libmysqld.so.0
|
||||
LD_LIBRARY_PATH=. ldd ./a.out
|
||||
cd ../..
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%if %runselftest
|
||||
@ -244,7 +245,9 @@ make check
|
||||
esac
|
||||
export MTR_BUILD_THREAD
|
||||
|
||||
make test
|
||||
# note: "make test" invokes two largely-duplicate sets of tests,
|
||||
# which makes the runtime really unacceptably long ...
|
||||
make test-ns
|
||||
%endif
|
||||
|
||||
%install
|
||||
@ -258,8 +261,8 @@ case `uname -i` in
|
||||
i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 )
|
||||
mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
|
||||
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
|
||||
mv $RPM_BUILD_ROOT/usr/include/mysql/ndb/ndb_types.h $RPM_BUILD_ROOT/usr/include/mysql/ndb/ndb_types_`uname -i`.h
|
||||
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/include/mysql/ndb/
|
||||
mv $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types.h $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types_`uname -i`.h
|
||||
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
@ -303,6 +306,8 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_bin_dist.1*
|
||||
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_src_distribution.1*
|
||||
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la
|
||||
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libndbclient.la
|
||||
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.la
|
||||
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.a
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_binary_distribution
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_sharedlib_distribution
|
||||
@ -315,6 +320,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/preinstall
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/postinstall
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ChangeLog
|
||||
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
|
||||
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
|
||||
rm -f ${RPM_BUILD_ROOT}/usr/libexec/ndb_cpcd
|
||||
@ -400,7 +406,6 @@ fi
|
||||
%{_bindir}/mysql
|
||||
%{_bindir}/mysql_config
|
||||
%{_bindir}/mysql_find_rows
|
||||
%{_bindir}/mysql_tableinfo
|
||||
%{_bindir}/mysql_waitpid
|
||||
%{_bindir}/mysqlaccess
|
||||
%{_bindir}/mysqladmin
|
||||
@ -409,6 +414,7 @@ fi
|
||||
%{_bindir}/mysqldump
|
||||
%{_bindir}/mysqlimport
|
||||
%{_bindir}/mysqlshow
|
||||
%{_bindir}/mysqlslap
|
||||
%{_bindir}/my_print_defaults
|
||||
|
||||
%{_infodir}/*
|
||||
@ -416,12 +422,12 @@ fi
|
||||
%{_mandir}/man1/mysql.1*
|
||||
%{_mandir}/man1/mysql_config.1*
|
||||
%{_mandir}/man1/mysql_find_rows.1*
|
||||
%{_mandir}/man1/mysql_tableinfo.1*
|
||||
%{_mandir}/man1/mysql_waitpid.1*
|
||||
%{_mandir}/man1/mysqlaccess.1*
|
||||
%{_mandir}/man1/mysqladmin.1*
|
||||
%{_mandir}/man1/mysqldump.1*
|
||||
%{_mandir}/man1/mysqlshow.1*
|
||||
%{_mandir}/man1/mysqlslap.1*
|
||||
%{_mandir}/man1/my_print_defaults.1*
|
||||
|
||||
%{_libdir}/mysql/mysqlbug
|
||||
@ -474,7 +480,6 @@ fi
|
||||
%{_bindir}/myisamlog
|
||||
%{_bindir}/myisampack
|
||||
%{_bindir}/mysql_convert_table_format
|
||||
%{_bindir}/mysql_explain_log
|
||||
%{_bindir}/mysql_fix_extensions
|
||||
%{_bindir}/mysql_fix_privilege_tables
|
||||
%{_bindir}/mysql_install_db
|
||||
@ -482,16 +487,12 @@ fi
|
||||
%{_bindir}/mysql_setpermission
|
||||
%{_bindir}/mysql_tzinfo_to_sql
|
||||
%{_bindir}/mysql_upgrade
|
||||
%{_bindir}/mysql_upgrade_shell
|
||||
%{_bindir}/mysql_zap
|
||||
%{_bindir}/mysqlbug
|
||||
%{_bindir}/mysqldumpslow
|
||||
%{_bindir}/mysqld_multi
|
||||
%{_bindir}/mysqld_safe
|
||||
%{_bindir}/mysqlhotcopy
|
||||
%{_bindir}/mysqltestmanager
|
||||
%{_bindir}/mysqltestmanager-pwgen
|
||||
%{_bindir}/mysqltestmanagerc
|
||||
%{_bindir}/mysqltest
|
||||
%{_bindir}/innochecksum
|
||||
%{_bindir}/perror
|
||||
@ -502,6 +503,8 @@ fi
|
||||
/usr/libexec/mysqld
|
||||
/usr/libexec/mysqlmanager
|
||||
|
||||
%{_libdir}/mysql/plugin
|
||||
|
||||
%{_mandir}/man1/msql2mysql.1*
|
||||
%{_mandir}/man1/myisamchk.1*
|
||||
%{_mandir}/man1/myisamlog.1*
|
||||
@ -509,7 +512,6 @@ fi
|
||||
%{_mandir}/man1/mysql_convert_table_format.1*
|
||||
%{_mandir}/man1/myisam_ftdump.1*
|
||||
%{_mandir}/man1/mysql.server.1*
|
||||
%{_mandir}/man1/mysql_explain_log.1*
|
||||
%{_mandir}/man1/mysql_fix_extensions.1*
|
||||
%{_mandir}/man1/mysql_fix_privilege_tables.1*
|
||||
%{_mandir}/man1/mysql_install_db.1*
|
||||
@ -531,10 +533,7 @@ fi
|
||||
%{_mandir}/man1/replace.1*
|
||||
%{_mandir}/man1/resolve_stack_dump.1*
|
||||
%{_mandir}/man1/resolveip.1*
|
||||
%{_mandir}/man1/safe_mysqld.1*
|
||||
%{_mandir}/man1/mysql_tzinfo_to_sql.1*
|
||||
%{_mandir}/man1/mysqlmanager-pwgen.1*
|
||||
%{_mandir}/man1/mysqlmanagerc.1*
|
||||
%{_mandir}/man8/mysqld.8*
|
||||
%{_mandir}/man8/mysqlmanager.8*
|
||||
|
||||
@ -545,6 +544,8 @@ fi
|
||||
%{_datadir}/mysql/mysql_system_tables_data.sql
|
||||
%{_datadir}/mysql/mysql_test_data_timezone.sql
|
||||
%{_datadir}/mysql/my-*.cnf
|
||||
%{_datadir}/mysql/config.*.ini
|
||||
|
||||
/etc/rc.d/init.d/mysqld
|
||||
%attr(0755,mysql,mysql) %dir /var/run/mysqld
|
||||
%attr(0755,mysql,mysql) %dir /var/lib/mysql
|
||||
@ -560,6 +561,9 @@ fi
|
||||
%{_bindir}/ndb_drop_table
|
||||
%{_bindir}/ndb_error_reporter
|
||||
%{_bindir}/ndb_mgm
|
||||
%{_bindir}/ndb_print_backup_file
|
||||
%{_bindir}/ndb_print_schema_file
|
||||
%{_bindir}/ndb_print_sys_file
|
||||
%{_bindir}/ndb_restore
|
||||
%{_bindir}/ndb_select_all
|
||||
%{_bindir}/ndb_select_count
|
||||
@ -593,12 +597,14 @@ fi
|
||||
%{_mandir}/man1/ndb_show_tables.1*
|
||||
#%{_mandir}/man1/ndb_size.pl.1*
|
||||
%{_mandir}/man1/ndb_waiter.1*
|
||||
%{_mandir}/man1/ndbd_redo_log_reader.1*
|
||||
%{_mandir}/man8/ndbd.8*
|
||||
%{_mandir}/man8/ndb_mgmd.8*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
/usr/include/mysql
|
||||
/usr/share/aclocal/mysql.m4
|
||||
%{_libdir}/mysql/*.a
|
||||
%{_libdir}/mysql/libmysqlclient*.so
|
||||
%{_libdir}/mysql/libndbclient.so
|
||||
@ -627,6 +633,10 @@ fi
|
||||
%{_mandir}/man1/mysql_client_test.1*
|
||||
|
||||
%changelog
|
||||
* Wed Jan 14 2009 Tom Lane <tgl@redhat.com> 5.1.30-1
|
||||
- Update to MySQL 5.1.30. Note that this includes an ABI break for
|
||||
libmysqlclient (it's now got .so major version 16).
|
||||
|
||||
* Wed Oct 1 2008 Tom Lane <tgl@redhat.com> 5.0.67-2
|
||||
- Build the "embedded server" library, and package it in a new sub-RPM
|
||||
mysql-embedded, along with mysql-embedded-devel for devel support files.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user