Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

client/mysqltest.c

@@ -1901,6 +1901,22 @@ void reject_dump(const char* record_file, char* buf, int size)
   str_to_file(fn_format(reject_file, record_file,"",".reject",2), buf, size);
 }
 
+
+/* Append the string to ds, with optional replace */
+
+static void replace_dynstr_append_mem(DYNAMIC_STRING *ds, char *val, int len)
+{
+  if (glob_replace)
+  {
+    len=(int) replace_strings(glob_replace, &out_buff, &out_length, val);
+    if (len == -1)
+      die("Out of memory in replace\n");
+    val=out_buff;
+  }
+  dynstr_append_mem(ds, val, len);
+}
+
+
 /*
 * flags control the phased/stages of query execution to be performed 
 * if QUERY_SEND bit is on, the query will be sent. If QUERY_REAP is on
@@ -1976,7 +1992,8 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
 	  if (i == 0 && q->expected_errors == 1)
 	  {
 	    /* Only log error if there is one possible error */
-	    dynstr_append(ds,mysql_error(mysql));
+	    replace_dynstr_append_mem(ds,mysql_error(mysql),
+				      strlen(mysql_error(mysql)));
 	    dynstr_append_mem(ds,"\n",1);
 	  }
 	  /* Don't log error if we may not get an error */
@@ -1987,14 +2004,16 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
       }
       if (i)
       {
-	dynstr_append(ds,mysql_error(mysql));
+	replace_dynstr_append_mem(ds, mysql_error(mysql),
+				  strlen(mysql_error(mysql)));
 	dynstr_append_mem(ds,"\n",1);
 	verbose_msg("query '%s' failed with wrong errno %d instead of %d...",
 		    q->query, mysql_errno(mysql), q->expected_errno[0]);
 	error=1;
 	goto end;
       }
-      dynstr_append(ds,mysql_error(mysql));
+      replace_dynstr_append_mem(ds,mysql_error(mysql),
+				strlen(mysql_error(mysql)));
       dynstr_append_mem(ds,"\n",1);
       verbose_msg("query '%s' failed: %d: %s", q->query, mysql_errno(mysql),
 		  mysql_error(mysql));
@@ -2050,14 +2069,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
 
       if (i)
 	dynstr_append_mem(ds, "\t", 1);
-      if (glob_replace)
-      {
-	len=(int) replace_strings(glob_replace, &out_buff, &out_length, val);
-	if (len == -1)
-	  die("Out of memory in replace\n");
-	val=out_buff;
-      }
-      dynstr_append_mem(ds, val, len);
+      replace_dynstr_append_mem(ds, val, len);
     }
 
     dynstr_append_mem(ds, "\n", 1);

include/ft_global.h

@@ -47,9 +47,9 @@ struct st_ft_info {
 
 extern const char *ft_precompiled_stopwords[];
 
-extern uint ft_min_word_len;
-extern uint ft_max_word_len;
-extern uint ft_max_word_len_for_sort;
+extern ulong ft_min_word_len;
+extern ulong ft_max_word_len;
+extern ulong ft_max_word_len_for_sort;
 
 int ft_init_stopwords(const char **);
 void ft_free_stopwords(void);

myisam/ft_static.c

@@ -18,9 +18,9 @@
 
 #include "ftdefs.h"
 
-uint ft_min_word_len=4;
-uint ft_max_word_len=HA_FT_MAXLEN;
-uint ft_max_word_len_for_sort=20;
+ulong ft_min_word_len=4;
+ulong ft_max_word_len=HA_FT_MAXLEN;
+ulong ft_max_word_len_for_sort=20;
 
 const MI_KEYSEG ft_keysegs[FT_SEGS]={
 {

mysql-test/r/join.result

@@ -89,7 +89,7 @@ a
 1
 2
 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a);
-Too many tables. MySQL can only use 31 tables in a join
+Too many tables. MySQL can only use XX tables in a join
 drop table t1;
 CREATE TABLE t1 (
 a int(11) NOT NULL,

mysql-test/t/join.test

 #
 # This failed for lia Perminov
 #
-eval_result; # because MAX_TABLES is different on 64-bit system
 drop table if exists t1,t2;
 create table t1 (id int primary key);
 create table t2 (id int);
@@ -86,6 +85,7 @@ drop table t1, t2;
 create table t1 (a int primary key);
 insert into t1 values(1),(2);
 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a);
+--replace_result 31 XX 63 XX
 --error 1116
 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a);
 drop table t1;