Commit 9163d93f authored by unknown's avatar unknown
Browse files

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

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

parents 98715089 923a80aa
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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
+5 −1
Original line number Diff line number Diff line
@@ -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);
}


+1 −1
Original line number Diff line number Diff line
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)
+1 −1
Original line number Diff line number Diff line
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 
+1 −1
Original line number Diff line number Diff line
@@ -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
Loading