Below is the list of changes that have just been committed into a local
5.1 repository of dlenev. When dlenev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2186 06/02/27 16:01:34 dlenev@stripped +12 -0
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
into mysql.com:/home/dlenev/src/mysql-5.1-merges
storage/myisammrg/myrg_queue.c
1.13 06/02/27 16:01:22 dlenev@stripped +0 -0
Auto merged
sql/sql_table.cc
1.313 06/02/27 16:01:20 dlenev@stripped +0 -0
Auto merged
sql/sql_select.h
1.107 06/02/27 16:01:20 dlenev@stripped +0 -0
Auto merged
sql/sql_parse.cc
1.526 06/02/27 16:01:20 dlenev@stripped +0 -0
Auto merged
sql/sql_base.cc
1.308 06/02/27 16:01:19 dlenev@stripped +0 -0
Auto merged
sql/ha_myisammrg.cc
1.82 06/02/27 16:01:19 dlenev@stripped +0 -0
Auto merged
sql/field.cc
1.304 06/02/27 16:01:19 dlenev@stripped +0 -0
Auto merged
mysql-test/r/merge.result
1.49 06/02/27 16:01:18 dlenev@stripped +0 -0
Auto merged
mysql-test/mysql-test-run.sh
1.305 06/02/27 16:01:18 dlenev@stripped +0 -0
Auto merged
mysql-test/mysql-test-run.pl
1.75 06/02/27 16:01:18 dlenev@stripped +0 -0
Auto merged
include/my_global.h
1.122 06/02/27 16:01:18 dlenev@stripped +0 -0
Auto merged
client/mysqltest.c
1.189 06/02/27 16:01:18 dlenev@stripped +0 -0
Auto merged
storage/myisammrg/myrg_queue.c
1.10.2.2 06/02/27 16:01:17 dlenev@stripped +0 -0
Merge rename: myisammrg/myrg_queue.c -> storage/myisammrg/myrg_queue.c
# 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: dlenev
# Host: brandersnatch.site
# Root: /home/dlenev/src/mysql-5.1-merges/RESYNC
--- 1.304/mysql-test/mysql-test-run.sh 2006-02-27 14:18:23 +03:00
+++ 1.305/mysql-test/mysql-test-run.sh 2006-02-27 16:01:18 +03:00
@@ -202,6 +202,7 @@
REALT=0
FAST_START=""
MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp
+export MYSQL_TMP_DIR
# Use a relative path for where the slave will find the dumps
# generated by "LOAD DATA" on the master. The path is relative
--- 1.81/sql/ha_myisammrg.cc 2006-02-26 00:20:52 +03:00
+++ 1.82/sql/ha_myisammrg.cc 2006-02-27 16:01:19 +03:00
@@ -308,7 +308,27 @@
table->s->keys_in_use.set_prefix(table->s->keys);
table->s->db_options_in_use= info.options;
mean_rec_length= info.reclength;
- block_size=0;
+
+ /*
+ The handler::block_size is used all over the code in index scan cost
+ calculations. It is used to get number of disk seeks required to
+ retrieve a number of index tuples.
+ If the merge table has N underlying tables, then (assuming underlying
+ tables have equal size, the only "simple" approach we can use)
+ retrieving X index records from a merge table will require N times more
+ disk seeks compared to doing the same on a MyISAM table with equal
+ number of records.
+ In the edge case (file_tables > myisam_block_size) we'll get
+ block_size==0, and index calculation code will act as if we need one
+ disk seek to retrieve one index tuple.
+
+ TODO: In 5.2 index scan cost calculation will be factored out into a
+ virtual function in class handler and we'll be able to remove this hack.
+ */
+ block_size= 0;
+ if (file->tables)
+ block_size= myisam_block_size / file->tables;
+
update_time=0;
#if SIZEOF_OFF_T > 4
ref_length=6; // Should be big enough
--- 1.74/mysql-test/mysql-test-run.pl 2006-02-23 12:49:35 +03:00
+++ 1.75/mysql-test/mysql-test-run.pl 2006-02-27 16:01:18 +03:00
@@ -1156,6 +1156,7 @@
$ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server;
$ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir;
$ENV{'MYSQLTEST_VARDIR'}= $opt_vardir;
+ $ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir;
$ENV{'MASTER_MYSOCK'}= $master->[0]->{'path_mysock'};
$ENV{'MASTER_MYSOCK1'}= $master->[1]->{'path_mysock'};
$ENV{'MASTER_MYPORT'}= $master->[0]->{'path_myport'};
@@ -2876,7 +2877,7 @@
if ( $opt_debug )
{
$cmdline_mysqlcheck .=
- " --debug=d:t:A,$opt_vardir_trace/log/mysqldump.trace";
+ " --debug=d:t:A,$opt_vardir_trace/log/mysqlcheck.trace";
}
my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " .
--- 1.48/mysql-test/r/merge.result 2006-02-17 22:06:00 +03:00
+++ 1.49/mysql-test/r/merge.result 2006-02-27 16:01:18 +03:00
@@ -56,8 +56,8 @@
4 Testing
5 table
5 table
-6 t1
6 t2
+6 t1
7 Testing
7 Testing
8 table
--- 1.121/include/my_global.h 2006-01-05 12:54:08 +03:00
+++ 1.122/include/my_global.h 2006-02-27 16:01:18 +03:00
@@ -43,6 +43,15 @@
#define HAVE_ERRNO_AS_DEFINE
#endif /* __CYGWIN__ */
+#if defined(__QNXNTO__) && !defined(FD_SETSIZE)
+#define FD_SETSIZE 1024 /* Max number of file descriptor bits in
+ fd_set, used when calling 'select'
+ Must be defined before including
+ "sys/select.h" and "sys/time.h"
+ */
+#endif
+
+
/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
#ifdef USE_PRAGMA_IMPLEMENTATION
#define USE_PRAGMA_INTERFACE
--- 1.188/client/mysqltest.c 2006-02-23 22:55:54 +03:00
+++ 1.189/client/mysqltest.c 2006-02-27 16:01:18 +03:00
@@ -3662,8 +3662,10 @@
static void init_win_path_patterns()
{
/* List of string patterns to match in order to find paths */
- const char* paths[] = { "$MYSQL_TEST_DIR", "./test/", 0 };
- int num_paths= 2;
+ const char* paths[] = { "$MYSQL_TEST_DIR",
+ "$MYSQL_TMP_DIR",
+ "./test/", 0 };
+ int num_paths= 3;
int i;
char* p;
| Thread |
|---|
| • bk commit into 5.1 tree (dlenev:1.2186) | dlenev | 27 Feb |
