From d69250a969449da43891ef5b2859df77917183a8 Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Wed, 2 Oct 2002 13:33:08 +0300
Subject: Fixes and code cleanups after merge with 4.0.3 Warning handling and
 initial prepared statement handling (last not complete yet) Changed a lot of
 functions that returned 0/1 to my_bool type. GRANT handling now uses
 read/write locks instead of mutex Change basic net functions to use THD
 instead of NET (needed for 4.1 protocol) Use my_sprintf instead of sprintf()
 + strlen() Added alloc_query() to be able to chare query initialization code
 with prepared statements. Cleanup handling of SHOW COUNT(*) WARNINGS and
 SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
---
 sql/table.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/table.cc')

diff --git a/sql/table.cc b/sql/table.cc
index 3e41da73109..2cdd62001f1 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -493,7 +493,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
 	  if (field->key_length() == key_part->length &&
 	      field->type() != FIELD_TYPE_BLOB)
 	  {
-	    if ((index_flags & HA_HAVE_KEY_READ_ONLY) &&
+	    if ((index_flags & HA_KEY_READ_ONLY) &&
 		(field->key_type() != HA_KEYTYPE_TEXT ||
 		 (!(ha_option & HA_KEY_READ_WRONG_STR) &&
 		  !(keyinfo->flags & HA_FULLTEXT))))
@@ -1141,7 +1141,7 @@ bool check_db_name(const char *name)
       return 1;
     name++;
   }
-  return (uint) (name - start) > NAME_LEN;
+  return (uint) (name - start) > NAME_LEN || name == start;
 }
 
 
-- 
cgit v1.2.1