Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2149 06/02/20 13:04:40 msvensson@neptunus.(none) +5 -0
Bug#17382 mysql-test-run mysqldump fails with mysqlimport
mysql-test/t/mysqldump.test
1.83 06/02/20 13:04:34 msvensson@neptunus.(none) +16 -2
Enable test for mysqlimport with threads
Add test for failed mysqlimport
mysql-test/t/disabled.def
1.80 06/02/20 13:04:34 msvensson@neptunus.(none) +0 -1
Enable mysqldump
mysql-test/r/mysqldump.result
1.94 06/02/20 13:04:34 msvensson@neptunus.(none) +175 -0
Update test result
client/mysqlimport.c
1.69 06/02/20 13:04:34 msvensson@neptunus.(none) +3 -5
Enable "--use-threads"
Formatting
client/Makefile.am
1.63 06/02/20 13:04:34 msvensson@neptunus.(none) +9 -10
Use LDADD_R as common variable for programs to be linked with thread safe library.
# 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: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/bug17382/my51-bug17382
--- 1.62/client/Makefile.am 2006-02-19 19:52:19 +01:00
+++ 1.63/client/Makefile.am 2006-02-20 13:04:34 +01:00
@@ -25,10 +25,13 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
- $(openssl_includes) $(yassl_includes)
+ $(openssl_includes) $(yassl_includes)
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,15 +51,11 @@
$(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 \
- $(top_builddir)/mysys/libmysys.a
-mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
- @CLIENT_EXTRA_LDFLAGS@ \
- $(top_builddir)/libmysql_r/libmysqlclient_r.la \
- $(top_builddir)/mysys/libmysys.a
-mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c
+mysqlslap_LDADD = $(CXXLDFLAGS) $(LDADD_R) \
+ $(top_builddir)/mysys/libmysys.a
+mysqlimport_LDADD = $(CXXLDFLAGS) $(LDADD_R) \
+ $(top_builddir)/mysys/libmysys.a
+mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c
mysqltestmanagerc_SOURCES= mysqlmanagerc.c $(yassl_dummy_link_fix)
mysqlcheck_SOURCES= mysqlcheck.c $(yassl_dummy_link_fix)
mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix)
--- 1.68/client/mysqlimport.c 2006-02-19 23:46:53 +01:00
+++ 1.69/client/mysqlimport.c 2006-02-20 13:04:34 +01:00
@@ -145,13 +145,11 @@
(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*) ¤t_user,
(gptr*) ¤t_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -292,7 +290,7 @@
DBUG_PRINT("enter",("filename: %s",filename));
fn_format(tablename, filename, "", "", 1 | 2); /* removes path & ext. */
- if (! opt_local_file)
+ if (!opt_local_file)
strmov(hard_path,filename);
else
my_load_path(hard_path, filename, NULL); /* filename includes the path */
@@ -640,9 +638,9 @@
if (lock_tables)
lock_table(mysql, argc, argv);
for (; *argv != NULL; argv++)
- if ((error=write_to_table(*argv, mysql)))
+ if ((error= write_to_table(*argv, mysql)))
if (exitcode == 0)
- exitcode = error;
+ exitcode= error;
db_disconnect(current_host, mysql);
}
my_free(opt_password,MYF(MY_ALLOW_ZERO_PTR));
--- 1.79/mysql-test/t/disabled.def 2006-02-19 23:57:40 +01:00
+++ 1.80/mysql-test/t/disabled.def 2006-02-20 13:04:34 +01:00
@@ -36,4 +36,3 @@
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
--- 1.93/mysql-test/r/mysqldump.result 2006-02-17 18:19:24 +01:00
+++ 1.94/mysql-test/r/mysqldump.result 2006-02-20 13:04:34 +01:00
@@ -2650,3 +2650,178 @@
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;
--- 1.82/mysql-test/t/mysqldump.test 2006-02-17 18:19:24 +01:00
+++ 1.83/mysql-test/t/mysqldump.test 2006-02-20 13:04:34 +01:00
@@ -1049,7 +1049,6 @@
DROP TRIGGER tr1;
DROP TABLE t1;
---disable_parsing
#
# Added for use-thread option
#
@@ -1070,7 +1069,22 @@
--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;
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2149) BUG#17382 | msvensson | 20 Feb |
