From 4e6f5f2d12ac28aaf1845a5799712cdf637c63fc Mon Sep 17 00:00:00 2001
From: "Sinisa@sinisa.nasamreza.org" <>
Date: Fri, 15 Nov 2002 16:37:44 +0200
Subject: [PATCH] few small bug fixes ...

---
 sql/sql_delete.cc | 2 +-
 sql/sql_table.cc  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index c3e52f42dcd..2d869fdda49 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -90,7 +90,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
   if (!table->quick_keys)
   {
     thd->lex.select_lex.options|=QUERY_NO_INDEX_USED;
-    if (safe_update && use_limit)
+    if (safe_update && !using_limit)
     {
       delete select;
       send_error(thd,ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE);
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 5187351258e..abb4cf8d3f9 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -523,19 +523,19 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
 
   key_iterator.rewind();
   key_number=0;
-  for (; (key=key_iterator++) ; key_info++, key_number++)
+  for (; (key=key_iterator++) ; key_number++)
   {
     uint key_length=0;
     key_part_spec *column;
 
     switch(key->type){
-      case Key::MULTIPLE:
+    case Key::MULTIPLE:
         key_info->flags = 0;
         break;
-      case Key::FULLTEXT:
+    case Key::FULLTEXT:
         key_info->flags = HA_FULLTEXT;
         break;
-      case Key::SPATIAL:
+    case Key::SPATIAL:
         key_info->flags = HA_SPATIAL;
         break;
     case Key::FOREIGN_KEY:
@@ -734,6 +734,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
       my_error(ER_TOO_LONG_KEY,MYF(0),max_key_length);
       DBUG_RETURN(-1);
     }
+    key_info++;
   }
   if (!unique_key && !primary_key &&
       (file->table_flags() & HA_REQUIRE_PRIMARY_KEY))