database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge

Browse Source
This commit is contained in:
unknown
2006-02-19 23:57:49 +01:00
parent bc49480d06 77d7fd80d0
commit 424ade5c81
16 changed files with 789 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/mysql-test-run.pl
View File

@@ -508,13 +508,15 @@ sub command_line_setup () {
# These are defaults for things that are set on the command line
$opt_suite= "main"; # Special default suite
my $opt_master_myport= 9306;
my $opt_slave_myport= 9308;
$opt_ndbcluster_port= 9350;
my $opt_comment;
my $opt_master_myport= 9306;
my $opt_slave_myport= 9308;
$opt_ndbcluster_port= 9350;
$opt_ndbcluster_port_slave= 9358;
my $im_port= 9310;
my $im_mysqld1_port= 9312;
my $im_mysqld2_port= 9314;
my $im_port= 9310;
my $im_mysqld1_port= 9312;
my $im_mysqld2_port= 9314;
#
# To make it easier for different devs to work on the same host,
@@ -626,6 +628,7 @@ sub command_line_setup () {
'big-test' => \$opt_big_test,
'debug' => \$opt_debug,
'fast' => \$opt_fast,
'comment=s' => \$opt_comment,
'local' => \$opt_local,
'local-master' => \$opt_local_master,
'netware' => \$opt_netware,
@@ -652,9 +655,14 @@ sub command_line_setup () {
'help|h' => \$opt_usage,
) or usage("Can't read options");
if ( $opt_usage )
usage("") if $opt_usage;
if ( $opt_comment )
{
usage("");
print "\n";
print '#' x 78, "\n";
print "# $opt_comment\n";
print '#' x 78, "\n\n";
}
foreach my $arg ( @ARGV )

1
mysql-test/mysql-test-run.sh
View File

@@ -257,6 +257,7 @@ if [ -n "$MTR_BUILD_THREAD" ] ; then
MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`
NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 6`
NDBCLUSTER_PORT_SLAVE=`expr $MASTER_MYPORT + 7`
echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD"
echo "Using MASTER_MYPORT = $MASTER_MYPORT"

30
mysql-test/r/mysqldump.result
View File

@@ -2650,33 +2650,3 @@ DELIMITER ;
DROP TRIGGER tr1;
DROP TABLE t1;
create table t1 (a text , b text);
create table t2 (a text , b text);
insert t1 values ("Duck, Duck", "goose");
insert t1 values ("Duck, Duck", "pidgeon");
insert t2 values ("We the people", "in order to perform");
insert t2 values ("a more perfect", "union");
select * from t1;
a b
Duck, Duck goose
Duck, Duck pidgeon
select * from t2;
a b
We the people in order to perform
a more perfect union
test.t1: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
test.t2: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
select * from t1;
a b
Duck, Duck goose
Duck, Duck pidgeon
Duck, Duck goose
Duck, Duck pidgeon
select * from t2;
a b
We the people in order to perform
a more perfect union
We the people in order to perform
a more perfect union
drop table t1;
drop table t2;

5
mysql-test/t/disabled.def
View File

@@ -33,6 +33,7 @@ rpl_ndb_sp007 : Bug #17290
rpl_sp : Bug#16456
rpl_until : Unstable test case, bug#15886
sp-goto : GOTO is currently is disabled - will be fixed in the future
rpl_ndb_blob : Bug #17505
rpl_ndb_blob2 : Bug #17505
rpl_ndb_blob : Bug#17505
rpl_ndb_blob2 : Bug#17505
rpl_ndb_log : results are not deterministic
mysqldump : Bug#17443 mysqlimport --use-threads=5 gives crashes

2
mysql-test/t/mysqldump.test
View File

@@ -1049,6 +1049,7 @@ SET SQL_MODE = @old_sql_mode;
DROP TRIGGER tr1;
DROP TABLE t1;
--disable_parsing
#
# Added for use-thread option
#
@@ -1072,3 +1073,4 @@ select * from t2;
drop table t1;
drop table t2;
--enable_parsing