Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

.bzrignore

@@ -1734,6 +1734,7 @@ netware/.deps/my_manage.Po
 netware/.deps/mysql_install_db.Po
 netware/.deps/mysql_test_run.Po
 netware/.deps/mysqld_safe.Po
+netware/libmysql.imp
 pack_isam/*.ds?
 perror/*.ds?
 perror/*.vcproj

client/mysqltest.c

@@ -1784,6 +1784,7 @@ int do_save_master_pos()
 
 int do_let(struct st_query *query)
 {
+  int ret;
   char *p= query->first_argument;
   char *var_name, *var_name_end;
   DYNAMIC_STRING let_rhs_expr;
@@ -1813,8 +1814,11 @@ int do_let(struct st_query *query)
 
   query->last_argument= query->end;
   /* Assign var_val to var_name */
-  return var_set(var_name, var_name_end, let_rhs_expr.str, 
+  ret= var_set(var_name, var_name_end, let_rhs_expr.str, 
                  (let_rhs_expr.str + let_rhs_expr.length));
+  dynstr_free(&let_rhs_expr);
+
+  return(ret);
 }
 
 

extra/yassl/CMakeLists.txt

 ADD_DEFINITIONS("-DWIN32 -D_LIB -DYASSL_PREFIX")
 
-INCLUDE_DIRECTORIES(include taocrypt/include mySTL)
+INCLUDE_DIRECTORIES(include taocrypt/include taocrypt/mySTL)
 ADD_LIBRARY(yassl src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp 
 				src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp 
 				src/yassl_imp.cpp src/yassl_int.cpp)

extra/yassl/taocrypt/CMakeLists.txt

-INCLUDE_DIRECTORIES(../mySTL include)
+INCLUDE_DIRECTORIES(mySTL include)
 
 ADD_LIBRARY(taocrypt src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp 
 				src/des.cpp src/dh.cpp src/dsa.cpp src/file.cpp src/hash.cpp src/integer.cpp src/md2.cpp 

mysql-test/include/wait_until_connected_again.inc

@@ -3,7 +3,7 @@
 # server has been restored or timeout occurs
 --disable_result_log
 --disable_query_log
-let $counter= 100;
+let $counter= 500;
 while ($mysql_errno)
 {
   --error 0,2002,2006

mysql-test/mysql-test-run.pl

@@ -268,7 +268,7 @@ our $opt_sleep_time_for_delete=    10;
 our $opt_testcase_timeout;
 our $opt_suite_timeout;
 my  $default_testcase_timeout=     15; # 15 min max
-my  $default_suite_timeout=       120; # 2 hours max
+my  $default_suite_timeout=       180; # 3 hours max
 
 our $opt_socket;
 

netware/Makefile.am

@@ -50,8 +50,20 @@ link_sources:
 	  @LN_CP_F@ $(srcdir)/$$org ../$$f; \
 	done
 else
-EXTRA_DIST=	comp_err.def init_db.sql install_test_db.ncf \
-		libmysql.def libmysql.imp \
+
+BUILT_SOURCES =                 libmysql.imp
+DISTCLEANFILES =                $(BUILT_SOURCES)
+
+# Create the libmysql.imp from libmysql/libmysql.def
+libmysql.imp: $(top_srcdir)/libmysql/libmysql.def
+	awk 'BEGIN{x=0;} \
+             END{printf("\n");} \
+             x==1 {printf(" %s",$$1); x++; next} \
+             x>1 {printf(",\n %s", $$1); next} \
+             /EXPORTS/{x=1}' $(top_srcdir)/libmysql/libmysql.def > libmysql.imp
+
+EXTRA_DIST=	$(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \
+		libmysql.def \
 		libmysqlmain.c my_manage.c my_manage.h \
 		my_print_defaults.def myisam_ftdump.def myisamchk.def \
 		myisamlog.def myisampack.def mysql.def mysql.xdc \

netware/libmysql.imp

-myodbc_remove_escape,
-mysql_add_slave,
-mysql_affected_rows,
-mysql_change_user,
-mysql_character_set_name,
-mysql_close,
-mysql_data_seek,
-mysql_debug,
-mysql_disable_reads_from_master,
-mysql_disable_rpl_parse,
-mysql_dump_debug_info,
-mysql_enable_reads_from_master,
-mysql_enable_rpl_parse,
-mysql_eof,
-mysql_errno,
-mysql_error,
-mysql_escape_string,
-mysql_fetch_field,
-mysql_fetch_field_direct,
-mysql_fetch_fields,
-mysql_fetch_lengths,
-mysql_fetch_row,
-mysql_field_count,
-mysql_field_seek,
-mysql_field_tell,
-mysql_free_result,
-mysql_get_client_info,
-mysql_get_host_info,
-mysql_get_proto_info,
-mysql_get_server_info,
-mysql_info,
-mysql_init,
-mysql_insert_id,
-mysql_kill,
-mysql_list_dbs,
-mysql_list_fields,
-mysql_list_processes,
-mysql_list_tables,
-mysql_manager_close,
-mysql_manager_command,
-mysql_manager_connect,
-mysql_manager_fetch_line,
-mysql_manager_init,  
-mysql_master_query,
-mysql_master_send_query,
-mysql_num_fields,
-mysql_num_rows,
-mysql_odbc_escape_string,
-mysql_options,
-mysql_ping,
-mysql_query,
-mysql_read_query_result,
-mysql_reads_from_master_enabled,
-mysql_real_connect,
-mysql_real_escape_string,
-mysql_real_query,
-mysql_refresh,
-mysql_row_seek,
-mysql_row_tell,
-mysql_rpl_parse_enabled,
-mysql_rpl_probe,
-mysql_rpl_query_type,  
-mysql_select_db,
-mysql_send_query,
-mysql_server_end,
-mysql_server_init,
-mysql_set_master,
-mysql_shutdown,
-mysql_slave_query,
-mysql_slave_send_query,
-mysql_ssl_set,
-mysql_stat,
-mysql_store_result,
-mysql_thread_end,
-mysql_thread_id,
-mysql_thread_init,
-mysql_thread_safe,
-mysql_use_result,
-net_safe_read,
-#simple_command,
-mysql_connect,
-mysql_create_db,
-mysql_drop_db,
-
-