Commit c0048648 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug17382/my51-bug17382 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
parents d736de57 0934ad5d

client/Makefile.am

+9 −10
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ INCLUDES = -I$(top_builddir)/include \ 
LIBS =				@CLIENT_LIBS@

LDADD=				@CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \

                                $(top_builddir)/libmysql/libmysqlclient.la

LDADD_R=			@CLIENT_EXTRA_LDFLAGS@ \

                                $(CLIENT_THREAD_LIBS) \

                                $(top_builddir)/libmysql_r/libmysqlclient_r.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

				mysqldump mysqlimport mysqltest mysqlbinlog \

				mysqltestmanagerc mysqltestmanager-pwgen \
@@ -48,13 +51,9 @@ mysqlbinlog_SOURCES = mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \ 
				$(top_srcdir)/mysys/my_vle.c \

				$(top_srcdir)/mysys/base64.c

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql_r/libmysqlclient_r.la \

mysqlslap_LDADD =		$(CXXLDFLAGS) $(LDADD_R) \

				$(top_builddir)/mysys/libmysys.a

mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql_r/libmysqlclient_r.la \

mysqlimport_LDADD =		$(CXXLDFLAGS) $(LDADD_R) \

				$(top_builddir)/mysys/libmysys.a

mysqltestmanager_pwgen_SOURCES =   mysqlmanager-pwgen.c

mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)

client/mysqlimport.c

+3 −5
Original line number Diff line number Diff line
@@ -145,13 +145,11 @@ static struct my_option my_long_options[] = 
   (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#include <sslopt-longopts.h>

#if 0

  {"use-threads", OPT_USE_THREADS,

   "Load files in parallel. The argument is the number "

   "of threads to use for loading data.",

   (gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0, 

   GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#endif

#ifndef DONT_ALLOW_USER_CHANGE

  {"user", 'u', "User for login if not current user.", (gptr*) &current_user,

   (gptr*) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

mysql-test/r/mysqldump.result

+175 −0
Original line number Diff line number Diff line
@@ -2650,3 +2650,178 @@ 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

create table words(a varchar(255));

create table words2(b varchar(255));

select * from t1;

a	b

Duck, Duck	goose

Duck, Duck	pidgeon

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

We the people	in order to perform

a more perfect	union

select * from words;

a

Aarhus

Aaron

Ababa

aback

abaft

abandon

abandoned

abandoning

abandonment

abandons

Aarhus

Aaron

Ababa

aback

abaft

abandon

abandoned

abandoning

abandonment

abandons

abase

abased

abasement

abasements

abases

abash

abashed

abashes

abashing

abasing

abate

abated

abatement

abatements

abater

abates

abating

Abba

abbe

abbey

abbeys

abbot

abbots

Abbott

abbreviate

abbreviated

abbreviates

abbreviating

abbreviation

abbreviations

Abby

abdomen

abdomens

abdominal

abduct

abducted

abduction

abductions

abductor

abductors

abducts

Abe

abed

Abel

Abelian

Abelson

Aberdeen

Abernathy

aberrant

aberration

select * from words2;

b

abase

abased

abasement

abasements

abases

abash

abashed

abashes

abashing

abasing

abate

abated

abatement

abatements

abater

abates

abating

Abba

abbe

abbey

abbeys

abbot

abbots

Abbott

abbreviate

abbreviated

abbreviates

abbreviating

abbreviation

abbreviations

Abby

abdomen

abdomens

abdominal

abduct

abducted

abduction

abductions

abductor

abductors

abducts

Abe

abed

Abel

Abelian

Abelson

Aberdeen

Abernathy

aberrant

aberration

drop table words;

mysql-import: Error: 1146, Table 'test.words' doesn't exist, when using table: words

drop table t1;

drop table t2;

drop table words2;

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -34,4 +34,3 @@ 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_log             : results are not deterministic
 
mysqldump               : Bug#17443 mysqlimport --use-threads=5 gives crashes

mysql-test/t/mysqldump.test

+16 −2
Original line number Diff line number Diff line
@@ -1049,7 +1049,6 @@ SET SQL_MODE = @old_sql_mode; 
DROP TRIGGER tr1;

DROP TABLE t1;



--disable_parsing

#

# Added for use-thread option

#
@@ -1070,7 +1069,22 @@ select * from t2; 
--exec $MYSQL_IMPORT --silent --use-threads=5 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt

select * from t1;

select * from t2;

# Now we test with multiple threads, but less threads than files.

create table words(a varchar(255));

create table words2(b varchar(255));

--exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data_ln/words.dat $MYSQLTEST_VARDIR/std_data_ln/words2.dat

select * from t1;

select * from t2;

select * from words;

select * from words2;



# Drop table "words" and run with threads, should fail

drop table words;

--replace_regex /.*mysqlimport/mysql-import/

--error 1

--exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data_ln/words.dat $MYSQLTEST_VARDIR/std_data_ln/words2.dat 2>&1



drop table t1;

drop table t2;

--enable_parsing
 


drop table words2;