From fe4cccd6a43496395ec52e9043cd4350e5eac69d Mon Sep 17 00:00:00 2001
From: unknown <monty@donna.mysql.com>
Date: Tue, 12 Sep 2000 03:02:33 +0300
Subject: Update to new root alloc, OPTIMIZE TABLE and some other changes

Docs/manual.texi:
  Added chapter for binary log, updated the changelog, linux section, OPTIMIZE TABLE...
client/mysqladmin.c:
  Fixed bug with pid-file handling.
client/mysqldump.c:
  Version change
configure.in:
  Version change
include/Makefile.am:
  Fix for SCO to get sched.h removed.
include/global.h:
  Increased MY_NFILE;  Added thread_safe_increment
include/my_sys.h:
  Better root_alloc
include/mysql.h:
  Better root_alloc
include/mysys_err.h:
  Fix for PREAD/PWRITE on windows
libmysql/libmysql.c:
  Better root_alloc
myisam/mi_locking.c:
  Fix for PREAD/PWRITE on windows
myisam/mi_static.c:
  Fix for PREAD/PWRITE on windows
mysys/default.c:
  Better root_alloc
mysys/errors.c:
  Fix for PREAD/PWRITE on windows
mysys/my_alloc.c:
  Better root_alloc
mysys/my_create.c:
  Fix for PREAD/PWRITE on windows
mysys/my_fopen.c:
  Fix for PREAD/PWRITE on windows
mysys/my_open.c:
  Fix for PREAD/PWRITE on windows
mysys/my_pread.c:
  Fix for PREAD/PWRITE on windows
mysys/tree.c:
  Better root_alloc
readline/bind.c:
  Removed compiler warning
readline/isearch.c:
  Removed compiler warning
scripts/safe_mysqld.sh:
  Allow use of MYSQL_UNIX_PORT and MYSQL_TCP_PORT
sql-bench/crash-me.sh:
  Version change
sql-bench/limits/mysql-3.23.cfg:
  Update to latest MySQL version
sql/filesort.cc:
  Added more statistics
sql/ha_berkeley.h:
  Fixed bug with ORDER BY
sql/ha_myisam.cc:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/ha_myisam.h:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/handler.cc:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/handler.h:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/item_func.cc:
  Fixed comment
sql/item_timefunc.cc:
  Fixed possible month bug
sql/mini_client.cc:
  Use of new root_alloc
sql/mysql_priv.h:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/mysqld.cc:
  Added more statistics
sql/opt_range.cc:
  Use of new root_alloc
sql/slave.cc:
  Use of new root_alloc
sql/sql_acl.cc:
  Use of new root_alloc
sql/sql_class.cc:
  Use of new root_alloc
sql/sql_parse.cc:
  Use of new root_alloc
sql/sql_select.cc:
  Added more statistics
sql/sql_table.cc:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/sql_udf.cc:
  Use of new root_alloc
sql/sql_yacc.yy:
  Fixed that OPTIMIZE TABLE can take many tables as arguments
sql/table.cc:
  Use of new root_alloc
sql/thr_malloc.cc:
  Use of new root_alloc
support-files/mysql.server.sh:
  Removed usage of AWK
---
 sql/handler.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'sql/handler.cc')

diff --git a/sql/handler.cc b/sql/handler.cc
index 17388267fb9..ed4613d754f 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -318,7 +318,7 @@ int handler::ha_open(const char *name, int mode, int test_if_locked)
   if (!error)
   {
     if (!alloc_root_inited(&table->mem_root))	// If temporary table
-      ref=sql_alloc(ALIGN_SIZE(ref_length)*2);
+      ref=(byte*) sql_alloc(ALIGN_SIZE(ref_length)*2);
     else
       ref=(byte*) alloc_root(&table->mem_root, ALIGN_SIZE(ref_length)*2);
     if (!ref)
@@ -334,22 +334,22 @@ int handler::ha_open(const char *name, int mode, int test_if_locked)
 
 int handler::check(THD* thd, HA_CHECK_OPT* check_opt)
 {
-  return HA_CHECK_NOT_IMPLEMENTED;
+  return HA_ADMIN_NOT_IMPLEMENTED;
 }
 
 int handler::repair(THD* thd, HA_CHECK_OPT* check_opt)
 {
-  return HA_REPAIR_NOT_IMPLEMENTED;
+  return HA_ADMIN_NOT_IMPLEMENTED;
 }
 
-int handler::optimize(THD* thd)
+int handler::optimize(THD* thd, HA_CHECK_OPT* check_opt)
 {
-  return HA_OPTIMIZE_NOT_IMPLEMENTED;
+  return HA_ADMIN_NOT_IMPLEMENTED;
 }
 
-int handler::analyze(THD* thd)
+int handler::analyze(THD* thd, HA_CHECK_OPT* check_opt)
 {
-  return HA_ANALYZE_NOT_IMPLEMENTED;
+  return HA_ADMIN_NOT_IMPLEMENTED;
 }
 
 	/* Read first row from a table */
-- 
cgit v1.2.1