Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


client/mysql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

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

mysql-test/mysql-test-run.pl

@@ -243,7 +243,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;

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

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

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,6 +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} \
@@ -684,6 +694,13 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Made yaSSL support an option (off by default)
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Enabled yaSSL support
 
 * Sat Oct 15 2005 Kent Boortz <kent@mysql.com>