Made keyread (key scanning) a key specific attribute.

This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem.


Docs/manual.texi:
  Update of SQL_JOIN_MAX_SIZE information3602
client/mysqldump.c:
  comment cleanup
include/my_aes.h:
  General cleanup for new file
include/rijndael.h:
  General cleanup for new file
include/sha1.h:
  General cleanup for new file
mysys/my_aes.c:
  General cleanup for new file
mysys/rijndael.c:
  General cleanup for new file
mysys/sha1.c:
  General cleanup for new file
sql/ha_berkeley.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_innodb.cc:
  Merge with 3.23.x
sql/ha_innodb.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_isam.cc:
  Moved things to table_flags()
sql/ha_isam.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.cc:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisammrg.h:
  Made keyread (key scanning) a key specific attribute.
sql/handler.h:
  Made keyread (key scanning) a key specific attribute.
sql/item_strfunc.cc:
  Cleanup of AES_xxx code
sql/opt_range.cc:
  Made keyread (key scanning) a key specific attribute.
sql/sql_base.cc:
  Made keyread (key scanning) a key specific attribute.
sql/sql_cache.cc:
  Removed compiler warning
sql/sql_select.cc:
  Removed wrong patch to fulltext problem
sql/table.cc:
  Made keyread (key scanning) a key specific attribute.
sql/table.h:
  Made keyread (key scanning) a key specific attribute.

1 files changed, 29 insertions, 46 deletions

diff --git a/include/sha1.h b/include/sha1.h
index 9871282cdd4..1c345469d3c 100644
--- a/include/sha1.h
+++ b/include/sha1.h
@@ -4,81 +4,64 @@
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
- 
+
  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
- 
+
 /*
- sha1.h
- 
- Description:
-   This is the header file for code which implements the Secure
-   Hashing Algorithm 1 as defined in FIPS PUB 180-1 published 
-   April 17, 1995.
-  
-   Many of the variable names in this code, especially the
-   single character names, were used because those were the names
-   used in the publication.
- 
-   Please read the file sha1.c for more information.
- 
-*/
- 
-/* Modified 2002 by Peter Zaitsev to better follow MySQL standards */
+ This is the header file for code which implements the Secure
+ Hashing Algorithm 1 as defined in FIPS PUB 180-1 published
+ April 17, 1995.
 
+ Many of the variable names in this code, especially the
+ single character names, were used because those were the names
+ used in the publication.
 
-#ifndef _SHA1_H_
-#define _SHA1_H_
+ Please read the file sha1.c for more information.
 
-#include "my_global.h"
+ Modified 2002 by Peter Zaitsev to better follow MySQL standards
+*/
 
-/* Required for uint32, uint8, int16 ulonglong types */
 
 enum sha_result_codes
 {
-    SHA_SUCCESS = 0,
-    SHA_NULL,            /* Null pointer parameter */
-    SHA_INPUT_TOO_LONG,  /* input data too long */
-    SHA_STATE_ERROR      /* called Input after Result */
+  SHA_SUCCESS = 0,
+  SHA_NULL,		/* Null pointer parameter */
+  SHA_INPUT_TOO_LONG,	/* input data too long */
+  SHA_STATE_ERROR	/* called Input after Result */
 };
 
 #define SHA1_HASH_SIZE 20 /* Hash size in bytes */
 
 /*
- This structure will hold context information for the SHA-1
- hashing operation
- */
+  This structure will hold context information for the SHA-1
+  hashing operation
+*/
+
 typedef struct SHA1_CONTEXT
 {
-  ulonglong  Length;            /* Message length in bits      */                             
+  ulonglong  Length;		/* Message length in bits      */
   uint32 Intermediate_Hash[SHA1_HASH_SIZE/4]; /* Message Digest  */
-  int Computed;                 /* Is the digest computed?         */
-  int Corrupted;                /* Is the message digest corrupted? */
-  int16 Message_Block_Index;    /* Index into message block array   */
-  uint8 Message_Block[64];      /* 512-bit message blocks      */
+  int Computed;			/* Is the digest computed?	   */
+  int Corrupted;		/* Is the message digest corrupted? */
+  int16 Message_Block_Index;	/* Index into message block array   */
+  uint8 Message_Block[64];	/* 512-bit message blocks      */
 } SHA1_CONTEXT;
 
 /*
- *  Function Prototypes
- */
- 
+  Function Prototypes
+*/
 
-#ifdef __cplusplus
-extern "C" {
-#endif 
+C_MODE_START
 
 int sha1_reset( SHA1_CONTEXT* );
 int sha1_input( SHA1_CONTEXT*, const uint8 *, unsigned int );
 int sha1_result( SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE] );
-		
-#ifdef __cplusplus
-}
-#endif		
 
-#endif
+C_MODE_END