Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0

into hundin.mysql.fi:/home/heikki/mysql-5.0

Build-tools/Do-compile

@@ -377,8 +377,8 @@ system("cd $pwd/$host; perl $ENV{HOME}/my_md5sum $tar_file_lite > ${tar_file_lit
 #
 # Unpack the binary distribution
 #
-if ($opt_stage <= 4 && !$opt_no_test)
 $global_step= "extract binary distribution";
+if ($opt_stage <= 4 && !$opt_no_test)
 {
   log_timestamp("START");
   rm_all(<$pwd/$host/test/*>);
@@ -396,8 +396,8 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .
 #
 # Run the test suite
 #
-if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
 $global_step= "tests in default mode";
+if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
 {
   log_timestamp("START");
   my $flags= "";

client/mysqltest.c

@@ -1695,7 +1695,11 @@ int safe_connect(MYSQL* con, const char* host, const char* user,
     }
     sleep(CON_RETRY_SLEEP);
   }
-  con->reconnect= 1; /* TODO: change this to 0 in future versions */
+  /*
+   TODO: change this to 0 in future versions, but the 'kill' test relies on
+   existing behavior
+  */
+  con->reconnect= 1;
   return con_error;
 }
 
@@ -1790,6 +1794,12 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host,
     goto err;
   }
 
+  /*
+   TODO: change this to 0 in future versions, but the 'kill' test relies on
+   existing behavior
+  */
+  con->reconnect= 1;
+
   if (record)
   {
     if (!q->record_file[0] && !result_file)

libmysql/libmysql.c

@@ -4144,7 +4144,8 @@ static my_bool is_binary_compatible(enum enum_field_types type1,
     range4[]= { MYSQL_TYPE_ENUM, MYSQL_TYPE_SET, MYSQL_TYPE_TINY_BLOB,
                 MYSQL_TYPE_MEDIUM_BLOB, MYSQL_TYPE_LONG_BLOB, MYSQL_TYPE_BLOB,
                 MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_STRING, MYSQL_TYPE_GEOMETRY,
-                MYSQL_TYPE_DECIMAL, MYSQL_TYPE_NULL },
+                MYSQL_TYPE_DECIMAL, MYSQL_TYPE_NULL };
+  static const enum enum_field_types
    *range_list[]= { range1, range2, range3, range4 },
    **range_list_end= range_list + sizeof(range_list)/sizeof(*range_list);
    const enum enum_field_types **range, *type;

libmysqld/examples/Makefile.am

@@ -15,7 +15,7 @@ link_sources:
 	done;
 
 DEFS = 		-DEMBEDDED_LIBRARY
-INCLUDES =	@MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
+INCLUDES =	-I$(top_srcdir)/include -I$(srcdir) \
 		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
 		-I$(top_builddir)/include $(openssl_includes)
 LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@

mysql-test/r/func_gconcat.result

@@ -166,7 +166,7 @@ set group_concat_max_len = 1024;
 select group_concat(sum(a)) from t1 group by grp;
 ERROR HY000: Invalid use of group function
 select grp,group_concat(c order by 2) from t1 group by grp;
-ERROR 42S22: Unknown column '2' in 'group statement'
+ERROR 42S22: Unknown column '2' in 'order clause'
 drop table t1;
 create table t1 ( URL_ID int(11), URL varchar(80));
 create table t2 ( REQ_ID int(11), URL_ID int(11));

mysql-test/r/sp.result

@@ -2778,25 +2778,3 @@ a
 drop procedure bug8937|
 delete from t1|
 drop table t1,t2;
-drop procedure if exists sp1;
-create table t1 (a int) engine=innodb|
-create procedure sp1 ()
-begin
-truncate table t1; insert t1 values (1); rollback;
-end
-|
-set autocommit=0;
-insert t1 values (2);
-call sp1();
-ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
-commit;
-set autocommit=1;
-select * from t1;
-a
-2
-call sp1();
-select * from t1;
-a
-1
-drop table t1;
-drop procedure sp1;

mysql-test/r/sp_trans.result

+drop procedure if exists sp1;
+create table t1 (a int) engine=innodb|
+create procedure sp1 ()
+begin
+truncate table t1; insert t1 values (1); rollback;
+end|
+set autocommit=0;
+insert t1 values (2);
+call sp1();
+ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+commit;
+select * from t1;
+a
+2
+call sp1();
+ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+set autocommit=1;
+select * from t1;
+a
+2
+drop table t1;
+drop procedure sp1;

mysql-test/t/sp.test

@@ -5,6 +5,8 @@
 # things that will not run in a single debugged mysqld
 # process (e.g. master-slave things).
 
+-- source include/have_innodb.inc
+
 use test;
 
 --disable_warnings
@@ -3390,28 +3392,3 @@ delete from t1|
 delimiter ;|
 drop table t1,t2;
 
-#
-# BUG#8850
-#
---disable_warnings
-drop procedure if exists sp1;
---enable_warnings
-delimiter |;
-create table t1 (a int) engine=innodb|
-create procedure sp1 ()
-begin
-  truncate table t1; insert t1 values (1); rollback;
-end
-|
-delimiter ;|
-set autocommit=0;
-insert t1 values (2);
---error 1192
-call sp1();
-commit;
-set autocommit=1;
-select * from t1;
-call sp1();
-select * from t1;
-drop table t1;
-drop procedure sp1;

mysql-test/t/sp_trans.test

+#
+# tests that require InnoDB...
+#
+
+-- source include/have_innodb.inc
+
+#
+# BUG#8850
+#
+--disable_warnings
+drop procedure if exists sp1;
+--enable_warnings
+delimiter |;
+create table t1 (a int) engine=innodb|
+create procedure sp1 ()
+begin
+  truncate table t1; insert t1 values (1); rollback;
+end|
+delimiter ;|
+set autocommit=0;
+insert t1 values (2);
+--error 1192
+call sp1();
+commit;
+select * from t1;
+#
+# when CALL will be fixed to not start a transaction, the error should
+# go away
+--error 1192
+call sp1();
+set autocommit=1;
+select * from t1;
+drop table t1;
+drop procedure sp1;
+

sql/item_sum.h

@@ -834,27 +834,8 @@ class MYSQL_ERROR;
 
 class Item_func_group_concat : public Item_sum
 {
-  THD *item_thd;
   TMP_TABLE_PARAM *tmp_table_param;
-  uint max_elements_in_tree;
   MYSQL_ERROR *warning;
-  uint key_length;
-  bool tree_mode;
-  bool distinct;
-  bool warning_for_row;
-  bool always_null;
-
-  friend int group_concat_key_cmp_with_distinct(void* arg, byte* key1,
-					      byte* key2);
-  friend int group_concat_key_cmp_with_order(void* arg, byte* key1,
-					     byte* key2);
-  friend int group_concat_key_cmp_with_distinct_and_order(void* arg,
-							byte* key1,
-							byte* key2);
-  friend int dump_leaf_key(byte* key, uint32 count __attribute__((unused)),
-			   Item_func_group_concat *group_concat_item);
-
- public:
   String result;
   String *separator;
   TREE tree_base;
@@ -862,22 +843,34 @@ class Item_func_group_concat : public Item_sum
   TABLE *table;
   ORDER **order;
   TABLE_LIST *tables_list;
-  ulong group_concat_max_len;
-  uint arg_count_order;
-  uint arg_count_field;
-  uint field_list_offset;
+  uint arg_count_order;               // total count of ORDER BY items
+  uint arg_count_field;               // count of arguments
   uint count_cut_values;
+  bool distinct;
+  bool warning_for_row;
+  bool always_null;
   /*
     Following is 0 normal object and pointer to original one for copy
     (to correctly free resources)
   */
   Item_func_group_concat *original;
 
+  friend int group_concat_key_cmp_with_distinct(void* arg, byte* key1,
+					      byte* key2);
+  friend int group_concat_key_cmp_with_order(void* arg, byte* key1,
+					     byte* key2);
+  friend int group_concat_key_cmp_with_distinct_and_order(void* arg,
+							byte* key1,
+							byte* key2);
+  friend int dump_leaf_key(byte* key, uint32 count __attribute__((unused)),
+			   Item_func_group_concat *group_concat_item);
+
+public:
   Item_func_group_concat(bool is_distinct,List<Item> *is_select,
                          SQL_LIST *is_order,String *is_separator);
 
   Item_func_group_concat(THD *thd, Item_func_group_concat *item);
-  ~Item_func_group_concat();
+  ~Item_func_group_concat() {}
   void cleanup();
 
   enum Sumfunctype sum_func () const {return GROUP_CONCAT_FUNC;}
@@ -885,11 +878,11 @@ class Item_func_group_concat : public Item_sum
   virtual Item_result result_type () const { return STRING_RESULT; }
   void clear();
   bool add();
-  void reset_field();
+  void reset_field() {}                         // not used
+  void update_field() {}                        // not used
   bool fix_fields(THD *, TABLE_LIST *, Item **);
   bool setup(THD *thd);
   void make_unique();
-  virtual void update_field() {}
   double val_real()
   {
     String *res;  res=val_str(&str_value);

sql/sql_parse.cc

@@ -3633,10 +3633,10 @@ mysql_execute_command(THD *thd)
       while ((user=user_list++))
       {
 	if (user->password.str &&
-	    strcmp(thd->user, user->user.str) ||
+	    (strcmp(thd->user, user->user.str) ||
 	     user->host.str &&
 	     my_strcasecmp(system_charset_info,
-			  user->host.str, thd->host_or_ip))
+			   user->host.str, thd->host_or_ip)))
 	{
 	  if (check_access(thd, UPDATE_ACL, "mysql", 0, 1, 0))
 	    goto error;

tests/mysql_client_test.c

@@ -10976,7 +10976,7 @@ static void test_view_insert()
   MYSQL_STMT *insert_stmt, *select_stmt;
   int rc, i;
   MYSQL_BIND      bind[1];
-  long            my_val = 0L;
+  int             my_val = 0;
   ulong           my_length = 0L;
   long            my_null = 0L;
   const char *query=