Merge with 4.1

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
vio/viosocket.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  simple merge
sql/field.cc:
  simple merge
sql/item.h:
  simple merge
sql/sql_lex.h:
  simple merge
sql/sql_yacc.yy:
  Merge
  (join_table_list was not comptely merged. Need to run test to know how things works...)
sql/table.cc:
  Keep code from 5.0, except delted one not needed line
strings/ctype-ucs2.c:
  Auto merge

28 files changed, 231 insertions, 78 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index e519dbb1de2..76027180194 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -222,6 +222,7 @@ serg@sergbook.mysql.com
 sergefp@mysql.com
 sinisa@rhols221.adsl.netsonic.fi
 stewart@mysql.com
+svoj@mysql.com
 tfr@beta.frontier86.ee
 tfr@indrek.tfr.cafe.ee
 tfr@sarvik.tfr.cafe.ee
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 30238c06b93..4e0135fa822 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -62,7 +62,6 @@ From: $FROM
 To: $INTERNALS
 Subject: bk commit into $VERSION tree ($CHANGESET)$BS
 $BH
-
 Below is the list of changes that have just been committed into a local
 $VERSION repository of $USER. When $USER does a push these changes will
 be propagated to the main repository and, within 24 hours after the
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc
index 7d83023abd5..2d3d82b7952 100644
--- a/libmysqld/emb_qcache.cc
+++ b/libmysqld/emb_qcache.cc
@@ -71,9 +71,11 @@ void Querycache_stream::store_int(uint i)
     cur_data+= 4;
     return;
   }
-  memcpy(cur_data, &i, rest_len);
+  char buf[4];
+  int4store(buf, i);
+  memcpy(cur_data, buf, rest_len);
   use_next_block();
-  memcpy(cur_data, ((byte*)&i)+rest_len, 4-rest_len);
+  memcpy(cur_data, buf+rest_len, 4-rest_len);
   cur_data+= 4-rest_len;
 }
 
@@ -186,10 +188,12 @@ uint Querycache_stream::load_int()
     cur_data+= 4;
     return result;
   }
-  memcpy(&result, cur_data, rest_len);
+  char buf[4];
+  memcpy(buf, cur_data, rest_len);
   use_next_block();
-  memcpy(((byte*)&result)+rest_len, cur_data, 4-rest_len);
+  memcpy(buf+rest_len, cur_data, 4-rest_len);
   cur_data+= 4-rest_len;
+  result= uint4korr(buf);
   return result;
 }
 
@@ -270,10 +274,10 @@ int Querycache_stream::load_column(MEM_ROOT *alloc, char** column)
     return 0;
   }
   len--;
-  if (!(*column= (char *)alloc_root(alloc, len + 4 + 1)))
+  if (!(*column= (char *)alloc_root(alloc, len + sizeof(uint) + 1)))
     return 1;
-  int4store(*column, len);
-  (*column)+= 4;
+  *((uint*)*column)= len;
+  (*column)+= sizeof(uint);
   load_str_only(*column, len);
   return 1;
 }
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index a5b4439a57f..6236f837c42 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -436,32 +436,24 @@ static int _ftb_strstr(const byte *s0, const byte *e0,
                 const byte *s1, const byte *e1,
                 CHARSET_INFO *cs)
 {
-  const byte *p0, *p1;
-  my_bool s_after, e_before;
-
-  s_after=true_word_char(cs, s1[0]);
-  e_before=true_word_char(cs, e1[-1]);
-  p0=s0;
+  const byte *p0= s0;
+  my_bool s_after= true_word_char(cs, s1[0]);
+  my_bool e_before= true_word_char(cs, e1[-1]);
+  uint p0_len;
+  my_match_t m[2];
 
   while (p0 < e0)
   {
-    while (p0 < e0 && cs->to_upper[(uint) (uchar) *p0++] !=
-           cs->to_upper[(uint) (uchar) *s1])
-      /* no-op */;
-    if (p0 >= e0)
-      return 0;
-
-    if (s_after && p0-1 > s0 && true_word_char(cs, p0[-2]))
-      continue;
-
-    p1=s1+1;
-    while (p0 < e0 && p1 < e1 && cs->to_upper[(uint) (uchar) *p0] ==
-           cs->to_upper[(uint) (uchar) *p1])
-      p0++, p1++;
-    if (p1 == e1 && (!e_before || p0 == e0 || !true_word_char(cs, p0[0])))
-      return 1;
+    if (cs->coll->instr(cs, p0, e0 - p0, s1, e1 - s1, m, 2) != 2)
+      return(0);
+    if ((!s_after || p0 + m[1].beg == s0 || !true_word_char(cs, p0[m[1].beg-1])) &&
+        (!e_before || p0 + m[1].end == e0 || !true_word_char(cs, p0[m[1].end])))
+      return(1);
+    p0+= m[1].beg;
+    p0+= (p0_len= my_mbcharlen(cs, *(uchar *)p0)) ? p0_len : 1;
   }
-  return 0;
+
+  return(0);
 }
 
 
diff --git a/myisam/mi_preload.c b/myisam/mi_preload.c
index 5e03d489efe..317ab4ad7fe 100644
--- a/myisam/mi_preload.c
+++ b/myisam/mi_preload.c
@@ -71,15 +71,15 @@ int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves)
 
   if (flush_key_blocks(share->key_cache,share->kfile, FLUSH_RELEASE))
     goto err;
- 
+
   do
   {
     /* Read the next block of index file into the preload buffer */
     if ((my_off_t) length > (key_file_length-pos))
       length= (ulong) (key_file_length-pos);
-    if (my_pread(share->kfile, (byte*) buff, length, pos, MYF(MY_FAE)))
+    if (my_pread(share->kfile, (byte*) buff, length, pos, MYF(MY_FAE|MY_FNABP)))
       goto err;
-          
+
     if (ignore_leaves)
     {
       uchar *end= buff+length;
@@ -88,7 +88,7 @@ int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves)
         if (mi_test_if_nod(buff))
         {
           if (key_cache_insert(share->key_cache,
-                               share->kfile, pos, DFLT_INIT_HITS, 
+                               share->kfile, pos, DFLT_INIT_HITS,
                               (byte*) buff, block_length))
 	    goto err;
 	}
diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
index fe2d76c8ab3..7302ff930ae 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -624,3 +624,17 @@ ucs2_bin	00610009
 ucs2_bin	0061
 ucs2_bin	00610020
 drop table t1;
+SET NAMES latin1;
+SET collation_connection='ucs2_swedish_ci';
+CREATE TABLE t1 (Field1 int(10) default '0');
+INSERT INTO t1 VALUES ('-1');
+SELECT * FROM t1;
+Field1
+-1
+DROP TABLE t1;
+CREATE TABLE t1 (Field1 int(10) unsigned default '0');
+INSERT INTO t1 VALUES ('-1');
+Warnings:
+Warning	1265	Data truncated for column 'Field1' at row 1
+DROP TABLE t1;
+SET NAMES latin1;
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index f50cae79608..77325c4e88b 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -408,3 +408,10 @@ insert t1 values (1, "aaaa"), (2, "bbbb");
 insert t2 values (10, "aaaa"), (2, "cccc");
 replace t1 select * from t2;
 drop table t1, t2;
+CREATE TABLE t1 (t VARCHAR(200) CHARACTER SET utf8 COLLATE utf8_unicode_ci, FULLTEXT (t));
+SET NAMES latin1;
+INSERT INTO t1 VALUES('Mit freundlichem Grüß aus Osnabrück');
+SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabrück"' IN BOOLEAN MODE);
+COUNT(*)
+1
+DROP TABLE t1;
diff --git a/mysql-test/r/preload.result b/mysql-test/r/preload.result
index f0b99a8d6f1..7237a0da7e0 100644
--- a/mysql-test/r/preload.result
+++ b/mysql-test/r/preload.result
@@ -74,15 +74,15 @@ Table	Op	Msg_type	Msg_text
 test.t1	preload_keys	status	OK
 show status like "key_read%";
 Variable_name	Value
-Key_read_requests	0
-Key_reads	0
+Key_read_requests	581
+Key_reads	581
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
 show status like "key_read%";
 Variable_name	Value
-Key_read_requests	217
-Key_reads	45
+Key_read_requests	798
+Key_reads	581
 flush tables;
 flush status;
 show status like "key_read%";
@@ -98,15 +98,15 @@ Table	Op	Msg_type	Msg_text
 test.t1	preload_keys	status	OK
 show status like "key_read%";
 Variable_name	Value
-Key_read_requests	0
-Key_reads	0
+Key_read_requests	10
+Key_reads	10
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
 show status like "key_read%";
 Variable_name	Value
-Key_read_requests	217
-Key_reads	45
+Key_read_requests	227
+Key_reads	52
 flush tables;
 flush status;
 show status like "key_read%";
@@ -123,8 +123,8 @@ test.t1	preload_keys	status	OK
 test.t2	preload_keys	status	OK
 show status like "key_read%";
 Variable_name	Value
-Key_read_requests	0
-Key_reads	0
+Key_read_requests	587
+Key_reads	587
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
@@ -133,8 +133,8 @@ count(*)
 2584
 show status like "key_read%";
 Variable_name	Value
-Key_read_requests	351
-Key_reads	73
+Key_read_requests	938
+Key_reads	613
 flush tables;
 flush status;
 show status like "key_read%";
@@ -147,8 +147,8 @@ test.t3	preload_keys	error	Table 'test.t3' doesn't exist
 test.t2	preload_keys	status	OK
 show status like "key_read%";
 Variable_name	Value
-Key_read_requests	0
-Key_reads	0
+Key_read_requests	355
+Key_reads	355
 flush tables;
 flush status;
 show status like "key_read%";
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 5a60ef8abfb..663793e0b5e 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -1173,3 +1173,25 @@ show columns from t4;
 Field	Type	Null	Key	Default	Extra
 sdate	date	YES		NULL	
 drop table t1, t2, t3, t4;
+create table t1 (a int not null, b char (10) not null);
+insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c');
+select * from ((select * from t1 limit 1)) a;
+a	b
+1	a
+select * from ((select * from t1 limit 1) union (select * from t1 limit 1)) a;
+a	b
+1	a
+select * from ((select * from t1 limit 1) union (select * from t1 limit 1) union (select * from t1 limit 1)) a;
+a	b
+1	a
+select * from ((((select * from t1))) union (select * from t1) union (select * from t1)) a;
+a	b
+1	a
+2	b
+3	c
+select * from ((select * from t1) union (((select * from t1))) union (select * from t1)) a;
+a	b
+1	a
+2	b
+3	c
+drop table t1;
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
index 4780f51ebaa..954c4a8d8ab 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -392,3 +392,24 @@ SET collation_connection='ucs2_general_ci';
 SET NAMES latin1;
 SET collation_connection='ucs2_bin';
 -- source include/ctype_filesort.inc
+
+SET NAMES latin1;
+#
+# Bug#8235
+#
+# This bug also helped to find another problem that
+# INSERT of a UCS2 string containing a negative number
+# into a unsigned int column didn't produce warnings.
+# This test covers both problems.
+#
+SET collation_connection='ucs2_swedish_ci';
+CREATE TABLE t1 (Field1 int(10) default '0');
+# no warnings, negative numbers are allowed
+INSERT INTO t1 VALUES ('-1');
+SELECT * FROM t1;
+DROP TABLE t1;
+CREATE TABLE t1 (Field1 int(10) unsigned default '0');
+# this should generate a "Data truncated" warning
+INSERT INTO t1 VALUES ('-1');
+DROP TABLE t1;
+SET NAMES latin1;
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 62dcecaff68..50d01da080f 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -322,3 +322,11 @@ insert t2 values (10, "aaaa"), (2, "cccc");
 replace t1 select * from t2;
 drop table t1, t2;
 
+#
+# bug#8351
+#
+CREATE TABLE t1 (t VARCHAR(200) CHARACTER SET utf8 COLLATE utf8_unicode_ci, FULLTEXT (t));
+SET NAMES latin1;
+INSERT INTO t1 VALUES('Mit freundlichem Grüß aus Osnabrück');
+SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabrück"' IN BOOLEAN MODE);
+DROP TABLE t1;
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index be6bc7a48d8..5ff22f1d6b6 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -717,3 +717,15 @@ union
 order by sdate;
 show columns from t4;
 drop table t1, t2, t3, t4;
+
+#
+# Bug #2435 UNION with parentheses not supported
+#
+create table t1 (a int not null, b char (10) not null); 
+insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c'); 
+select * from ((select * from t1 limit 1)) a;
+select * from ((select * from t1 limit 1) union (select * from t1 limit 1)) a;
+select * from ((select * from t1 limit 1) union (select * from t1 limit 1) union (select * from t1 limit 1)) a;
+select * from ((((select * from t1))) union (select * from t1) union (select * from t1)) a;
+select * from ((select * from t1) union (((select * from t1))) union (select * from t1)) a;
+drop table t1;
diff --git a/ndb/test/run-test/Makefile.am b/ndb/test/run-test/Makefile.am
index 127ef22f37c..6b3ba0bff09 100644
--- a/ndb/test/run-test/Makefile.am
+++ b/ndb/test/run-test/Makefile.am
@@ -10,7 +10,7 @@ test_DATA=daily-basic-tests.txt daily-devel-tests.txt
 test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
           atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh
 
-atrt_SOURCES = main.cpp
+atrt_SOURCES = main.cpp run-test.hpp
 INCLUDES_LOC = -I$(top_srcdir)/ndb/test/include
 LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.a \
 	    $(top_builddir)/ndb/src/libndbclient.la \
@@ -21,7 +21,7 @@ LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.a \
 wrappersdir=$(prefix)/bin
 wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run
 
-noinst_HEADERS = run-test.hpp $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT
+EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh
index 75ab48227f7..40525cb20ce 100644
--- a/scripts/mysql_create_system_tables.sh
+++ b/scripts/mysql_create_system_tables.sh
@@ -176,9 +176,7 @@ then
            INSERT INTO user (host,user) values ('localhost','');"
     else
       i_u="$i_u
-	   INSERT INTO user VALUES ('%','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-	   INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-	   INSERT INTO user VALUES ('%','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);"
+	   INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
     fi
   fi 
 fi
diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc
index b33b5102e69..ccc3ef713b8 100644
--- a/sql/examples/ha_archive.cc
+++ b/sql/examples/ha_archive.cc
@@ -115,6 +115,8 @@
   data - The data is stored in a "row +blobs" format.
 */
 
+/* If the archive storage engine has been inited */
+static bool archive_inited= 0;
 /* Variables for archive share methods */
 pthread_mutex_t archive_mutex;
 static HASH archive_open_tables;
@@ -158,6 +160,7 @@ static byte* archive_get_key(ARCHIVE_SHARE *share,uint *length,
 
 bool archive_db_init()
 {
+  archive_inited= 1;
   VOID(pthread_mutex_init(&archive_mutex, MY_MUTEX_INIT_FAST));
   return (hash_init(&archive_open_tables, system_charset_info, 32, 0, 0,
                     (hash_get_key) archive_get_key, 0, 0));
@@ -177,8 +180,12 @@ bool archive_db_init()
 
 bool archive_db_end()
 {
-  hash_free(&archive_open_tables);
-  VOID(pthread_mutex_destroy(&archive_mutex));
+  if (archive_inited)
+  {
+    hash_free(&archive_open_tables);
+    VOID(pthread_mutex_destroy(&archive_mutex));
+  }
+  archive_inited= 0;
   return FALSE;
 }
 
diff --git a/sql/field.cc b/sql/field.cc
index f51b06028f7..c1520653084 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -2432,6 +2432,13 @@ void Field_medium::sql_type(String &res) const
 ** long int
 ****************************************************************************/
 
+static bool test_if_minus(CHARSET_INFO *cs,
+                          const char *s, const char *e)
+{
+  my_wc_t wc;
+  return cs->cset->mb_wc(cs, &wc, (uchar*) s, (uchar*) e) > 0 && wc == '-';
+}
+
 
 int Field_long::store(const char *from,uint len,CHARSET_INFO *cs)
 {
@@ -2734,7 +2741,7 @@ int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs)
   from+= tmp;
   if (unsigned_flag)
   {
-    if (!len || *from == '-')
+    if (!len || test_if_minus(cs, from, from + len))
     {
       tmp=0;					// Set negative to 0
       error= 1;
diff --git a/sql/item.h b/sql/item.h
index e2e72dbee40..299bc6c081b 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -121,8 +121,7 @@ public:
   static void *operator new(size_t size, MEM_ROOT *mem_root)
   { return (void*) alloc_root(mem_root, (uint) size); }
   static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); }
-  static void operator delete(void *ptr,size_t size, MEM_ROOT *mem_root)
-  { TRASH(ptr, size); }
+  static void operator delete(void *ptr, MEM_ROOT *mem_root) {}
 
   enum Type {FIELD_ITEM, FUNC_ITEM, SUM_FUNC_ITEM, STRING_ITEM,
 	     INT_ITEM, REAL_ITEM, NULL_ITEM, VARBIN_ITEM,
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 02f33d39465..091de8e3a01 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1665,7 +1665,8 @@ String *Item_func_format::val_str(String *str)
 {
   DBUG_ASSERT(fixed == 1);
   double nr= args[0]->val_real();
-  uint32 diff,length,str_length;
+  int diff;
+  uint32 length, str_length;
   uint dec;
   if ((null_value=args[0]->null_value))
     return 0; /* purecov: inspected */
@@ -1690,9 +1691,12 @@ String *Item_func_format::val_str(String *str)
       pos[0]= pos[-(int) diff];
     while (diff)
     {
-      pos[0]=pos[-(int) diff]; pos--;
-      pos[0]=pos[-(int) diff]; pos--;
-      pos[0]=pos[-(int) diff]; pos--;
+      *pos= *(pos - diff);
+      pos--;
+      *pos= *(pos - diff);
+      pos--;
+      *pos= *(pos - diff);
+      pos--;
       pos[0]=',';
       pos--;
       diff--;
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index e38e417e6df..b2f7922f1db 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1438,7 +1438,7 @@ ulong Query_cache::init_cache()
     init();
   approx_additional_data_size = (sizeof(Query_cache) +
 				 sizeof(gptr)*(def_query_hash_size+
-					       def_query_hash_size));
+					       def_table_hash_size));
   if (query_cache_size < approx_additional_data_size)
     goto err;
 
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 32c9e2a50f7..0dae2d37062 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -767,6 +767,8 @@ struct Item_change_record: public ilink
   Item *old_value;
   /* Placement new was hidden by `new' in ilink (TODO: check): */
   static void *operator new(size_t size, void *mem) { return mem; }
+  static void operator delete(void *ptr, size_t size) {}
+  static void operator delete(void *ptr, void *mem) { /* never called */ }
 };
 
 
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 5d232d60e79..2dd885c3658 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -285,8 +285,7 @@ public:
   static void *operator new(size_t size, MEM_ROOT *mem_root)
   { return (void*) alloc_root(mem_root, (uint) size); }
   static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); }
-  static void operator delete(void *ptr,size_t size, MEM_ROOT *mem_root)
-  { TRASH(ptr, size); }
+  static void operator delete(void *ptr, MEM_ROOT *mem_root) {}
   st_select_lex_node(): linkage(UNSPECIFIED_TYPE) {}
   virtual ~st_select_lex_node() {}
   inline st_select_lex_node* get_master() { return master; }
diff --git a/sql/sql_list.h b/sql/sql_list.h
index 85da553f64a..55d9d668bdd 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -35,8 +35,8 @@ public:
   static void *operator new(size_t size, MEM_ROOT *mem_root)
   { return (void*) alloc_root(mem_root, (uint) size); }
   static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
-  static void operator delete(void *ptr, size_t size, MEM_ROOT *mem_root)
-  { TRASH(ptr, size); }
+  static void operator delete(void *ptr, MEM_ROOT *mem_root)
+  { /* never called */ }
   static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); }
 #ifdef HAVE_purify
   bool dummy;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 0a0258465fb..03aa640a139 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -708,12 +708,12 @@ static int check_connection(THD *thd)
 {
   uint connect_errors= 0;
   NET *net= &thd->net;
+  ulong pkt_len= 0;
+  char *end;
 
   DBUG_PRINT("info",
              ("New connection received on %s", vio_description(net->vio)));
 
-  vio_in_addr(net->vio,&thd->remote.sin_addr);
-
   if (!thd->host)                           // If TCP/IP connection
   {
     char ip[30];
@@ -723,6 +723,7 @@ static int check_connection(THD *thd)
     if (!(thd->ip= my_strdup(ip,MYF(0))))
       return (ER_OUT_OF_RESOURCES);
     thd->host_or_ip= thd->ip;
+    vio_in_addr(net->vio,&thd->remote.sin_addr);
 #if !defined(HAVE_SYS_UN_H) || defined(HAVE_mit_thread)
     /* Fast local hostname resolve for Win32 */
     if (!strcmp(thd->ip,"127.0.0.1"))
@@ -758,10 +759,10 @@ static int check_connection(THD *thd)
     DBUG_PRINT("info",("Host: %s",thd->host));
     thd->host_or_ip= thd->host;
     thd->ip= 0;
+    /* Reset sin_addr */
+    bzero((char*) &thd->remote, sizeof(thd->remote));
   }
   vio_keepalive(net->vio, TRUE);
-  ulong pkt_len= 0;
-  char *end;
   {
     /* buff[] needs to big enough to hold the server_version variable */
     char buff[SERVER_VERSION_LENGTH + SCRAMBLE_LENGTH + 64];
diff --git a/sql/sql_string.h b/sql/sql_string.h
index a5c7cf77630..f9f0b1b6242 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -73,7 +73,7 @@ public:
   { return (void*) alloc_root(mem_root, (uint) size); }
   static void operator delete(void *ptr_arg,size_t size)
   { TRASH(ptr_arg, size); }
-  static void operator delete(void *ptr_arg,size_t size, MEM_ROOT *mem_root)
+  static void operator delete(void *ptr_arg, MEM_ROOT *mem_root)
   { TRASH(ptr_arg, size); }
   ~String() { free(); }
 
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index c4649c57269..37e1ef70b84 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3811,7 +3811,10 @@ select:
 select_init:
 	SELECT_SYM select_init2
 	|
-	'(' SELECT_SYM select_part2 ')'
+	'(' select_paren ')' union_opt;
+
+select_paren:
+	SELECT_SYM select_part2
 	  {
 	    LEX *lex= Lex;
             SELECT_LEX * sel= lex->current_select;
@@ -3830,7 +3833,8 @@ select_init:
 	    if (sel->master_unit()->fake_select_lex)
               sel->master_unit()->global_parameters=
                  sel->master_unit()->fake_select_lex;
-          } union_opt;
+          }
+	| '(' select_paren ')';
 
 select_init2:
 	select_part2
@@ -4990,7 +4994,7 @@ table_factor:
           }
 	| '{' ident table_ref LEFT OUTER JOIN_SYM table_ref ON expr '}'
 	  { add_join_on($7,$9); $7->outer_join|=JOIN_TYPE_LEFT; $$=$7; }
-        | '(' SELECT_SYM select_derived ')' opt_table_alias
+	| '(' select_derived union_opt ')' opt_table_alias
 	{
 	  LEX *lex=Lex;
 	  SELECT_LEX_UNIT *unit= lex->current_select->master_unit();
@@ -5004,6 +5008,24 @@ table_factor:
           lex->current_select->add_joined_table($$);           
 	};
 
+
+select_derived:
+	SELECT_SYM select_derived2
+	| '(' select_derived ')'
+	  {
+            SELECT_LEX *sel= Select;
+	    if (sel->set_braces(1))
+	    {
+	      yyerror(ER(ER_SYNTAX_ERROR));
+	      YYABORT;
+	    }
+            /* select in braces, can't contain global parameters */
+	    if (sel->master_unit()->fake_select_lex)
+              sel->master_unit()->global_parameters=
+                 sel->master_unit()->fake_select_lex;
+	  }
+ 	;
+
 select_derived:
         {
 	  LEX *lex= Lex;
@@ -5026,7 +5048,7 @@ select_derived:
 	{
 	  Select->parsing_place= NO_MATTER;
 	}
-	opt_select_from union_opt
+	opt_select_from
         ;
 
 opt_outer:
diff --git a/sql/table.cc b/sql/table.cc
index a78d245ba9d..69a132329c0 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -661,7 +661,6 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
 	    if (!(field->flags & BINARY_FLAG))
 	      keyinfo->flags|= HA_END_SPACE_KEY;
 	  }
-          set_if_bigger(share->max_key_length, keyinfo->key_length);
 	  if (field->type() == MYSQL_TYPE_BIT)
             key_part->key_part_flag|= HA_BIT_PART;
 
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 35f49a34c80..a3f96a947a7 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1493,6 +1493,29 @@ my_bool my_like_range_ucs2(CHARSET_INFO *cs,
 }
 
 
+
+ulong my_scan_ucs2(CHARSET_INFO *cs __attribute__((unused)),
+                   const char *str, const char *end, int sequence_type)
+{
+  const char *str0= str;
+  end--; /* for easier loop condition, because of two bytes per character */
+  
+  switch (sequence_type)
+  {
+  case MY_SEQ_SPACES:
+    for ( ; str < end; str+= 2)
+    {
+      if (str[0] != '\0' || str[1] != ' ')
+        break;
+    }
+    return str - str0;
+  default:
+    return 0;
+  }
+}
+
+
+
 static MY_COLLATION_HANDLER my_collation_ucs2_general_ci_handler =
 {
     NULL,		/* init */
@@ -1549,7 +1572,7 @@ MY_CHARSET_HANDLER my_charset_ucs2_handler=
     my_strntoull_ucs2,
     my_strntod_ucs2,
     my_strtoll10_ucs2,
-    my_scan_8bit
+    my_scan_ucs2
 };
 
 
diff --git a/vio/viosocket.c b/vio/viosocket.c
index 3064a01f0f8..43bd4e82013 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -272,6 +272,18 @@ my_bool vio_peer_addr(Vio * vio, char *buf, uint16 *port)
 }
 
 
+/*
+  Get in_addr for a TCP/IP connection
+
+  SYNOPSIS
+    vio_in_addr()
+    vio		vio handle
+    in		put in_addr here
+
+  NOTES
+    one must call vio_peer_addr() before calling this one
+*/
+
 void vio_in_addr(Vio *vio, struct in_addr *in)
 {
   DBUG_ENTER("vio_in_addr");