From d686ef729fdf8eccfdcf9dd549c461aaa9ed4492 Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Mon, 29 Jul 2002 09:35:25 +0300
Subject: Merge of ha_innobase.cc from 4.0; This fixes that MySQL doesn't
 allocate too big buffers when sorting innobase rows Changed name of variables
 NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS RELAXED_UNIQUE_CHECKS ->
 UNIQUE_CHECKS to avoid confusion with 'not...' variables. Write name of
 adminstrator command to slow log. Added mysqldumpslow to RPM

---
 sql/lex.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/lex.h')

diff --git a/sql/lex.h b/sql/lex.h
index a242f751053..776e03b811b 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -232,7 +232,7 @@ static SYMBOL symbols[] = {
   { "NCHAR",		SYM(NCHAR_SYM),0,0},
   { "NUMERIC",		SYM(NUMERIC_SYM),0,0},
   { "NO",		SYM(NO_SYM),0,0},
-  { "NO_FOREIGN_KEY_CHECKS", SYM(NO_FOREIGN_KEY_CHECKS), 0, 0},
+  { "FOREIGN_KEY_CHECKS", SYM(FOREIGN_KEY_CHECKS), 0, 0},
   { "NOT",		SYM(NOT),0,0},
   { "NULL",		SYM(NULL_SYM),0,0},
   { "ON",		SYM(ON),0,0},
@@ -261,7 +261,7 @@ static SYMBOL symbols[] = {
   { "REFERENCES",	SYM(REFERENCES),0,0},
   { "RELOAD",		SYM(RELOAD),0,0},
   { "REGEXP",		SYM(REGEXP),0,0},
-  { "RELAXED_UNIQUE_CHECKS", SYM(RELAXED_UNIQUE_CHECKS), 0, 0},
+  { "UNIQUE_CHECKS",	SYM(UNIQUE_CHECKS), 0, 0},
   { "RENAME",		SYM(RENAME),0,0},
   { "REPAIR",		SYM(REPAIR),0,0},
   { "REPLACE",		SYM(REPLACE),0,0},
-- 
cgit v1.2.1