Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.1831 05/04/14 16:39:42 ramil@stripped +2 -0
Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
mysql-test/mysql-test-run.pl
1.20 05/04/14 16:39:39 ramil@stripped +0 -0
Auto merged
client/mysqltest.c
1.139 05/04/14 16:39:39 ramil@stripped +0 -0
Auto merged
# 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: ramil
# Host: gw.mysql.r18.ru
# Root: /usr/home/ram/work/mysql-5.0/RESYNC
--- 1.19/mysql-test/mysql-test-run.pl 2005-04-06 21:15:28 +05:00
+++ 1.20/mysql-test/mysql-test-run.pl 2005-04-14 16:39:39 +05:00
@@ -262,6 +262,7 @@
our $opt_source_dist;
our $opt_start_and_exit;
+our $opt_start_dirty;
our $opt_start_from;
our $opt_strace_client;
@@ -305,6 +306,7 @@
sub command_line_setup ();
sub executable_setup ();
sub environment_setup ();
+sub kill_running_server ();
sub kill_and_cleanup ();
sub ndbcluster_install ();
sub ndbcluster_start ();
@@ -353,14 +355,22 @@
if ( ! $glob_use_running_server )
{
- kill_and_cleanup();
- mysql_install_db();
+
+ if ( $opt_start_dirty )
+ {
+ kill_running_server();
+ }
+ else
+ {
+ kill_and_cleanup();
+ mysql_install_db();
# mysql_loadstd(); FIXME copying from "std_data" .frm and
# .MGR but there are none?!
+ }
}
- if ( $opt_start_and_exit )
+ if ( $opt_start_and_exit or $opt_start_dirty )
{
if ( ndbcluster_start() )
{
@@ -531,6 +541,7 @@
'script-debug' => \$opt_script_debug,
'sleep=i' => \$opt_sleep,
'socket=s' => \$opt_socket,
+ 'start-dirty' => \$opt_start_dirty,
'start-and-exit' => \$opt_start_and_exit,
'start-from=s' => \$opt_start_from,
'timer' => \$opt_timer,
@@ -951,7 +962,7 @@
#
##############################################################################
-sub kill_and_cleanup () {
+sub kill_running_server () {
if ( $opt_fast or $glob_use_embedded_server )
{
@@ -976,6 +987,11 @@
ndbcluster_stop();
$master->[0]->{'ndbcluster'}= 1;
}
+}
+
+sub kill_and_cleanup () {
+
+ kill_running_server ();
mtr_report("Removing Stale Files");
@@ -1461,7 +1477,15 @@
# ----------------------------------------------------------------------
{
- unlink("r/$tname.reject");
+ # remove the old reject file
+ if ( $opt_suite eq "main" )
+ {
+ unlink("r/$tname.reject");
+ }
+ else
+ {
+ unlink("suite/$opt_suite/r/$tname.reject");
+ }
unlink($path_timefile);
my $res= run_mysqltest($tinfo, $tinfo->{'master_opt'});
@@ -2155,7 +2179,7 @@
extern Use running server for tests FIXME DANGEROUS
ndbconnectstring=STR Use running cluster, and connect using STR
- user=USER The databse user name
+ user=USER User for connect to server
Options for debugging the product
@@ -2182,6 +2206,7 @@
compress Use the compressed protocol between client and server
timer Show test case execution time
start-and-exit Only initiate and start the "mysqld" servers
+ start-dirty Only start the "mysqld" servers without initiation
fast Don't try to cleanup from earlier runs
reorder Reorder tests to get less server restarts
help Get this help text
--- 1.138/client/mysqltest.c 2005-04-07 21:24:08 +05:00
+++ 1.139/client/mysqltest.c 2005-04-14 16:39:39 +05:00
@@ -4196,8 +4196,8 @@
static void make_sets_invisible(REP_SETS *sets);
static void free_last_set(REP_SETS *sets);
static void free_sets(REP_SETS *sets);
-static void set_bit(REP_SET *set, uint bit);
-static void clear_bit(REP_SET *set, uint bit);
+static void internal_set_bit(REP_SET *set, uint bit);
+static void internal_clear_bit(REP_SET *set, uint bit);
static void or_bits(REP_SET *to,REP_SET *from);
static void copy_bits(REP_SET *to,REP_SET *from);
static int cmp_bits(REP_SET *set1,REP_SET *set2);
@@ -4274,7 +4274,7 @@
{
if (from[i][0] == '\\' && from[i][1] == '^')
{
- set_bit(start_states,states+1);
+ internal_set_bit(start_states,states+1);
if (!from[i][2])
{
start_states->table_offset=i;
@@ -4283,8 +4283,8 @@
}
else if (from[i][0] == '\\' && from[i][1] == '$')
{
- set_bit(start_states,states);
- set_bit(word_states,states);
+ internal_set_bit(start_states,states);
+ internal_set_bit(word_states,states);
if (!from[i][2] && start_states->table_offset == (uint) ~0)
{
start_states->table_offset=i;
@@ -4293,11 +4293,11 @@
}
else
{
- set_bit(word_states,states);
+ internal_set_bit(word_states,states);
if (from[i][0] == '\\' && (from[i][1] == 'b' && from[i][2]))
- set_bit(start_states,states+1);
+ internal_set_bit(start_states,states+1);
else
- set_bit(start_states,states);
+ internal_set_bit(start_states,states);
}
for (pos=from[i], len=0; *pos ; pos++)
{
@@ -4403,9 +4403,9 @@
follow[i].len > found_end)
found_end=follow[i].len;
if (chr && follow[i].chr)
- set_bit(new_set,i+1); /* To next set */
+ internal_set_bit(new_set,i+1); /* To next set */
else
- set_bit(new_set,i);
+ internal_set_bit(new_set,i);
}
}
if (found_end)
@@ -4422,7 +4422,7 @@
if (follow[bit_nr-1].len < found_end ||
(new_set->found_len &&
(chr == 0 || !follow[bit_nr].chr)))
- clear_bit(new_set,i);
+ internal_clear_bit(new_set,i);
else
{
if (chr == 0 || !follow[bit_nr].chr)
@@ -4571,13 +4571,13 @@
return;
}
-static void set_bit(REP_SET *set, uint bit)
+static void internal_set_bit(REP_SET *set, uint bit)
{
set->bits[bit / WORD_BIT] |= 1 << (bit % WORD_BIT);
return;
}
-static void clear_bit(REP_SET *set, uint bit)
+static void internal_clear_bit(REP_SET *set, uint bit)
{
set->bits[bit / WORD_BIT] &= ~ (1 << (bit % WORD_BIT));
return;
| Thread |
|---|
| • bk commit into 5.0 tree (ramil:1.1831) | ramil | 14 Apr |
