Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-05-24 21:06:44+02:00, tomas@stripped +7 -0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco
MERGE: 1.2506.1.3
configure.in@stripped, 2007-05-24 21:06:38+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.434.1.32
mysql-test/mysql-test-run.pl@stripped, 2007-05-24 21:06:38+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.270.1.36
mysql-test/t/disabled.def@stripped, 2007-05-24 21:06:38+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.243.1.10
sql/item_func.cc@stripped, 2007-05-24 21:06:38+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.353.1.43
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@stripped, 2007-05-24 21:06:38+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.58.1.8
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@stripped, 2007-05-24 21:06:38+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.23.1.2
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-05-24 21:06:38+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.129.1.27
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tomas
# Host: whalegate.ndb.mysql.com
# Root: /home/tomas/mysql-5.1-telco/RESYNC
--- 1.287/mysql-test/mysql-test-run.pl 2007-05-23 08:06:21 +02:00
+++ 1.288/mysql-test/mysql-test-run.pl 2007-05-24 21:06:38 +02:00
@@ -1767,22 +1767,6 @@
}
# --------------------------------------------------------------------------
- # Add the path where mysqld will find udf_example.so
- # --------------------------------------------------------------------------
- if ( $lib_udf_example )
- {
- push(@ld_library_paths, dirname($lib_udf_example));
- }
-
- # --------------------------------------------------------------------------
- # Add the path where mysqld will find ha_example.so
- # --------------------------------------------------------------------------
- if ( $lib_example_plugin )
- {
- push(@ld_library_paths, dirname($lib_example_plugin));
- }
-
- # --------------------------------------------------------------------------
# Valgrind need to be run with debug libraries otherwise it's almost
# impossible to add correct supressions, that means if "/usr/lib/debug"
# is available, it should be added to
@@ -2060,12 +2044,16 @@
# ----------------------------------------------------
$ENV{'UDF_EXAMPLE_LIB'}=
($lib_udf_example ? basename($lib_udf_example) : "");
+ $ENV{'UDF_EXAMPLE_LIB_OPT'}=
+ ($lib_udf_example ? "--plugin_dir=" . dirname($lib_udf_example) : "");
# ----------------------------------------------------
# Add the path where mysqld will find ha_example.so
# ----------------------------------------------------
$ENV{'EXAMPLE_PLUGIN'}=
($lib_example_plugin ? basename($lib_example_plugin) : "");
+ $ENV{'EXAMPLE_PLUGIN_OPT'}=
+ ($lib_example_plugin ? "--plugin_dir=" . dirname($lib_example_plugin) : "");
# ----------------------------------------------------
# We are nice and report a bit about our settings
@@ -3824,9 +3812,6 @@
mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
}
}
-
- mtr_add_arg($args, "%s--plugin_dir=%s", $prefix,
- dirname($lib_example_plugin));
}
else
{
--- 1.255/mysql-test/t/disabled.def 2007-05-23 08:06:21 +02:00
+++ 1.256/mysql-test/t/disabled.def 2007-05-24 21:06:38 +02:00
@@ -38,7 +38,6 @@
#ndb_binlog_discover : bug#21806 2006-08-24
#ndb_autodiscover3 : bug#21806
-plugin : Bug#25659 memory leak via "plugins" test
#rpl_ndb_dd_advance : Bug#25913 rpl_ndb_dd_advance fails randomly
ndb_partition_error2 : HF is not sure if the test can work as internded on all the platforms
--- 1.68/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2007-05-08 19:08:39 +02:00
+++ 1.69/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2007-05-24 21:06:38 +02:00
@@ -2682,7 +2682,8 @@
UintR cfirstfreeLogFile;
UintR clogFileFileSize;
-#define ZLFO_FILE_SIZE 256 /* MAX 256 OUTSTANDING FILE OPERATIONS */
+#define ZLFO_MIN_FILE_SIZE 256
+// RedoBuffer/32K minimum ZLFO_MIN_FILE_SIZE
LogFileOperationRecord *logFileOperationRecord;
LogFileOperationRecordPtr lfoPtr;
UintR cfirstfreeLfo;
@@ -2699,7 +2700,7 @@
UintR cfirstfreePageRef;
UintR cpageRefFileSize;
-#define ZSCANREC_FILE_SIZE 100
+// Configurable
ArrayPool<ScanRecord> c_scanRecordPool;
ScanRecordPtr scanptr;
UintR cscanNoFreeRec;
--- 1.24/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp 2007-03-27 16:06:45 +02:00
+++ 1.25/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp 2007-05-24 21:06:38 +02:00
@@ -30,11 +30,11 @@
cgcprecFileSize = ZGCPREC_FILE_SIZE;
chostFileSize = MAX_NDB_NODES;
clcpFileSize = ZNO_CONCURRENT_LCP;
- clfoFileSize = ZLFO_FILE_SIZE;
+ clfoFileSize = 0;
clogFileFileSize = 0;
clogPartFileSize = ZLOG_PART_FILE_SIZE;
cpageRefFileSize = ZPAGE_REF_FILE_SIZE;
- cscanrecFileSize = ZSCANREC_FILE_SIZE;
+ cscanrecFileSize = 0;
ctabrecFileSize = 0;
ctcConnectrecFileSize = 0;
ctcNodeFailrecFileSize = MAX_NDB_NODES;
--- 1.170/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-05-23 08:09:53 +02:00
+++ 1.171/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-05-24 21:06:38 +02:00
@@ -1023,6 +1023,11 @@
clogPageFileSize+= (16 - mega_byte_part);
}
+ /* maximum number of log file operations */
+ clfoFileSize = clogPageFileSize;
+ if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
+ clfoFileSize = ZLFO_MIN_FILE_SIZE;
+
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TABLE, &ctabrecFileSize));
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TC_CONNECT,
&ctcConnectrecFileSize));
@@ -8003,6 +8008,11 @@
sendScanFragConf(signal, ZFALSE);
return;
}
+
+ /* maximum number of log file operations */
+ clfoFileSize = clogPageFileSize;
+ if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
+ clfoFileSize = ZLFO_MIN_FILE_SIZE;
// Update timer on tcConnectRecord
tcConnectptr.p->tcTimer = cLqhTimeOutCount;
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2509) | tomas | 24 May |
