2924 Bjorn Munch 2010-08-25
Bug #52301 Add --protocol to mysqltest
Added code resulted in strange linking problem for embedded on Windows
Avoided by not doing this for embedded mode
It's irrelevant for embedded server anyway, --protocol will be ignored
modified:
client/mysqltest.cc
2923 Bjorn Munch 2010-08-04 [merge]
merge from 5.1
added:
mysql-test/include/mysqlhotcopy.inc
mysql-test/r/mysqlhotcopy_archive.result
mysql-test/r/mysqlhotcopy_myisam.result
mysql-test/std_data/intersect-bug50389.tsv
mysql-test/suite/innodb/r/innodb_bug53674.result
mysql-test/suite/innodb/r/innodb_bug54044.result
mysql-test/suite/innodb/t/innodb_bug53674-master.opt
mysql-test/suite/innodb/t/innodb_bug53674.test
mysql-test/suite/innodb/t/innodb_bug54044.test
mysql-test/suite/innodb_plugin/r/innodb-autoinc-optimize.result
mysql-test/suite/innodb_plugin/r/innodb-ucs2.result
mysql-test/suite/innodb_plugin/r/innodb_autoinc_lock_mode_zero.result
mysql-test/suite/innodb_plugin/r/innodb_bug30919.result
mysql-test/suite/innodb_plugin/r/innodb_bug42419.result
mysql-test/suite/innodb_plugin/r/innodb_bug53674.result
mysql-test/suite/innodb_plugin/r/innodb_bug54044.result
mysql-test/suite/innodb_plugin/r/innodb_bug54679.result
mysql-test/suite/innodb_plugin/r/innodb_gis.result
mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result
mysql-test/suite/innodb_plugin/r/innodb_mysql.result
mysql-test/suite/innodb_plugin/r/innodb_mysql_rbk.result
mysql-test/suite/innodb_plugin/r/innodb_notembedded.result
mysql-test/suite/innodb_plugin/r/innodb_timeout_rollback.result
mysql-test/suite/innodb_plugin/t/innodb-autoinc-optimize.test
mysql-test/suite/innodb_plugin/t/innodb-ucs2.test
mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero-master.opt
mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero.test
mysql-test/suite/innodb_plugin/t/innodb_bug30919-master.opt
mysql-test/suite/innodb_plugin/t/innodb_bug30919.test
mysql-test/suite/innodb_plugin/t/innodb_bug42419.test
mysql-test/suite/innodb_plugin/t/innodb_bug53674-master.opt
mysql-test/suite/innodb_plugin/t/innodb_bug53674.test
mysql-test/suite/innodb_plugin/t/innodb_bug54044.test
mysql-test/suite/innodb_plugin/t/innodb_bug54679.test
mysql-test/suite/innodb_plugin/t/innodb_gis.test
mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1-master.opt
mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test
mysql-test/suite/innodb_plugin/t/innodb_mysql-master.opt
mysql-test/suite/innodb_plugin/t/innodb_mysql.test
mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk-master.opt
mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk.test
mysql-test/suite/innodb_plugin/t/innodb_notembedded.test
mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback-master.opt
mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback.test
mysql-test/t/mysqlhotcopy_archive.test
mysql-test/t/mysqlhotcopy_myisam.test
renamed:
mysql-test/r/innodb-autoinc-optimize.result => mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
mysql-test/r/innodb-ucs2.result => mysql-test/suite/innodb/r/innodb-ucs2.result
mysql-test/r/innodb_autoinc_lock_mode_zero.result => mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
mysql-test/r/innodb_bug30919.result => mysql-test/suite/innodb/r/innodb_bug30919.result
mysql-test/r/innodb_bug42419.result => mysql-test/suite/innodb/r/innodb_bug42419.result
mysql-test/r/innodb_gis.result => mysql-test/suite/innodb/r/innodb_gis.result
mysql-test/r/innodb_lock_wait_timeout_1.result => mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
mysql-test/r/innodb_mysql.result => mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/r/innodb_mysql_rbk.result => mysql-test/suite/innodb/r/innodb_mysql_rbk.result
mysql-test/r/innodb_notembedded.result => mysql-test/suite/innodb/r/innodb_notembedded.result
mysql-test/r/innodb_timeout_rollback.result => mysql-test/suite/innodb/r/innodb_timeout_rollback.result
mysql-test/suite/rpl/r/rpl_row_disabled_slave_key.result => mysql-test/suite/rpl/r/rpl_row_find_row.result
mysql-test/suite/rpl/t/rpl_row_disabled_slave_key.test => mysql-test/suite/rpl/t/rpl_row_find_row.test
mysql-test/t/innodb-autoinc-optimize.test => mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
mysql-test/t/innodb-ucs2.test => mysql-test/suite/innodb/t/innodb-ucs2.test
mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt => mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
mysql-test/t/innodb_autoinc_lock_mode_zero.test => mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
mysql-test/t/innodb_bug30919-master.opt => mysql-test/suite/innodb/t/innodb_bug30919-master.opt
mysql-test/t/innodb_bug30919.test => mysql-test/suite/innodb/t/innodb_bug30919.test
mysql-test/t/innodb_bug42419.test => mysql-test/suite/innodb/t/innodb_bug42419.test
mysql-test/t/innodb_gis.test => mysql-test/suite/innodb/t/innodb_gis.test
mysql-test/t/innodb_lock_wait_timeout_1-master.opt => mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
mysql-test/t/innodb_lock_wait_timeout_1.test => mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
mysql-test/t/innodb_mysql-master.opt => mysql-test/suite/innodb/t/innodb_mysql-master.opt
mysql-test/t/innodb_mysql.test => mysql-test/suite/innodb/t/innodb_mysql.test
mysql-test/t/innodb_mysql_rbk-master.opt => mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt
mysql-test/t/innodb_mysql_rbk.test => mysql-test/suite/innodb/t/innodb_mysql_rbk.test
mysql-test/t/innodb_notembedded.test => mysql-test/suite/innodb/t/innodb_notembedded.test
mysql-test/t/innodb_timeout_rollback-master.opt => mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
mysql-test/t/innodb_timeout_rollback.test => mysql-test/suite/innodb/t/innodb_timeout_rollback.test
modified:
BUILD/SETUP.sh
BUILD/build_mccge.sh
client/mysql.cc
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlbinlog.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlimport.c
client/mysqlshow.c
client/mysqlslap.c
client/mysqltest.cc
config/ac-macros/ssl.m4
configure.in
extra/comp_err.c
extra/my_print_defaults.c
extra/mysql_waitpid.c
extra/perror.c
extra/resolve_stack_dump.c
extra/resolveip.c
extra/yassl/CMakeLists.txt
extra/yassl/certs/ca-cert.pem
extra/yassl/certs/client-cert.der
extra/yassl/certs/client-cert.pem
extra/yassl/certs/dsa-cert.pem
extra/yassl/certs/server-cert.pem
extra/yassl/include/lock.hpp
extra/yassl/src/Makefile.am
extra/yassl/src/lock.cpp
extra/yassl/taocrypt/CMakeLists.txt
extra/yassl/taocrypt/benchmark/Makefile.am
extra/yassl/taocrypt/src/Makefile.am
extra/yassl/taocrypt/test/Makefile.am
extra/yassl/taocrypt/test/memory.cpp
extra/yassl/testsuite/Makefile.am
include/my_alarm.h
include/my_getopt.h
include/my_global.h
include/my_sys.h
include/myisam.h
include/sslopt-longopts.h
libmysql/libmysql.c
mysql-test/Makefile.am
mysql-test/collections/default.experimental
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_misc.pl
mysql-test/lib/v1/mtr_process.pl
mysql-test/mysql-test-run.pl
mysql-test/r/error_simulation.result
mysql-test/r/explain.result
mysql-test/r/func_in.result
mysql-test/r/func_isnull.result
mysql-test/r/func_like.result
mysql-test/r/group_min_max.result
mysql-test/r/handler_myisam.result
mysql-test/r/information_schema.result
mysql-test/r/loaddata.result
mysql-test/r/schema.result
mysql-test/r/select.result
mysql-test/r/subselect.result
mysql-test/r/variables.result
mysql-test/suite/binlog/r/binlog_base64_flag.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/binlog/t/binlog_base64_flag.test
mysql-test/suite/innodb/t/disabled.def
mysql-test/suite/innodb_plugin/t/disabled.def
mysql-test/suite/innodb_plugin/t/innodb_bug53592.test
mysql-test/suite/innodb_plugin/t/innodb_multi_update.test
mysql-test/suite/rpl/r/rpl_temporary_errors.result
mysql-test/suite/rpl/t/rpl_temporary_errors.test
mysql-test/suite/sys_vars/r/slow_query_log_func.result
mysql-test/suite/sys_vars/t/slow_query_log_func.test
mysql-test/t/disabled.def
mysql-test/t/error_simulation.test
mysql-test/t/explain.test
mysql-test/t/func_in.test
mysql-test/t/func_isnull.test
mysql-test/t/func_like.test
mysql-test/t/group_min_max.test
mysql-test/t/handler_myisam.test
mysql-test/t/information_schema.test
mysql-test/t/loaddata.test
mysql-test/t/ps_3innodb.test
mysql-test/t/schema.test
mysql-test/t/select.test
mysql-test/t/subselect.test
mysql-test/t/variables.test
mysys/mf_wfile.c
mysys/my_alloc.c
mysys/my_getopt.c
mysys/my_malloc.c
mysys/safemalloc.c
mysys/thr_alarm.c
scripts/make_binary_distribution.sh
server-tools/instance-manager/options.cc
sql/event_data_objects.cc
sql/handler.h
sql/item.cc
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_subselect.cc
sql/item_sum.cc
sql/item_sum.h
sql/log.cc
sql/log.h
sql/log_event.cc
sql/log_event_old.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/net_serv.cc
sql/opt_range.cc
sql/opt_range.h
sql/opt_sum.cc
sql/repl_failsafe.cc
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_rli.cc
sql/set_var.cc
sql/set_var.h
sql/slave.cc
sql/sp.cc
sql/sp_head.cc
sql/sql_binlog.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_db.cc
sql/sql_delete.cc
sql/sql_derived.cc
sql/sql_handler.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_list.h
sql/sql_load.cc
sql/sql_olap.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.cc
sql/table.h
sql/thr_malloc.cc
sql/unireg.cc
storage/archive/archive_reader.c
storage/innobase/dict/dict0dict.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/db0err.h
storage/innobase/include/lock0lock.h
storage/innobase/include/row0mysql.h
storage/innobase/include/sync0sync.h
storage/innobase/lock/lock0lock.c
storage/innobase/row/row0ins.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0undo.c
storage/innodb_plugin/ChangeLog
storage/innodb_plugin/btr/btr0cur.c
storage/innodb_plugin/btr/btr0sea.c
storage/innodb_plugin/buf/buf0buf.c
storage/innodb_plugin/dict/dict0crea.c
storage/innodb_plugin/dict/dict0dict.c
storage/innodb_plugin/dict/dict0load.c
storage/innodb_plugin/dict/dict0mem.c
storage/innodb_plugin/fil/fil0fil.c
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/include/db0err.h
storage/innodb_plugin/include/dict0mem.h
storage/innodb_plugin/include/fil0fil.h
storage/innodb_plugin/include/lock0lock.h
storage/innodb_plugin/include/log0log.ic
storage/innodb_plugin/include/row0mysql.h
storage/innodb_plugin/include/sync0rw.h
storage/innodb_plugin/include/sync0sync.h
storage/innodb_plugin/include/univ.i
storage/innodb_plugin/lock/lock0lock.c
storage/innodb_plugin/os/os0file.c
storage/innodb_plugin/page/page0zip.c
storage/innodb_plugin/row/row0ins.c
storage/innodb_plugin/row/row0merge.c
storage/innodb_plugin/row/row0mysql.c
storage/innodb_plugin/row/row0purge.c
storage/innodb_plugin/row/row0sel.c
storage/innodb_plugin/row/row0uins.c
storage/innodb_plugin/row/row0umod.c
storage/innodb_plugin/row/row0undo.c
storage/innodb_plugin/row/row0upd.c
storage/innodb_plugin/sync/sync0rw.c
storage/myisam/ft_nlq_search.c
storage/myisam/fulltext.h
storage/myisam/mi_test1.c
storage/myisam/myisam_ftdump.c
storage/myisam/myisamchk.c
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisammrg/ha_myisammrg.cc
strings/decimal.c
support-files/mysql.spec.sh
tests/mysql_client_test.c
unittest/examples/Makefile.am
unittest/examples/no_plan-t.c
unittest/mytap/tap.c
unittest/mytap/tap.h
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/rpl/r/rpl_row_find_row.result
mysql-test/suite/rpl/t/rpl_row_find_row.test
mysql-test/suite/innodb/t/innodb_mysql.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc 2010-08-04 10:19:51 +0000
+++ b/client/mysqltest.cc 2010-08-25 08:23:19 +0000
@@ -5220,8 +5220,10 @@ void do_connect(struct st_command *comma
}
#endif
+#ifndef EMBEDDED_LIBRARY
if (opt_protocol)
mysql_options(&con_slot->mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);
+#endif
#ifdef HAVE_SMEM
if (con_shm)
@@ -6179,8 +6181,10 @@ get_one_option(int optid, const struct m
print_version();
exit(0);
case OPT_MYSQL_PROTOCOL:
+#ifndef EMBEDDED_LIBRARY
opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
opt->name);
+#endif
break;
case '?':
usage();
@@ -7932,8 +7936,10 @@ int main(int argc, char **argv)
mysql_options(&con->mysql, MYSQL_SET_CHARSET_DIR,
opt_charsets_dir);
+#ifndef EMBEDDED_LIBRARY
if (opt_protocol)
mysql_options(&con->mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
+#endif
#ifdef HAVE_OPENSSL
Attachment: [text/bzr-bundle] bzr/bjorn.munch@oracle.com-20100825082319-4j9e5a8w6a9pspsb.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-mtr branch (bjorn.munch:2923 to 2924) Bug#52301 | Bjorn Munch | 25 Aug |
