diff --git a/.bzrignore b/.bzrignore
index 78d44a7704d..f497aa69ffd 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -206,6 +206,7 @@ config.h.in
 config.log
 config.status
 configure
+configure.lineno
 core
 core.2430
 db-*.*.*
@@ -214,6 +215,7 @@ depcomp
 extra/comp_err
 extra/my_print_defaults
 extra/mysql_install
+extra/mysql_waitpid
 extra/perror
 extra/replace
 extra/resolve_stack_dump
@@ -232,6 +234,7 @@ innobase/autom4te.cache/*
 innobase/autom4te.cache/output.0
 innobase/autom4te.cache/requests
 innobase/autom4te.cache/traces.0
+innobase/configure.lineno
 innobase/conftest.s1
 innobase/conftest.subs
 innobase/ib_config.h
@@ -499,6 +502,11 @@ stamp-h1
 strings/conf_to_src
 strings/ctype_autoconf.c
 strings/ctype_extra_sources.c
+support-files/MacOSX/Description.plist
+support-files/MacOSX/Info.plist
+support-files/MacOSX/StartupParameters.plist
+support-files/MacOSX/postinstall
+support-files/MacOSX/preinstall
 support-files/binary-configure
 support-files/my-huge.cnf
 support-files/my-large.cnf
@@ -522,11 +530,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-extra/mysql_waitpid
-support-files/MacOSX/Description.plist
-support-files/MacOSX/Info.plist
-support-files/MacOSX/StartupParameters.plist
-support-files/MacOSX/postinstall
-support-files/MacOSX/preinstall
-configure.lineno
-innobase/configure.lineno
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 4cf86eb31c7..1fe3dc86b35 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -27,7 +27,7 @@
 #define CLIENT_CAPABILITIES	(CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES)
 
 char server_version[SERVER_VERSION_LENGTH];
-uint32 server_id = 0;
+ulong server_id = 0;
 
 // needed by net_serv.c
 ulong bytes_sent = 0L, bytes_received = 0L;
diff --git a/configure.in b/configure.in
index 35a2e3702c1..dd6aa80d617 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,6 @@ SHARED_LIB_VERSION=12:0:0
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4
-MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
 MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"`
 F_PART=`echo $MYSQL_BASE_VERSION | sed -e "s|\.||g"| sed -e "s|[a-zA-Z]\+||"|sed -e "s|^\(..\)$|\\10|"`
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 04d2d9d12e4..0b2a0e3042c 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -218,6 +218,9 @@ int my_connect(my_socket s, const struct sockaddr *name, uint namelen,
    * implementations of select that don't adjust tv upon
    * failure to reflect the time remaining
    */
+#ifdef HAVE_POLL
+  return(0);
+#endif
   start_time = time(NULL);
   for (;;)
   {
diff --git a/mysql-test/r/ctype_latin1_de.result b/mysql-test/r/ctype_latin1_de.result
index e5ae6f249ee..b79bc67138c 100644
--- a/mysql-test/r/ctype_latin1_de.result
+++ b/mysql-test/r/ctype_latin1_de.result
@@ -1,93 +1,95 @@
 drop table if exists t1;
-create table t1 (a char (20) not null, b int not null auto_increment, index (a,b),index(b));
+create table t1 (a char (20) not null, b int not null auto_increment, index (a,b));
 insert into t1 (a) values ('ä'),('ac'),('ae'),('ad'),('Äc'),('aeb');
 insert into t1 (a) values ('üc'),('uc'),('ue'),('ud'),('Ü'),('ueb'),('uf');
 insert into t1 (a) values ('ö'),('oc'),('Öa'),('oe'),('od'),('Öc'),('oeb');
 insert into t1 (a) values ('s'),('ss'),('ß'),('ßb'),('ssa'),('ssc'),('ßa');
 insert into t1 (a) values ('eä'),('uü'),('öo'),('ää'),('ääa'),('aeae');
-insert into t1 (a) values ('q'),('a'),('u'),('o'),('é'),('É');
+insert into t1 (a) values ('q'),('a'),('u'),('o'),('é'),('É'),('a');
 select a,b from t1 order by a,b;
 a	b
-a	35
-ac	2
-ad	4
+a	1
+a	2
+ac	1
+ad	1
 ä	1
-ae	3
-ää	31
-aeae	33
-ääa	32
-aeb	6
-Äc	5
-é	38
-É	39
-eä	28
-o	37
-oc	15
-od	18
-ö	14
-oe	17
-Öa	16
-oeb	20
-Öc	19
-öo	30
-q	34
-s	21
-ss	22
-ß	23
-ssa	25
-ßa	27
-ßb	24
-ssc	26
-u	36
-uc	8
-ud	10
-ue	9
-Ü	11
-ueb	12
-üc	7
-uf	13
-uü	29
+ae	2
+ää	1
+aeae	2
+ääa	1
+aeb	1
+Äc	1
+é	1
+É	2
+eä	1
+o	1
+oc	1
+od	1
+ö	1
+oe	2
+Öa	1
+oeb	1
+Öc	1
+öo	1
+q	1
+s	1
+ss	1
+ß	2
+ssa	1
+ßa	2
+ßb	1
+ssc	1
+u	1
+uc	1
+ud	1
+ue	1
+Ü	2
+ueb	1
+üc	1
+uf	1
+uü	1
 select a,b from t1 order by upper(a),b;
 a	b
-a	35
-ac	2
-ad	4
+a	1
+a	2
+ac	1
+ad	1
 ä	1
-ae	3
-ää	31
-aeae	33
-ääa	32
-aeb	6
-Äc	5
-é	38
-É	39
-eä	28
-o	37
-oc	15
-od	18
-ö	14
-oe	17
-Öa	16
-oeb	20
-Öc	19
-öo	30
-q	34
-s	21
-ss	22
-ß	23
-ssa	25
-ßa	27
-ßb	24
-ssc	26
-u	36
-uc	8
-ud	10
-ue	9
-Ü	11
-ueb	12
-üc	7
-uf	13
-uü	29
+ae	2
+ää	1
+aeae	2
+ääa	1
+aeb	1
+Äc	1
+é	1
+É	2
+eä	1
+o	1
+oc	1
+od	1
+ö	1
+oe	2
+Öa	1
+oeb	1
+Öc	1
+öo	1
+q	1
+s	1
+ss	1
+ß	2
+ssa	1
+ßa	2
+ßb	1
+ssc	1
+u	1
+uc	1
+ud	1
+ue	1
+Ü	2
+ueb	1
+üc	1
+uf	1
+uü	1
 select a from t1 order by a desc;
 a
 uü
@@ -129,44 +131,46 @@ ae
 ad
 ac
 a
+a
 check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 select * from t1 where a like "ö%";
 a	b
-ö	14
-Öa	16
-Öc	19
-öo	30
+ö	1
+Öa	1
+Öc	1
+öo	1
 select * from t1 where a like binary "%É%";
 a	b
-É	39
+É	2
 select * from t1 where a like "%Á%";
 a	b
-a	35
-ac	2
-ad	4
-ae	3
-aeae	33
-ääa	32
-aeb	6
-Öa	16
-ssa	25
-ßa	27
+a	1
+a	2
+ac	1
+ad	1
+ae	2
+aeae	2
+ääa	1
+aeb	1
+Öa	1
+ssa	1
+ßa	2
 select * from t1 where a like "%U%";
 a	b
-u	36
-uc	8
-ud	10
-ue	9
-ueb	12
-uf	13
-uü	29
+u	1
+uc	1
+ud	1
+ue	1
+ueb	1
+uf	1
+uü	1
 select * from t1 where a like "%ss%";
 a	b
-ss	22
-ssa	25
-ssc	26
+ss	1
+ssa	1
+ssc	1
 drop table t1;
 select strcmp('ä','ae'),strcmp('ae','ä'),strcmp('aeq','äq'),strcmp('äq','aeq');
 strcmp('ä','ae')	strcmp('ae','ä')	strcmp('aeq','äq')	strcmp('äq','aeq')
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result
index c2230722aa6..582ab894233 100644
--- a/mysql-test/r/delete.result
+++ b/mysql-test/r/delete.result
@@ -24,3 +24,18 @@ create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a));
 insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27);
 delete from t1 where a=27;
 drop table t1;
+CREATE TABLE t1 (
+bool     char(0) default NULL,
+not_null varchar(20) binary NOT NULL default '',
+misc     integer not null,
+PRIMARY KEY  (not_null)
+) TYPE=MyISAM;
+INSERT INTO t1 VALUES (NULL,'a',4), (NULL,'b',5), (NULL,'c',6), (NULL,'d',7);
+select * from t1 where misc > 5 and bool is null;
+bool	not_null	misc
+NULL	c	6
+NULL	d	7
+delete   from t1 where misc > 5 and bool is null;
+select * from t1 where misc > 5 and bool is null;
+bool	not_null	misc
+drop table t1;
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index a921d75f20a..b71c6ada03f 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -1,4 +1,3 @@
-use test;
 drop table if exists t1,t2,t3,t4;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
index 38b264b96b9..4785f790069 100644
--- a/mysql-test/r/type_datetime.result
+++ b/mysql-test/r/type_datetime.result
@@ -78,3 +78,9 @@ EXPLAIN SELECT * FROM t1 WHERE expedition='0001-00-00 00:00:00';
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	expedition	expedition	8	const	1	Using where
 drop table t1;
+create table t1 (a datetime not null, b datetime not null);
+insert into t1 values (now(), now());
+insert into t1 values (now(), now());
+select * from t1 where a is null or b is null;
+a	b
+drop table t1;
diff --git a/mysql-test/t/ctype_latin1_de.test b/mysql-test/t/ctype_latin1_de.test
index e829005a229..4b96f5f5867 100644
--- a/mysql-test/t/ctype_latin1_de.test
+++ b/mysql-test/t/ctype_latin1_de.test
@@ -2,13 +2,13 @@
 # Test latin_de character set
 #
 drop table if exists t1;
-create table t1 (a char (20) not null, b int not null auto_increment, index (a,b),index(b));
+create table t1 (a char (20) not null, b int not null auto_increment, index (a,b));
 insert into t1 (a) values ('ä'),('ac'),('ae'),('ad'),('Äc'),('aeb');
 insert into t1 (a) values ('üc'),('uc'),('ue'),('ud'),('Ü'),('ueb'),('uf');
 insert into t1 (a) values ('ö'),('oc'),('Öa'),('oe'),('od'),('Öc'),('oeb');
 insert into t1 (a) values ('s'),('ss'),('ß'),('ßb'),('ssa'),('ssc'),('ßa');
 insert into t1 (a) values ('eä'),('uü'),('öo'),('ää'),('ääa'),('aeae');
-insert into t1 (a) values ('q'),('a'),('u'),('o'),('é'),('É');
+insert into t1 (a) values ('q'),('a'),('u'),('o'),('é'),('É'),('a');
 select a,b from t1 order by a,b;
 select a,b from t1 order by upper(a),b;
 select a from t1 order by a desc;
diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test
index 953e22cdd55..13fa617b3cf 100644
--- a/mysql-test/t/delete.test
+++ b/mysql-test/t/delete.test
@@ -35,3 +35,23 @@ create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a));
 insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27);
 delete from t1 where a=27;
 drop table t1;
+
+#
+# CHAR(0) bug - not actually DELETE bug, but anyway...
+#
+
+CREATE TABLE t1 (
+  bool     char(0) default NULL,
+  not_null varchar(20) binary NOT NULL default '',
+  misc     integer not null,
+  PRIMARY KEY  (not_null)
+) TYPE=MyISAM;
+
+INSERT INTO t1 VALUES (NULL,'a',4), (NULL,'b',5), (NULL,'c',6), (NULL,'d',7);
+
+select * from t1 where misc > 5 and bool is null;
+delete   from t1 where misc > 5 and bool is null;
+select * from t1 where misc > 5 and bool is null;
+
+drop table t1;
+
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index d9b75fca362..89cc2a57b30 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -6,8 +6,6 @@
 # Simple select test
 #
 
-use test;
-
 drop table if exists t1,t2,t3,t4;
 
 CREATE TABLE t1 (
diff --git a/mysql-test/t/type_datetime.test b/mysql-test/t/type_datetime.test
index a516bc89f99..f5103958979 100644
--- a/mysql-test/t/type_datetime.test
+++ b/mysql-test/t/type_datetime.test
@@ -59,3 +59,8 @@ INSERT INTO t1 (numfacture,expedition) VALUES ('1212','0001-00-00 00:00:00');
 SELECT * FROM t1 WHERE expedition='0001-00-00 00:00:00';
 EXPLAIN SELECT * FROM t1 WHERE expedition='0001-00-00 00:00:00';
 drop table t1;
+create table t1 (a datetime not null, b datetime not null);
+insert into t1 values (now(), now());
+insert into t1 values (now(), now());
+select * from t1 where a is null or b is null;
+drop table t1;
diff --git a/mysys/my_tempnam.c b/mysys/my_tempnam.c
index a652fae3574..d079b9f66a5 100644
--- a/mysys/my_tempnam.c
+++ b/mysys/my_tempnam.c
@@ -115,13 +115,19 @@ my_string my_tempnam(const char *dir, const char *pfx,
   old_env=(char**)environ;
   if (dir)
   {				/* Don't use TMPDIR if dir is given */
-    ((char**) environ)=(char**) temp_env;
+    /*
+      The following strange cast is required because the IBM compiler on AIX
+      doesn't allow us to cast the value of environ.
+      The cast of environ is needed as some systems doesn't allow us to
+      update environ with a char ** pointer. (const mismatch)
+    */
+    (*(char***) &environ)=(char**) temp_env;
     temp_env[0]=0;
   }
 #endif
   res=tempnam((char*) dir,(my_string) pfx); /* Use stand. dir with prefix */
 #if !defined(OS2) && !defined(__NETWARE__)
-  ((char**) environ)=(char**) old_env;
+  (*(char***) &environ)=(char**) old_env;
 #endif
   if (!res)
     DBUG_PRINT("error",("Got error: %d from tempnam",errno));
diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh
index 1ae2550d69d..aeca7aa311b 100644
--- a/sql-bench/crash-me.sh
+++ b/sql-bench/crash-me.sh
@@ -39,7 +39,7 @@
 # as such, and clarify ones such as "mediumint" with comments such as
 # "3-byte int" or "same as xxx".
 
-$version="1.60";
+$version="1.61";
 
 use DBI;
 use Getopt::Long;
@@ -74,7 +74,7 @@ usage() if ($opt_help || $opt_Information);
 version() && exit(0) if ($opt_version);
 
 $opt_suffix = '-'.$opt_suffix if (length($opt_suffix) != 0);
-$opt_config_file = "$pwd/$opt_dir/$opt_server$opt_suffix.cfg"  
+$opt_config_file = "$pwd/$opt_dir/$opt_server$opt_suffix.cfg"
   if (length($opt_config_file) == 0);
 $log_prefix='   ###';  # prefix for log lines in result file
 $safe_query_log='';
@@ -540,7 +540,7 @@ else
           "  Please start it and try again\n";
     exit 1;
   }
-  $dbh=safe_connect();
+  $dbh=retry_connect();
 }
 
 
@@ -2880,9 +2880,10 @@ As all used queries are legal according to some SQL standard. any
 reasonable SQL server should be able to run this test without any
 problems.
 
-All questions is cached in $opt_dir/'server_name'.cfg that future runs will use
-limits found in previous runs. Remove this file if you want to find the
-current limits for your version of the database server.
+All questions is cached in $opt_dir/'server_name'[-suffix].cfg that
+future runs will use limits found in previous runs. Remove this file
+if you want to find the current limits for your version of the
+database server.
 
 This program uses some table names while testing things. If you have any
 tables with the name of 'crash_me' or 'crash_qxxxx' where 'x' is a number,
@@ -3152,7 +3153,29 @@ sub safe_connect
 }
 
 #
-# Check if the server is upp and running. If not, ask the user to restart it
+# Test connecting a couple of times before giving an error
+# This is needed to get the server time to free old connections
+# after the connect test
+#
+
+sub retry_connect
+{
+  my ($dbh, $i);
+  for (i=0 ; $i < 10 ; $i++)
+  {
+    if (($dbh=DBI->connect($server->{'data_source'},$opt_user,$opt_password,
+			 { PrintError => 0, AutoCommit => 1})))
+    {
+      $dbh->{LongReadLen}= 16000000; # Set max retrieval buffer
+      return $dbh;
+    }
+    sleep(1);
+  }
+  return safe_connect();
+}
+
+#
+# Check if the server is up and running. If not, ask the user to restart it
 #
 
 sub check_connect
diff --git a/sql/field.h b/sql/field.h
index f064724f6a2..29c185505c7 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -65,7 +65,7 @@ public:
   virtual String *val_str(String*,String *)=0;
   virtual Item_result result_type () const=0;
   virtual Item_result cmp_type () const { return result_type(); }
-  bool eq(Field *field) { return ptr == field->ptr; }
+  bool eq(Field *field) { return ptr == field->ptr && null_ptr == field->null_ptr; }
   virtual bool eq_def(Field *field);
   virtual uint32 pack_length() const { return (uint32) field_length; }
   virtual void reset(void) { bzero(ptr,pack_length()); }
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 6e055f57c83..749a3eba5e4 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -1021,7 +1021,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
 {
   int error;
   uint i,j,recpos,minpos,fieldpos,temp_length,length;
-  bool found_auto_increment=0, found_real_auto_increment=0;
+  bool found_real_auto_increment=0;
   enum ha_base_keytype type;
   char buff[FN_REFLEN];
   KEY *pos;
@@ -1091,12 +1091,6 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
 	keydef[i].seg[j].null_bit=0;
 	keydef[i].seg[j].null_pos=0;
       }
-      if (field->flags & AUTO_INCREMENT_FLAG && !found_auto_increment)
-      {
-	keydef[i].flag|=HA_AUTO_KEY;
-	found_auto_increment=1;
-        found_real_auto_increment=(j==0);
-      }
       if (field->type() == FIELD_TYPE_BLOB)
       {
 	keydef[i].seg[j].flag|=HA_BLOB_PART;
@@ -1108,6 +1102,12 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
     keyseg+=pos->key_parts;
   }
 
+  if (table_arg->found_next_number_field)
+  {
+    keydef[table_arg->next_number_index].flag|= HA_AUTO_KEY;
+    found_real_auto_increment= table_arg->next_number_key_offset == 0;
+  }
+
   recpos=0; recinfo_pos=recinfo;
   while (recpos < (uint) table_arg->reclength)
   {
diff --git a/sql/lock.cc b/sql/lock.cc
index 64456e6ec36..41a76007289 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -487,11 +487,12 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list)
 {
   TABLE *table;
   char  key[MAX_DBKEY_LENGTH];
+  char *db= table_list->db ? table_list->db : (thd->db ? thd->db : (char*) "");
   uint  key_length;
   DBUG_ENTER("lock_table_name");
   safe_mutex_assert_owner(&LOCK_open);
 
-  key_length=(uint) (strmov(strmov(key,table_list->db)+1,table_list->real_name)
+  key_length=(uint) (strmov(strmov(key,db)+1,table_list->real_name)
 		     -key)+ 1;
 
   /* Only insert the table if we haven't insert it already */
@@ -520,7 +521,7 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list)
     my_free((gptr) table,MYF(0));
     DBUG_RETURN(-1);
   }
-  if (remove_table_from_cache(thd, table_list->db, table_list->real_name))
+  if (remove_table_from_cache(thd, db, table_list->real_name))
     DBUG_RETURN(1);					// Table is in use
   DBUG_RETURN(0);
 }
@@ -564,6 +565,77 @@ bool wait_for_locked_table_names(THD *thd, TABLE_LIST *table_list)
   DBUG_RETURN(result);
 }
 
+
+/*
+  Lock all tables in list with a name lock
+
+  SYNOPSIS
+    lock_table_names()
+    thd			Thread handle
+    table_list		Names of tables to lock
+
+  NOTES
+    One must have a lock on LOCK_open when calling this
+
+  RETURN
+    0	ok
+    1	Fatal error (end of memory ?)
+*/
+
+bool lock_table_names(THD *thd, TABLE_LIST *table_list)
+{
+  bool got_all_locks=1;
+  TABLE_LIST *lock_table;
+
+  for (lock_table=table_list ; lock_table ; lock_table=lock_table->next)
+  {
+    int got_lock;
+    if ((got_lock=lock_table_name(thd,lock_table)) < 0)
+      goto end;					// Fatal error
+    if (got_lock)
+      got_all_locks=0;				// Someone is using table
+  }
+
+  /* If some table was in use, wait until we got the lock */
+  if (!got_all_locks && wait_for_locked_table_names(thd, table_list))
+    goto end;
+  return 0;
+
+end:
+  unlock_table_names(thd, table_list, lock_table);
+  return 1;
+}
+
+
+/*
+  Unlock all tables in list with a name lock
+
+  SYNOPSIS
+    unlock_table_names()
+    thd			Thread handle
+    table_list		Names of tables to unlock
+    last_table		Don't unlock any tables after this one.
+			(default 0, which will unlock all tables)
+
+  NOTES
+    One must have a lock on LOCK_open when calling this
+    This function will send a COND_refresh signal to inform other threads
+    that the name locks are removed
+
+  RETURN
+    0	ok
+    1	Fatal error (end of memory ?)
+*/
+
+void unlock_table_names(THD *thd, TABLE_LIST *table_list,
+			TABLE_LIST *last_table)
+{
+  for (TABLE_LIST *table=table_list ; table != last_table ; table=table->next)
+    unlock_table_name(thd,table);
+  pthread_cond_broadcast(&COND_refresh);
+}
+
+
 static void print_lock_error(int error)
 {
   int textno;
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 7d830859fb2..c6e205f4729 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -723,6 +723,9 @@ int lock_and_wait_for_table_name(THD *thd, TABLE_LIST *table_list);
 int lock_table_name(THD *thd, TABLE_LIST *table_list);
 void unlock_table_name(THD *thd, TABLE_LIST *table_list);
 bool wait_for_locked_table_names(THD *thd, TABLE_LIST *table_list);
+bool lock_table_names(THD *thd, TABLE_LIST *table_list);
+void unlock_table_names(THD *thd, TABLE_LIST *table_list,
+			TABLE_LIST *last_table= 0);
 
 
 /* old unireg functions */
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 648bb71ae24..e5bede3b48c 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -7,8 +7,8 @@
 
 "hashchk",
 "isamchk",
-"TAK",
 "NIE",
+"TAK",
 "Nie mo¿na stworzyæ pliku '%-.64s' (Kod b³êdu: %d)",
 "Nie mo¿na stworzyæ tabeli '%-.64s' (Kod b³êdu: %d)",
 "Nie mo¿na stworzyæ bazy danych '%-.64s'. B³?d %d",
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index 3eddd2646d5..1bb89060167 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -31,8 +31,8 @@ static TABLE_LIST *rename_tables(THD *thd, TABLE_LIST *table_list,
 
 bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list)
 {
-  bool error=1,got_all_locks=1;
-  TABLE_LIST *lock_table,*ren_table=0;
+  bool error=1;
+  TABLE_LIST *ren_table=0;
   DBUG_ENTER("mysql_rename_tables");
 
   /*
@@ -47,23 +47,11 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list)
   }
 
   VOID(pthread_mutex_lock(&LOCK_open));
-  for (lock_table=table_list ; lock_table ; lock_table=lock_table->next)
-  {
-    int got_lock;
-    if ((got_lock=lock_table_name(thd,lock_table)) < 0)
-      goto end;
-    if (got_lock)
-      got_all_locks=0;
-  }
+  if (lock_table_names(thd, table_list))
+    goto err;
 
-  if (!got_all_locks && wait_for_locked_table_names(thd,table_list))
-    goto end;
-
-  if (!(ren_table=rename_tables(thd,table_list,0)))
-    error=0;
-
-end:
-  if (ren_table)
+  error= 0;
+  if ((ren_table=rename_tables(thd,table_list,0)))
   {
     /* Rename didn't succeed;  rename back the tables in reverse order */
     TABLE_LIST *prev=0,*table;
@@ -85,7 +73,7 @@ end:
     table=table->next->next;			// Skip error table
     /* Revert to old names */
     rename_tables(thd, table, 1);
-    /* Note that lock_table == 0 here, so the unlock loop will work */
+    error= 1;
   }
 
   /* Lets hope this doesn't fail as the result will be messy */ 
@@ -100,9 +88,9 @@ end:
     send_ok(&thd->net);
   }
 
-  for (TABLE_LIST *table=table_list ; table != lock_table ; table=table->next)
-    unlock_table_name(thd,table);
-  pthread_cond_broadcast(&COND_refresh);
+  unlock_table_names(thd,table_list);
+
+err:
   pthread_mutex_unlock(&LOCK_open);
   DBUG_RETURN(error);
 }
@@ -131,7 +119,7 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error)
     if (!access(name,F_OK))
     {
       my_error(ER_TABLE_EXISTS_ERROR,MYF(0),name);
-      DBUG_RETURN(ren_table);			// This can't be skipped
+      DBUG_RETURN(ren_table);			// This can't be skiped
     }
     sprintf(name,"%s/%s/%s%s",mysql_data_home,
 	    ren_table->db,ren_table->real_name,
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index cf7f310bbd5..d3934fbd620 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3330,6 +3330,7 @@ remove_eq_conds(COND *cond,Item::cond_result *cond_value)
       == Item_func::COND_AND_FUNC;
     List_iterator<Item> li(*((Item_cond*) cond)->argument_list());
     Item::cond_result tmp_cond_value;
+    bool should_fix_fields=0;
 
     *cond_value=Item::COND_UNDEF;
     Item *item;
@@ -3349,6 +3350,7 @@ remove_eq_conds(COND *cond,Item::cond_result *cond_value)
 	delete item;				// This may be shared
 #endif
 	VOID(li.replace(new_item));
+	should_fix_fields=1;
       }
       if (*cond_value == Item::COND_UNDEF)
 	*cond_value=tmp_cond_value;
@@ -3375,6 +3377,9 @@ remove_eq_conds(COND *cond,Item::cond_result *cond_value)
 	break; /* purecov: deadcode */
       }
     }
+    if (should_fix_fields)
+      cond->fix_fields(current_thd,0);
+
     if (!((Item_cond*) cond)->argument_list()->elements ||
 	*cond_value != Item::COND_OK)
       return (COND*) 0;
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 4c92c35632a..156d2b842f1 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2003 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -80,7 +80,6 @@ int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists)
     {
       my_error(ER_TABLE_NOT_LOCKED_FOR_WRITE,MYF(0),
 	       tables->real_name);
-      error = 1;
       goto err;
     }
     while (global_read_lock && ! thd->killed)
@@ -93,7 +92,6 @@ int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists)
 
  err:
   pthread_mutex_unlock(&LOCK_open);
-  VOID(pthread_cond_broadcast(&COND_refresh)); // Signal to refresh
 
   pthread_mutex_lock(&thd->mysys_var->mutex);
   thd->mysys_var->current_mutex= 0;
@@ -138,7 +136,6 @@ int mysql_rm_table_part2_with_lock(THD *thd,
   error=mysql_rm_table_part2(thd,tables, if_exists, dont_log_query);
 
   pthread_mutex_unlock(&LOCK_open);
-  VOID(pthread_cond_broadcast(&COND_refresh)); // Signal to refresh
 
   pthread_mutex_lock(&thd->mysys_var->mutex);
   thd->mysys_var->current_mutex= 0;
@@ -171,6 +168,9 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
   bool some_tables_deleted=0, tmp_table_deleted=0;
   DBUG_ENTER("mysql_rm_table_part2");
 
+  if (lock_table_names(thd, tables))
+    DBUG_RETURN(1);
+
   for (table=tables ; table ; table=table->next)
   {
     char *db=table->db ? table->db : thd->db;
@@ -242,11 +242,12 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
     }
   }
 
-  error = 0;
+  unlock_table_names(thd, tables);
+  error= 0;
   if (wrong_tables.length())
   {
     my_error(ER_BAD_TABLE_ERROR,MYF(0),wrong_tables.c_ptr());
-    error=1;
+    error= 1;
   }
   DBUG_RETURN(error);
 }