mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
mysqlimport was not always compiled correctly to allow thread support,
required for the --use-threads option. (Bug #32991)
This commit is contained in:
@@ -71,7 +71,7 @@ mysqldump_SOURCES= mysqldump.c \
|
|||||||
$(top_srcdir)/mysys/mf_getdate.c
|
$(top_srcdir)/mysys/mf_getdate.c
|
||||||
|
|
||||||
mysqlimport_SOURCES= mysqlimport.c
|
mysqlimport_SOURCES= mysqlimport.c
|
||||||
|
mysqlimport_CFLAGS= -DTHREAD -UUNDEF_THREADS_HACK
|
||||||
mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
|
mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
|
||||||
@CLIENT_EXTRA_LDFLAGS@ \
|
@CLIENT_EXTRA_LDFLAGS@ \
|
||||||
$(LIBMYSQLCLIENT_LA) \
|
$(LIBMYSQLCLIENT_LA) \
|
||||||
|
@@ -4036,6 +4036,181 @@ UNLOCK TABLES;
|
|||||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||||
|
|
||||||
DROP TABLE t1;
|
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;
|
||||||
#
|
#
|
||||||
# Bug#16853 mysqldump doesn't show events
|
# Bug#16853 mysqldump doesn't show events
|
||||||
#
|
#
|
||||||
|
@@ -1703,9 +1703,6 @@ DROP TABLE t1;
|
|||||||
# Added for use-thread option
|
# Added for use-thread option
|
||||||
#
|
#
|
||||||
|
|
||||||
# THIS PART OF THE TEST IS DISABLED UNTIL Bug#32991 IS FIXED
|
|
||||||
if ($bug32991_fixed) {
|
|
||||||
|
|
||||||
create table t1 (a text , b text);
|
create table t1 (a text , b text);
|
||||||
create table t2 (a text , b text);
|
create table t2 (a text , b text);
|
||||||
insert t1 values ("Duck, Duck", "goose");
|
insert t1 values ("Duck, Duck", "goose");
|
||||||
@@ -1743,8 +1740,6 @@ drop table t2;
|
|||||||
|
|
||||||
drop table words2;
|
drop table words2;
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
--echo #
|
--echo #
|
||||||
--echo # Bug#16853 mysqldump doesn't show events
|
--echo # Bug#16853 mysqldump doesn't show events
|
||||||
--echo #
|
--echo #
|
||||||
|
Reference in New Issue
Block a user