List:Commits« Previous MessageNext Message »
From:Sasha Pachev Date:January 31 2006 12:07pm
Subject:bk commit into 5.1 tree (sasha:1.2100)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of sasha. When sasha does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2100 06/01/31 05:07:48 sasha@stripped +2 -0
  post-merge fix

  mysql-test/r/mysqltest.result
    1.28 06/01/31 05:07:42 sasha@stripped +1 -0
    post-merge fix

  client/mysqltest.c
    1.176 06/01/31 05:07:42 sasha@stripped +21 -0
    post-merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-dev/mysql-5.1-new

--- 1.27/mysql-test/r/mysqltest.result	2006-01-30 20:58:13 -07:00
+++ 1.28/mysql-test/r/mysqltest.result	2006-01-31 05:07:42 -07:00
@@ -418,6 +418,7 @@
 select-me
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz error query' at line 1
 drop table t1;
+drop table t1;
 select "b" as col1, "c" as col2;
 col1	col2
 b	c

--- 1.175/client/mysqltest.c	2006-01-30 20:58:13 -07:00
+++ 1.176/client/mysqltest.c	2006-01-31 05:07:42 -07:00
@@ -246,6 +246,14 @@
 static void timer_output(void);
 static ulonglong timer_now(void);
 
+/* Precompiled re's */
+static my_regex_t ps_re;     /* the query can be run using PS protocol */
+static my_regex_t sp_re;     /* the query can be run as a SP */
+static my_regex_t view_re;   /* the query can be run as a view*/
+
+static void init_re(void);
+static int match_re(my_regex_t *, char *);
+static void free_re(void);
 
 static int reg_replace(char** buf_p, int* buf_len_p, char *pattern, char *replace, 
  char *string, int icase);
@@ -4345,6 +4353,19 @@
 end:
   free_replace();
   free_replace_regex();
+  
+  if (!disable_warnings)
+  {
+    dynstr_free(&ds_prepare_warnings);
+    dynstr_free(&ds_execute_warnings);
+  }
+
+  /*
+    We save the return code (mysql_stmt_errno(stmt)) from the last call sent
+    to the server into the mysqltest builtin variable $mysql_errno. This
+    variable then can be used from the test case itself.
+  */
+  
   var_set_errno(mysql_stmt_errno(stmt));
 #ifndef BUG15518_FIXED
   mysql_stmt_close(stmt);
Thread
bk commit into 5.1 tree (sasha:1.2100)Sasha Pachev31 Jan