Added support of null keys in HEAP tables

Added ORDER BY optimization


Docs/manual.texi:
  Added ORDER BY optimisation section
heap/_check.c:
  Cleanup
heap/heapdef.h:
  Added support of null keys in HEAP tables
heap/hp_hash.c:
  Added support of null keys in HEAP tables
heap/hp_open.c:
  Added support of null keys in HEAP tables
heap/hp_test2.c:
  Added support of null keys in HEAP tables
heap/hp_write.c:
  Added support of null keys in HEAP tables
include/heap.h:
  Added support of null keys in HEAP tables
include/my_base.h:
  Support for hash algoritm
isam/static.c:
  Cleanup
myisam/mi_static.c:
  Cleanup
sql/Makefile.am:
  Rename innobase -> innodb
sql/ha_berkeley.cc:
  Added ORDER BY optimization
sql/ha_berkeley.h:
  Added ORDER BY optimization
sql/ha_heap.cc:
  Added support for NULL keys
sql/ha_heap.h:
  Added support for NULL keys
sql/ha_isam.cc:
  Added ORDER BY optimization
sql/ha_isam.h:
  Added ORDER BY optimization
sql/ha_isammrg.h:
  Added ORDER BY optimization
sql/ha_myisam.cc:
  Added ORDER BY optimization
sql/ha_myisam.h:
  Added ORDER BY optimization
sql/ha_myisammrg.cc:
  Added ORDER BY optimization
sql/ha_myisammrg.h:
  Added ORDER BY optimization
sql/handler.cc:
  Rename innobase -> innodb
sql/handler.h:
  Rename innobase -> innodb
sql/ha_innodb.cc:
  Rename innobase -> innodb
sql/ha_innodb.h:
  Rename innobase -> innodb
sql/mysqld.cc:
  Rename innobase -> innodb
sql/sql_delete.cc:
  Rename innobase -> innodb
sql/sql_select.cc:
  Added ORDER BY optimization
sql/sql_select.h:
  Added ORDER BY optimization

1 files changed, 194 insertions, 0 deletions

diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
new file mode 100644
index 00000000000..fb10975f30a
--- /dev/null
+++ b/sql/ha_innodb.h
@@ -0,0 +1,194 @@
+/* Copyright (C) 2000 MySQL AB && Innobase Oy
+
+   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; 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 */
+
+/*
+  This file is based on ha_berkeley.h of MySQL distribution
+
+  This file defines the Innodb handler: the interface between MySQL and
+  Innodb
+*/
+
+#ifdef __GNUC__
+#pragma interface			/* gcc class implementation */
+#endif
+
+typedef struct st_innobase_share {
+  THR_LOCK lock;
+  pthread_mutex_t mutex;
+  char *table_name;
+  uint table_name_length,use_count;
+} INNOBASE_SHARE;
+
+
+/* The class defining a handle to an Innodb table */
+class ha_innobase: public handler
+{
+	void*	innobase_prebuilt;	/* (row_prebuilt_t*) prebuilt
+					struct in Innodb, used to save
+					CPU */
+	THD*		user_thd;	/* the thread handle of the user
+					currently using the handle; this is
+					set in external_lock function */
+	ulong           last_query_id;  /* the latest query id where the
+					handle was used */
+  	THR_LOCK_DATA 	lock;
+	INNOBASE_SHARE  *share;
+
+  	gptr 		alloc_ptr;
+  	byte*		upd_buff;	/* buffer used in updates */
+  	byte*		key_val_buff;	/* buffer used in converting
+  					search key values from MySQL format
+  					to Innodb format */
+	uint		ref_stored_len;	/* length of the key value stored to
+					'ref' buffer of the handle, if any */
+  	ulong 		int_option_flag;
+  	uint 		primary_key;
+	uint		last_dup_key;
+	ulong		start_of_scan;	/* this is set to 1 when we are
+					starting a table scan but have not
+					yet fetched any row, else 0 */
+
+	uint		last_match_mode;/* match mode of the latest search:
+					ROW_SEL_EXACT, ROW_SEL_EXACT_PREFIX,
+					or undefined */
+	longlong	auto_inc_counter_for_this_stat;
+	ulong max_row_length(const byte *buf);
+
+	uint store_key_val_for_row(uint keynr, char* buff, const byte* record);
+	int update_thd(THD* thd);
+	int change_active_index(uint keynr);
+	int general_fetch(byte* buf, uint direction, uint match_mode);
+
+	/* Init values for the class: */
+ public:
+  	ha_innobase(TABLE *table): handler(table),
+	  int_option_flag(HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER |
+			  HA_REC_NOT_IN_SEQ |
+			  HA_KEYPOS_TO_RNDPOS | HA_LASTKEY_ORDER |
+			  HA_HAVE_KEY_READ_ONLY | HA_READ_NOT_EXACT_KEY |
+			  HA_NULL_KEY |
+			  HA_NOT_EXACT_COUNT |
+			  HA_NO_WRITE_DELAYED |
+			  HA_PRIMARY_KEY_IN_READ_INDEX |
+			  HA_DROP_BEFORE_CREATE | HA_NOT_READ_PREFIX_LAST |
+			  HA_NO_PREFIX_CHAR_KEYS),
+	  last_dup_key((uint) -1),
+	  start_of_scan(0)
+  	{
+  	}
+  	~ha_innobase() {}
+
+  	const char* table_type() const { return("InnoDB");}
+	const char *index_type(uint key_number) { return "BTREE"; }
+  	const char** bas_ext() const;
+ 	ulong option_flag() const { return int_option_flag; }
+  	uint max_record_length() const { return HA_MAX_REC_LENGTH; }
+  	uint max_keys()          const { return MAX_KEY; }
+  	uint max_key_parts()     const { return MAX_REF_PARTS; }
+				/* An InnoDB page must store >= 2 keys;
+				a secondary key record must also contain the
+				primary key value:
+				max key length is therefore set to slightly
+				less than 1 / 4 of page size which is 16 kB;
+				but currently MySQL does not work with keys
+				whose size is > MAX_KEY_LENGTH */
+  	uint max_key_length() const { return((MAX_KEY_LENGTH <= 3500) ?
+					  MAX_KEY_LENGTH : 3500);}
+  	bool fast_key_read()	 { return 1;}
+	key_map keys_to_use_for_scanning() { return ~(key_map) 0; }
+  	bool has_transactions()  { return 1;}
+
+  	int open(const char *name, int mode, uint test_if_locked);
+  	void initialize(void);
+  	int close(void);
+  	double scan_time();
+
+  	int write_row(byte * buf);
+  	int update_row(const byte * old_data, byte * new_data);
+  	int delete_row(const byte * buf);
+
+  	int index_init(uint index);
+  	int index_end();
+  	int index_read(byte * buf, const byte * key,
+		       uint key_len, enum ha_rkey_function find_flag);
+  	int index_read_idx(byte * buf, uint index, const byte * key,
+			   uint key_len, enum ha_rkey_function find_flag);
+	int index_read_last(byte * buf, const byte * key, uint key_len);
+  	int index_next(byte * buf);
+  	int index_next_same(byte * buf, const byte *key, uint keylen);
+  	int index_prev(byte * buf);
+  	int index_first(byte * buf);
+  	int index_last(byte * buf);
+
+  	int rnd_init(bool scan=1);
+  	int rnd_end();
+  	int rnd_next(byte *buf);
+  	int rnd_pos(byte * buf, byte *pos);
+
+  	void position(const byte *record);
+  	void info(uint);
+  	int extra(enum ha_extra_function operation);
+  	int reset(void);
+  	int external_lock(THD *thd, int lock_type);
+  	void position(byte *record);
+  	ha_rows records_in_range(int inx,
+			   const byte *start_key,uint start_key_len,
+			   enum ha_rkey_function start_search_flag,
+			   const byte *end_key,uint end_key_len,
+			   enum ha_rkey_function end_search_flag);
+	ha_rows estimate_number_of_rows();
+
+  	int create(const char *name, register TABLE *form,
+					HA_CREATE_INFO *create_info);
+  	int delete_table(const char *name);
+	int rename_table(const char* from, const char* to);
+	int check(THD* thd, HA_CHECK_OPT* check_opt);
+        char* update_table_comment(const char* comment);
+
+  	THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
+			     		enum thr_lock_type lock_type);
+	longlong get_auto_increment();
+};
+
+extern bool innodb_skip;
+extern SHOW_COMP_OPTION have_innodb;
+extern uint innobase_init_flags, innobase_lock_type;
+extern ulong innobase_cache_size;
+extern char *innobase_home, *innobase_tmpdir, *innobase_logdir;
+extern long innobase_lock_scan_time;
+extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
+extern long innobase_log_file_size, innobase_log_buffer_size;
+extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
+extern long innobase_file_io_threads, innobase_lock_wait_timeout;
+extern long innobase_force_recovery, innobase_thread_concurrency;
+extern char *innobase_data_home_dir, *innobase_data_file_path;
+extern char *innobase_log_group_home_dir, *innobase_log_arch_dir;
+extern char *innobase_unix_file_flush_method;
+extern bool innobase_flush_log_at_trx_commit, innobase_log_archive,
+            innobase_use_native_aio, innobase_fast_shutdown;
+
+extern TYPELIB innobase_lock_typelib;
+
+bool innobase_init(void);
+bool innobase_end(void);
+bool innobase_flush_logs(void);
+uint innobase_get_free_space(void);
+
+int innobase_commit(THD *thd, void* trx_handle);
+int innobase_rollback(THD *thd, void* trx_handle);
+int innobase_close_connection(THD *thd);
+int innobase_drop_database(char *path);
+