From 46f98c3cd8a6f9449e37bfe62d8258855488152f Mon Sep 17 00:00:00 2001
From: unknown <monty@mashka.mysql.fi>
Date: Fri, 7 Feb 2003 15:47:24 +0200
Subject: After merge fixes & remove compiler warnings Added lengths for all
 MYSQL_FIELD string parameters Changed field length to 2 byte in .frm files

configure.in:
  After merge fixes
include/ft_global.h:
  Fixed copyright
include/my_sys.h:
  Remove compiler warnings
include/mysql.h:
  Added lengths for all MYSQL_FIELD string parameters
include/mysql_com.h:
  Remove compiler warning
myisam/ft_boolean_search.c:
  Removed compiler warnings
myisam/ft_dump.c:
  Removed compiler warnings
myisam/ft_stopwords.c:
  Copy file from MySQL 4.0
myisam/mi_delete.c:
  Fixed compiler warning
myisam/sort.c:
  Indentation changes
myisam/sp_test.c:
  Remove compiler warnings
mysql-test/r/func_group.result:
  After merge fixes
mysql-test/r/group_by.result:
  After merge fixes
mysql-test/r/rpl_insert_id.result:
  After merge fixes
mysql-test/r/rpl_master_pos_wait.result:
  After merge fixes
mysql-test/t/rpl000009.test:
  After merge fixes
mysql-test/t/rpl_insert_id.test:
  After merge fixes
mysql-test/t/subselect.test:
  After merge fixes
sql/item_cmpfunc.cc:
  After merge fixes
sql/item_cmpfunc.h:
  After merge fixes
sql/item_func.cc:
  After merge fixes
sql/item_func.h:
  After merge fixes
sql/item_strfunc.cc:
  After merge fixes
sql/item_strfunc.h:
  After merge fixes
sql/log.cc:
  After merge fixes
sql/mysql_priv.h:
  After merge fixes
sql/mysqld.cc:
  After merge fixes
sql/sql_db.cc:
  After merge fixes
sql/sql_handler.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
sql/sql_show.cc:
  After merge fixes
sql/sql_udf.cc:
  After merge fixes
sql/table.cc:
  Changed field length to 2 byte in .frm files
sql/unireg.cc:
  Changed field length to 2 byte in .frm files
---
 myisam/sp_test.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'myisam/sp_test.c')

diff --git a/myisam/sp_test.c b/myisam/sp_test.c
index 1a7c2785964..7ae41c2088c 100644
--- a/myisam/sp_test.c
+++ b/myisam/sp_test.c
@@ -23,7 +23,6 @@
 #define MAX_REC_LENGTH 1024
 #define KEYALG HA_KEY_ALG_RTREE
 
-static void create_point(char *record,uint rownr);
 static void create_linestring(char *record,uint rownr);
 static void print_record(char * record,my_off_t offs,const char * tail);
 
@@ -33,7 +32,6 @@ static void print_key(const char *key,const char * tail);
 static int run_test(const char *filename);
 static int read_with_pos(MI_INFO * file, int silent);
 
-static int rtree_CreatePointWKB(double *ords, uint n_dims, uchar *wkb);
 static int rtree_CreateLineStringWKB(double *ords, uint n_dims, uint n_points, uchar *wkb);
 static  void rtree_PrintWKB(uchar *wkb, uint n_dims);
 
@@ -362,7 +360,7 @@ static void print_record(char * record, my_off_t offs,const char * tail)
 
 
 
-#ifndef NOT_USED
+#ifdef NOT_USED
 static void create_point(char *record,uint rownr)
 {
    uint tmp;
@@ -449,6 +447,8 @@ static void print_key(const char *key,const char * tail)
 
 
 
+#ifdef NOT_USED
+
 static int rtree_CreatePointWKB(double *ords, uint n_dims, uchar *wkb)
 {
   uint i;
@@ -465,8 +465,11 @@ static int rtree_CreatePointWKB(double *ords, uint n_dims, uchar *wkb)
   }
   return 5 + n_dims * 8;
 }
+#endif
+
 
-static int rtree_CreateLineStringWKB(double *ords, uint n_dims, uint n_points, uchar *wkb)
+static int rtree_CreateLineStringWKB(double *ords, uint n_dims, uint n_points,
+				     uchar *wkb)
 {
   uint i;
   uint n_ords = n_dims * n_points;
-- 
cgit v1.2.1