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, 31 insertions, 49 deletions

diff --git a/include/my_aes.h b/include/my_aes.h
index 48ee11d15e5..5852baa5892 100644
--- a/include/my_aes.h
+++ b/include/my_aes.h
@@ -4,81 +4,63 @@
  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 */
-				                                                                                      
-				 
+
+
 /* Header file for my_aes.c */
 /* Wrapper to give simple interface for MySQL to AES standard encryption */
 
-#ifndef __MY_AES_H
-#define __MY_AES_H
-
-#include "my_global.h"
-#include <stdio.h>
 #include "rijndael.h"
 
-#define AES_KEY_LENGTH 128
-/* Must be 128 192 or 256 */
+C_MODE_START
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#define AES_KEY_LENGTH 128		/* Must be 128 192 or 256 */
 
 /*
-my_aes_encrypt  - Crypt buffer with AES encryption algorithm.
-source        - Pinter to data for encryption
-source_length - size of encruption data
-dest          - buffer to place encrypted data (must be large enough)
-key           - Key to be used for encryption
-kel_length    - Lenght of the key. Will handle keys of any length
-
-returns  - size of encrypted data, or negative in case of error.
-
+  my_aes_encrypt	- Crypt buffer with AES encryption algorithm.
+  source		- Pointer to data for encryption
+  source_length		- size of encryption data
+  dest			- buffer to place encrypted data (must be large enough)
+  key			- Key to be used for encryption
+  kel_length		- Length of the key. Will handle keys of any length
+
+  returns  - size of encrypted data, or negative in case of error.
 */
 
-int my_aes_encrypt(const char* source, int source_length, const char* dest,
-                   const char* key, int key_length);
+int my_aes_encrypt(const char *source, int source_length, char *dest,
+		   const char *key, int key_length);
 
 /*
-my_aes_decrypt  - DeCrypt buffer with AES encryption algorithm.
-source        - Pinter to data for decryption
-source_length - size of encrypted data
-dest          - buffer to place decrypted data (must be large enough)
-key           - Key to be used for decryption
-kel_length    - Lenght of the key. Will handle keys of any length
-
-returns  - size of original data, or negative in case of error.
-
+  my_aes_decrypt	- DeCrypt buffer with AES encryption algorithm.
+  source		- Pointer to data for decryption
+  source_length		- size of encrypted data
+  dest			- buffer to place decrypted data (must be large enough)
+  key			- Key to be used for decryption
+  kel_length		- Length of the key. Will handle keys of any length
+
+  returns  - size of original data, or negative in case of error.
 */
 
 
-int my_aes_decrypt(const char* source, int source_length, const char* dest,
-                   const char* key, int key_length);
-
+int my_aes_decrypt(const char *source, int source_length, char *dest,
+		   const char *key, int key_length);
 
 /*
-my_aes_get_size - get size of buffer which will be large enough for encrypted
-                  data
-source_length -  length of data to be encrypted
-
-returns  - size of buffer required to store encrypted data
+  my_aes_get_size - get size of buffer which will be large enough for encrypted
+		    data
+  source_length   -  length of data to be encrypted
 
+  returns  - size of buffer required to store encrypted data
 */
 
 int my_aes_get_size(int source_length);
 
-
-#ifdef __cplusplus
- }
-#endif
-
-
-#endif 
+C_MODE_END