Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mysql-5.5.35' into MYSQL-288
Conflicts: VERSION scripts/mysql_system_tables_data.sql scripts/mysql_system_tables_fix.sql sql/sql_load.cc sql/sql_parse.cc storage/innobase/include/ibuf0ibuf.h support-files/mysql.spec.sh
- Loading branch information
Showing
90 changed files
with
896 additions
and
294 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
MYSQL_VERSION_MAJOR=5 | ||
MYSQL_VERSION_MINOR=5 | ||
MYSQL_VERSION_PATCH=34 | ||
MYSQL_VERSION_PATCH=35 | ||
MYSQL_VERSION_EXTRA=.t14 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. | ||
This program is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
the Free Software Foundation; version 2 of the License. | ||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
You should have received a copy of the GNU General Public License | ||
along with this program; if not, write to the Free Software | ||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ | ||
|
||
#ifndef _my_check_opt_h | ||
#define _my_check_opt_h | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
||
/* | ||
All given definitions needed for MyISAM storage engine: | ||
myisamchk.c or/and ha_myisam.cc or/and micheck.c | ||
Some definitions are needed by the MySQL parser. | ||
*/ | ||
|
||
#define T_AUTO_INC (1UL << 0) | ||
#define T_AUTO_REPAIR (1UL << 1) | ||
#define T_BACKUP_DATA (1UL << 2) | ||
#define T_CALC_CHECKSUM (1UL << 3) | ||
#define T_CHECK (1UL << 4) | ||
#define T_CHECK_ONLY_CHANGED (1UL << 5) | ||
#define T_CREATE_MISSING_KEYS (1UL << 6) | ||
#define T_DESCRIPT (1UL << 7) | ||
#define T_DONT_CHECK_CHECKSUM (1UL << 8) | ||
#define T_EXTEND (1UL << 9) | ||
#define T_FAST (1UL << 10) | ||
#define T_FORCE_CREATE (1UL << 11) | ||
#define T_FORCE_UNIQUENESS (1UL << 12) | ||
#define T_INFO (1UL << 13) | ||
/** CHECK TABLE...MEDIUM (the default) */ | ||
#define T_MEDIUM (1UL << 14) | ||
/** CHECK TABLE...QUICK */ | ||
#define T_QUICK (1UL << 15) | ||
#define T_READONLY (1UL << 16) | ||
#define T_REP (1UL << 17) | ||
#define T_REP_BY_SORT (1UL << 18) | ||
#define T_REP_PARALLEL (1UL << 19) | ||
#define T_RETRY_WITHOUT_QUICK (1UL << 20) | ||
#define T_SAFE_REPAIR (1UL << 21) | ||
#define T_SILENT (1UL << 22) | ||
#define T_SORT_INDEX (1UL << 23) | ||
#define T_SORT_RECORDS (1UL << 24) | ||
#define T_STATISTICS (1UL << 25) | ||
#define T_UNPACK (1UL << 26) | ||
#define T_UPDATE_STATE (1UL << 27) | ||
#define T_VERBOSE (1UL << 28) | ||
#define T_VERY_SILENT (1UL << 29) | ||
#define T_WAIT_FOREVER (1UL << 30) | ||
#define T_WRITE_LOOP (1UL << 31) | ||
|
||
#define T_REP_ANY (T_REP | T_REP_BY_SORT | T_REP_PARALLEL) | ||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.