From 306ebf7b1c1b26b45e93fbcbbf248b3479142c41 Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com>
Date: Mon, 4 Jul 2005 03:42:33 +0300
Subject: Fixes during review of new code - Mostly indentation fixes - Added
 missing test - Ensure that Item_func_case() checks for stack overruns - Use
 real_item() instead of (Item_ref*) item - Fixed wrong error handling

myisam/mi_unique.c:
  Improved comments
myisam/myisampack.c:
  Updated version number
mysql-test/r/group_by.result:
  Added test that was lost during earlier merge
mysql-test/r/information_schema.result:
  Safety fix: Drop procedures before used
mysql-test/t/group_by.test:
  Added test that was lost during earlier merge
mysql-test/t/information_schema.test:
  Safety fix: Drop procedures before used
mysys/hash.c:
  Updated comment
sql/field.cc:
  false -> FALSE
sql/ha_ndbcluster.cc:
  Fix some style issues
  - No () around argument to 'case'
  - Space before ( in switch and if
  - Removed 'goto'
  - Added {}
  - Added () to make expressions easier to read
  - my_snprintf -> strmov
sql/handler.cc:
  if( -> if (
sql/item.cc:
  Indentation changes
sql/item.h:
  false -> FALSE
sql/item_cmpfunc.cc:
  Ensure that Item_func_case() check for stack overrun properly
sql/item_cmpfunc.h:
  Ensure that Item_func_case() check for stack overrun properly
sql/item_func.cc:
  Indentation fixes
  Fixed wrong goto label
sql/mysqld.cc:
  Remove test for opt_disable_networking as this flag can never be set here
sql/opt_range.cc:
  Simplify code
sql/sql_class.h:
  Move define out from middle of class definition
sql/sql_parse.cc:
  Remove extra empty lines
sql/sql_select.cc:
  use real_item() instead of (Item_ref*) item
  Modifed function comment to be align with others
  Simple optimization
sql/sql_union.cc:
  Portability fix:
  Don't use 'bool_variable|=...'
sql/sql_view.cc:
  Move List_iterator_fast out from loops (rewind is faster than creating a new itearator)
strings/ctype-utf8.c:
  if( -> if (
strings/ctype.c:
  Remove disabled code
strings/decimal.c:
  Indentation fixes
strings/xml.c:
  Indentation fixes
---
 myisam/mi_unique.c  | 21 +++++++++++++++++----
 myisam/myisampack.c |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'myisam')

diff --git a/myisam/mi_unique.c b/myisam/mi_unique.c
index f2d5f01be25..34f5f595f30 100644
--- a/myisam/mi_unique.c
+++ b/myisam/mi_unique.c
@@ -64,7 +64,12 @@ my_bool mi_check_unique(MI_INFO *info, MI_UNIQUEDEF *def, byte *record,
 }
 
 
-/* Calculate a hash for a row */
+/*
+  Calculate a hash for a row
+
+  TODO
+    Add support for bit fields
+*/
 
 ha_checksum mi_unique_hash(MI_UNIQUEDEF *def, const byte *record)
 {
@@ -126,9 +131,17 @@ ha_checksum mi_unique_hash(MI_UNIQUEDEF *def, const byte *record)
   return crc;
 }
 
-	/*
-	  Returns 0 if both rows have equal unique value
-	 */
+
+/*
+  compare unique key for two rows
+
+  TODO
+    Add support for bit fields
+
+  RETURN
+    0   if both rows have equal unique value
+    #   Rows are different
+*/
 
 int mi_unique_comp(MI_UNIQUEDEF *def, const byte *a, const byte *b,
 		   my_bool null_are_equal)
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index 70a32902da6..daf2bbdf85c 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -288,7 +288,7 @@ static struct my_option my_long_options[] =
 
 static void print_version(void)
 {
-  VOID(printf("%s Ver 1.22 for %s on %s\n",
+  VOID(printf("%s Ver 1.23 for %s on %s\n",
               my_progname, SYSTEM_TYPE, MACHINE_TYPE));
   NETWARE_SET_SCREEN_MODE(1);
 }
-- 
cgit v1.2.1