Merge key cache structures to one

Fixed compiler warnings (IRIX C compiler and VC++)


VC++Files/client/mysqlclient.dsp:
  Add missing file to project
VC++Files/libmysql/libmysql.dsp:
  Add missing file to project
VC++Files/myisam/myisam.dsp:
  Add missing file to project
VC++Files/mysys/mysys.dsp:
  Add missing file to project
heap/hp_test1.c:
  Fixed wrong call to heap_rkey()
heap/hp_test2.c:
  Fixed wrong call to heap_rkey()
include/hash.h:
  Move not used (internal) struct to hash.c
include/my_pthread.h:
  Made some structs 'const char*' to avoid warnings
include/my_sys.h:
  Moved key cache structs and functions to keycache.h
include/myisam.h:
  Merge key cache structures to one
include/mysql.h:
  Remove STDCALL from internal functions
include/sql_common.h:
  Remove STDCALL from internal functions
include/violite.h:
  Fixed compiler warning
isam/_locking.c:
  Merge key cache structures to one
isam/_page.c:
  Merge key cache structures to one
isam/close.c:
  Merge key cache structures to one
isam/extra.c:
  Merge key cache structures to one
isam/isamchk.c:
  Merge key cache structures to one
isam/isamdef.h:
  Merge key cache structures to one
isam/isamlog.c:
  Merge key cache structures to one
isam/panic.c:
  Merge key cache structures to one
isam/test2.c:
  Merge key cache structures to one
isam/test3.c:
  Merge key cache structures to one
libmysql/client_settings.h:
  Remove STDCALL from internal functions
libmysql/libmysql.c:
  Remove STDCALL from internal functions
myisam/ft_boolean_search.c:
  Fixed compiler warning
myisam/ft_dump.c:
  Fixed compiler warnings (%qx is not portable)
myisam/ft_update.c:
  Fixed compiler warnings
myisam/mi_check.c:
  Merge key cache structures to one
myisam/mi_close.c:
  Merge key cache structures to one
myisam/mi_delete_all.c:
  Merge key cache structures to one
myisam/mi_extra.c:
  Merge key cache structures to one
myisam/mi_keycache.c:
  Merge key cache structures to one
myisam/mi_locking.c:
  Merge key cache structures to one
myisam/mi_page.c:
  Merge key cache structures to one
myisam/mi_panic.c:
  Merge key cache structures to one
myisam/mi_preload.c:
  Merge key cache structures to one
myisam/mi_test1.c:
  Merge key cache structures to one
myisam/mi_test2.c:
  Merge key cache structures to one
myisam/mi_test3.c:
  Merge key cache structures to one
myisam/myisamchk.c:
  Merge key cache structures to one
myisam/myisamdef.h:
  Merge key cache structures to one
myisam/myisamlog.c:
  Merge key cache structures to one
  Removed not used option
myisam/sort.c:
  Fixed compiler warnings
myisam/sp_test.c:
  Fixed compiler warnings
mysql-test/r/case.result:
  Updated results after fix of correct NULL detection in WHEN
mysql-test/r/date_formats.result:
  Updated results after fixing date handling
mysql-test/r/symlink.result:
  Updated results after adding DEFAULT CHARSET
mysql-test/t/case.test:
  New test
mysql-test/t/symlink.test:
  Updated error numbers
mysys/hash.c:
  Made HASH_LINK struct local
mysys/mf_keycache.c:
  Merge key cache structures to one
  Fixed key_cache_read() and key_cache_write() to be resize-safe.
mysys/mf_keycaches.c:
  Merge key cache structures to one
mysys/thr_mutex.c:
  Added test if mutex is initalized
sql-common/client.c:
  Remove STDCALL from internal functions
sql/derror.cc:
  Added comment
sql/field.cc:
  Removed not used variables
sql/ha_innodb.cc:
  Fixed compiler warnings (removed not used variables)
sql/ha_myisam.cc:
  Merge key cache structures to one
sql/ha_myisammrg.cc:
  Removed not used variables
sql/handler.cc:
  Merge key cache structures to one
sql/handler.h:
  Merge key cache structures to one
sql/item.cc:
  Fixed compiler warning
sql/item_cmpfunc.cc:
  Remove not used variables
sql/item_func.cc:
  Remove not used variables
sql/item_strfunc.cc:
  Removed not used variables
sql/item_sum.cc:
  Removed not used variables
  Moved setting of item_thd to fix_fields()
sql/item_timefunc.cc:
  Removed not used variables
sql/mysql_priv.h:
  Merge key cache structures to one
sql/mysqld.cc:
  Merge key cache structures to one
  init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used
sql/opt_sum.cc:
  Remove not used variables
sql/protocol.cc:
  Don't send errors after ok has been sent
sql/protocol_cursor.cc:
  Remove not used variable
  Simple optimization
sql/repl_failsafe.cc:
  Remove not used variables
sql/set_var.cc:
  Merge key cache structures to one
sql/set_var.h:
  Merge key cache structures to one
sql/sql_acl.cc:
  Remove not used variables
sql/sql_base.cc:
  Remove not used function
sql/sql_db.cc:
  Remove not used variables
sql/sql_handler.cc:
  Remove not used variables
sql/sql_insert.cc:
  More DBUG statements
  Simple code cleanup
sql/sql_lex.cc:
  Remove not used variables
sql/sql_parse.cc:
  Remove not used variables
sql/sql_prepare.cc:
  Remove not used variables
sql/sql_repl.cc:
  Remove not used variables
sql/sql_select.cc:
  Remove not used variables
sql/sql_show.cc:
  Remove not used variables
sql/sql_table.cc:
  Merge key cache structures to one
  Removed not used variables
sql/sql_test.cc:
  Merge key cache structures to one
sql/strfunc.cc:
  Fixed that find_type() returns correct value for partly matched words.
  (This fixed the error found by date_formats.test)
sql/time.cc:
  Remove not used variables
strings/my_strtoll10.c:
  Fixed compiler warnings

5 files changed, 21 insertions, 18 deletions

diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result
index 9b03422f54c..e9d432de077 100644
--- a/mysql-test/r/case.result
+++ b/mysql-test/r/case.result
@@ -90,19 +90,21 @@ CASE WHEN 1 THEN  1  ELSE 'a' END AS c4,
 CASE WHEN 1 THEN 'a' ELSE 1.0 END AS c5,
 CASE WHEN 1 THEN 1.0 ELSE 'a' END AS c6,
 CASE WHEN 1 THEN  1  ELSE 1.0 END AS c7,
-CASE WHEN 1 THEN 1.0 ELSE  1  END AS c8
+CASE WHEN 1 THEN 1.0 ELSE  1  END AS c8,
+CASE WHEN 1 THEN 1.0 END AS c9
 ;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` char(1) character set latin1 collate latin1_danish_ci default NULL,
-  `c2` char(1) character set latin1 collate latin1_danish_ci default NULL,
-  `c3` char(1) default NULL,
-  `c4` char(1) default NULL,
-  `c5` char(3) default NULL,
-  `c6` char(3) default NULL,
-  `c7` double(3,1) default NULL,
-  `c8` double(3,1) default NULL
+  `c1` char(1) character set latin1 collate latin1_danish_ci NOT NULL default '',
+  `c2` char(1) character set latin1 collate latin1_danish_ci NOT NULL default '',
+  `c3` char(1) NOT NULL default '',
+  `c4` char(1) NOT NULL default '',
+  `c5` char(3) NOT NULL default '',
+  `c6` char(3) NOT NULL default '',
+  `c7` double(3,1) NOT NULL default '0.0',
+  `c8` double(3,1) NOT NULL default '0.0',
+  `c9` double(3,1) default NULL
 ) TYPE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SELECT CASE 
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result
index 346d086f34c..5eb21c40a3e 100644
--- a/mysql-test/r/date_formats.result
+++ b/mysql-test/r/date_formats.result
@@ -120,7 +120,7 @@ date	format	str_to_date
 10:20:10.44AM	%h:%i:%s.%f%p	0000-00-00 10:20:10.000044
 15-01-2001 12:59:58	%d-%m-%Y %H:%i:%S	2001-01-15 12:59:58
 15 September 2001	%d %M %Y	2001-09-15 00:00:00
-15 SEPTEMB 2001	%d %M %Y	2001-01-15 00:00:00
+15 SEPTEMB 2001	%d %M %Y	2001-09-15 00:00:00
 15 MAY 2001	%d %b %Y	2001-05-15 00:00:00
 Sunday 15 MAY 2001	%W %d %b %Y	2001-05-15 00:00:00
 Sund 15 MAY 2001	%W %d %b %Y	2001-05-15 00:00:00
@@ -144,7 +144,7 @@ date	format	con
 10:20:10.44AM	%h:%i:%s.%f%p	0000-00-00 10:20:10.000044
 15-01-2001 12:59:58	%d-%m-%Y %H:%i:%S	2001-01-15 12:59:58
 15 September 2001	%d %M %Y	2001-09-15 00:00:00
-15 SEPTEMB 2001	%d %M %Y	2001-01-15 00:00:00
+15 SEPTEMB 2001	%d %M %Y	2001-09-15 00:00:00
 15 MAY 2001	%d %b %Y	2001-05-15 00:00:00
 Sunday 15 MAY 2001	%W %d %b %Y	2001-05-15 00:00:00
 Sund 15 MAY 2001	%W %d %b %Y	2001-05-15 00:00:00
@@ -168,7 +168,7 @@ date	format	datetime
 10:20:10.44AM	%h:%i:%s.%f%p	0000-00-00 10:20:10.000044
 15-01-2001 12:59:58	%d-%m-%Y %H:%i:%S	2001-01-15 12:59:58
 15 September 2001	%d %M %Y	2001-09-15 00:00:00
-15 SEPTEMB 2001	%d %M %Y	2001-01-15 00:00:00
+15 SEPTEMB 2001	%d %M %Y	2001-09-15 00:00:00
 15 MAY 2001	%d %b %Y	2001-05-15 00:00:00
 Sunday 15 MAY 2001	%W %d %b %Y	2001-05-15 00:00:00
 Sund 15 MAY 2001	%W %d %b %Y	2001-05-15 00:00:00
@@ -192,7 +192,7 @@ date	format	date2
 10:20:10.44AM	%h:%i:%s.%f%p	0000-00-00
 15-01-2001 12:59:58	%d-%m-%Y %H:%i:%S	2001-01-15
 15 September 2001	%d %M %Y	2001-09-15
-15 SEPTEMB 2001	%d %M %Y	2001-01-15
+15 SEPTEMB 2001	%d %M %Y	2001-09-15
 15 MAY 2001	%d %b %Y	2001-05-15
 Sunday 15 MAY 2001	%W %d %b %Y	2001-05-15
 Sund 15 MAY 2001	%W %d %b %Y	2001-05-15
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index c31d1019d89..a56fe3e1462 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -40,7 +40,7 @@ t9	CREATE TABLE `t9` (
   `b` char(16) NOT NULL default '',
   `c` int(11) NOT NULL default '0',
   PRIMARY KEY  (`a`)
-) TYPE=MyISAM CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
+) TYPE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
 alter table t9 rename t8, add column d int not null;
 alter table t8 rename t7;
 rename table t7 to t9;
@@ -62,5 +62,5 @@ t9	CREATE TABLE `t9` (
   `c` int(11) NOT NULL default '0',
   `d` int(11) NOT NULL default '0',
   PRIMARY KEY  (`a`)
-) TYPE=MyISAM CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
+) TYPE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
 drop database mysqltest;
diff --git a/mysql-test/t/case.test b/mysql-test/t/case.test
index 9a1b6b6bbfe..9377c6c4aef 100644
--- a/mysql-test/t/case.test
+++ b/mysql-test/t/case.test
@@ -57,7 +57,8 @@ CREATE TABLE t1 SELECT
  CASE WHEN 1 THEN 'a' ELSE 1.0 END AS c5,
  CASE WHEN 1 THEN 1.0 ELSE 'a' END AS c6,
  CASE WHEN 1 THEN  1  ELSE 1.0 END AS c7,
- CASE WHEN 1 THEN 1.0 ELSE  1  END AS c8
+ CASE WHEN 1 THEN 1.0 ELSE  1  END AS c8,
+ CASE WHEN 1 THEN 1.0 END AS c9
 ;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
index 4be0cd0c6a2..f618c342936 100644
--- a/mysql-test/t/symlink.test
+++ b/mysql-test/t/symlink.test
@@ -65,7 +65,7 @@ drop table t1;
 #
 
 disable_query_log;
---error 1279,1279
+--error 1103,1103
 create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="tmp";
 
 # Check that we cannot link over a table from another database.
@@ -75,7 +75,7 @@ create database mysqltest;
 --error 1,1
 create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="/this-dir-does-not-exist";
 
---error 1279,1279
+--error 1103,1103
 create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="not-hard-path";
 
 --error 1,1