diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-07-29 09:35:25 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-07-29 09:35:25 +0300 |
| commit | 01152fb14637d1fb324bac0de496164a6e1ba46f (patch) | |
| tree | e3ed5bd5c3e00eb2edf594fe95850d3dd0bc1ad4 /sql/lex.h | |
| parent | 714e9c881e5af8bbb54c336d0327bae8e4559019 (diff) | |
| download | mariadb-git-01152fb14637d1fb324bac0de496164a6e1ba46f.tar.gz | |
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
Docs/manual.texi:
Changelog
sql/gen_lex_hash.cc:
Updated values
sql/ha_innobase.cc:
Remove return value of sprintf
Merged back optimizations done in 4.0
Fixed ref_length; Caused MySQL to use big buffers when using InnoDB
sql/lex.h:
Changed name of variables
NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS
RELAXED_UNIQUE_CHECKS -> UNIQUE_CHECKS
sql/log.cc:
Write name of adminstrator command to slow log
sql/sql_yacc.yy:
Changed name of variables
NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS
RELAXED_UNIQUE_CHECKS -> UNIQUE_CHECKS
support-files/mysql.spec.sh:
Added mysqldumpslow to RPM
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 4 |
1 files changed, 2 insertions, 2 deletions
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}, |