From 0aff963ad72d8061e85956e99efffb3bf0bfa504 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Oct 2005 00:48:34 +0400 Subject: [PATCH 1/4] fix for im_life_cycle test: replace im instance port number with a constant string. The lack of this --replace resulted in the test failing on all build hosts mysql-test/r/im_life_cycle.result: fix result mysql-test/t/im_life_cycle.imtest: replace instance port number in result, as it could be set differently for different test runs. --- mysql-test/r/im_life_cycle.result | 2 +- mysql-test/t/im_life_cycle.imtest | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result index 810953e0578..f8eaf0ccb46 100644 --- a/mysql-test/r/im_life_cycle.result +++ b/mysql-test/r/im_life_cycle.result @@ -21,7 +21,7 @@ instance_name status version mysqld2 online VERSION SHOW VARIABLES LIKE 'port'; Variable_name Value -port 9312 +port IM_MYSQLD1_PORT STOP INSTANCE mysqld2; SHOW INSTANCES; instance_name status diff --git a/mysql-test/t/im_life_cycle.imtest b/mysql-test/t/im_life_cycle.imtest index fff57e16eab..c2b1c9a56ec 100644 --- a/mysql-test/t/im_life_cycle.imtest +++ b/mysql-test/t/im_life_cycle.imtest @@ -46,6 +46,7 @@ SHOW INSTANCE STATUS mysqld2; --connect (mysql_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK) --connection mysql_con +--replace_result $IM_MYSQLD1_PORT IM_MYSQLD1_PORT SHOW VARIABLES LIKE 'port'; --connection default From 72a2de023193f1bd127831ebfddd35e4c8c8e103 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Oct 2005 17:53:09 -0500 Subject: [PATCH 2/4] readd the my_cgets call that SergeyV originally put in --- client/mysql.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/mysql.cc b/client/mysql.cc index 8d5e576ca23..27277f0eb93 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1010,10 +1010,12 @@ static int read_and_execute(bool interactive) #elif defined(__WIN__) if (!tmpbuf.is_alloced()) tmpbuf.alloc(65535); + tmpbuf.length(0); buffer.length(0); unsigned long clen; do { + line= my_cgets((char*)tmpbuf.ptr(), tmpbuf.alloced_length()-1, &clen); buffer.append(line, clen); /* if we got buffer fully filled than there is a chance that From a43ec392af5109f3c3f99ca670148e5eafdd6f68 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Oct 2005 02:53:03 +0200 Subject: [PATCH 3/4] mysql.spec.sh: Enabled yaSSL mysql-test-run.pl: Increased test case timeout from 15 min mysql-test/mysql-test-run.pl: Increased test case timeout from 15 min support-files/mysql.spec.sh: Enabled yaSSL --- mysql-test/mysql-test-run.pl | 2 +- support-files/mysql.spec.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 35f26199fc8..063d1e2f2cc 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -242,7 +242,7 @@ our $opt_sleep_time_after_restart= 1; our $opt_sleep_time_for_delete= 10; our $opt_testcase_timeout; our $opt_suite_timeout; -my $default_testcase_timeout= 10; # 10 min max +my $default_testcase_timeout= 15; # 15 min max my $default_suite_timeout= 120; # 2 hours max our $opt_socket; diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index d4d0b4e810b..65d74474386 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -239,6 +239,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --with-unix-socket-path=/var/lib/mysql/mysql.sock \ --prefix=/ \ --with-extra-charsets=complex \ + --with-yassl \ --exec-prefix=%{_exec_prefix} \ --libexecdir=%{_sbindir} \ --libdir=%{_libdir} \ @@ -684,6 +685,9 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Wed Oct 19 2005 Kent Boortz + +- Enabled yaSSL support * Sat Oct 15 2005 Kent Boortz From e27cb111cd1c451dcba8111c2ed1ca97037dd5ad Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Oct 2005 22:00:12 +0200 Subject: [PATCH 4/4] mysql.spec.sh: Made yaSSL support an option (off by default) support-files/mysql.spec.sh: Made yaSSL support an option (off by default) --- support-files/mysql.spec.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 65d74474386..265f576cd86 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -1,8 +1,15 @@ %define mysql_version @VERSION@ + # use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x) # to enable static linking (off by default) %{?_with_static:%define STATIC_BUILD 1} %{!?_with_static:%define STATIC_BUILD 0} + +# use "rpmbuild --with yassl" or "rpm --define '_with_yassl 1'" (for RPM 3.x) +# to build with yaSSL support (off by default) +%{?_with_yassl:%define YASSL_BUILD 1} +%{!?_with_yassl:%define YASSL_BUILD 0} + %if %{STATIC_BUILD} %define release 0 %else @@ -239,7 +246,9 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --with-unix-socket-path=/var/lib/mysql/mysql.sock \ --prefix=/ \ --with-extra-charsets=complex \ +%if %{YASSL_BUILD} --with-yassl \ +%endif --exec-prefix=%{_exec_prefix} \ --libexecdir=%{_sbindir} \ --libdir=%{_libdir} \ @@ -687,6 +696,10 @@ fi %changelog * Wed Oct 19 2005 Kent Boortz +- Made yaSSL support an option (off by default) + +* Wed Oct 19 2005 Kent Boortz + - Enabled yaSSL support * Sat Oct 15 2005 Kent Boortz