Code cleanup

Fixed bug in optimizer where it didn't choose right table order in some cases


myisam/mi_delete.c:
  Remove not needed include errno.h
myisam/mi_delete_table.c:
  Remove not needed include errno.h
myisam/mi_extra.c:
  Remove not needed include errno.h
myisam/mi_locking.c:
  Remove not needed include errno.h
myisam/mi_log.c:
  Remove not needed include errno.h
myisam/mi_page.c:
  Remove not needed include errno.h
myisam/mi_rename.c:
  Remove not needed include errno.h
myisam/mi_update.c:
  Remove not needed include errno.h
myisam/mi_write.c:
  Remove not needed include errno.h
mysql-test/r/subselect.result:
  Update of test after optimzier fix
mysys/charset.c:
  Code cleanup
sql/item_cmpfunc.cc:
  Removed not needed comment
  Indentation cleanup
sql/item_cmpfunc.h:
  Indentation cleanup
sql/mysqld.cc:
  Updated comment for expire_logs_days
sql/set_var.cc:
  Remved duplicate code
sql/sql_select.cc:
  Fixed bug in optimizer where it didn't choose right table order in some cases (Bug found and fixed by Igor)

9 files changed, 0 insertions, 29 deletions

diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c
index a55d5b2a5ca..19cfc050ea1 100644
--- a/myisam/mi_delete.c
+++ b/myisam/mi_delete.c
@@ -20,10 +20,6 @@
 #include "rt_index.h"
 #include <assert.h>
 
-#ifdef	__WIN__
-#include <errno.h>
-#endif
-
 static int d_search(MI_INFO *info,MI_KEYDEF *keyinfo,uint comp_flag,
                     uchar *key,uint key_length,my_off_t page,uchar *anc_buff);
 static int del(MI_INFO *info,MI_KEYDEF *keyinfo,uchar *key,uchar *anc_buff,
diff --git a/myisam/mi_delete_table.c b/myisam/mi_delete_table.c
index 6d842d7e6a4..6843881568d 100644
--- a/myisam/mi_delete_table.c
+++ b/myisam/mi_delete_table.c
@@ -19,9 +19,6 @@
 */
 
 #include "fulltext.h"
-#ifdef	__WIN__
-#include <errno.h>
-#endif
 
 int mi_delete_table(const char *name)
 {
diff --git a/myisam/mi_extra.c b/myisam/mi_extra.c
index 10f52f1e39a..ce072d7d57e 100644
--- a/myisam/mi_extra.c
+++ b/myisam/mi_extra.c
@@ -18,9 +18,6 @@
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
 #endif
-#ifdef	__WIN__
-#include <errno.h>
-#endif
 
 /*
   Set options and buffers to optimize table handling
diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c
index 67ccca52d08..816748d459a 100644
--- a/myisam/mi_locking.c
+++ b/myisam/mi_locking.c
@@ -22,9 +22,6 @@
   */
 
 #include "myisamdef.h"
-#ifdef	__WIN__
-#include <errno.h>
-#endif
 
 	/* lock table by F_UNLCK, F_RDLCK or F_WRLCK */
 
diff --git a/myisam/mi_log.c b/myisam/mi_log.c
index 1dcfd5250d2..13842c56828 100644
--- a/myisam/mi_log.c
+++ b/myisam/mi_log.c
@@ -21,7 +21,6 @@
 
 #include "myisamdef.h"
 #if defined(MSDOS) || defined(__WIN__)
-#include <errno.h>
 #include <fcntl.h>
 #ifndef __WIN__
 #include <process.h>
diff --git a/myisam/mi_page.c b/myisam/mi_page.c
index c70209c2da6..16713c87e10 100644
--- a/myisam/mi_page.c
+++ b/myisam/mi_page.c
@@ -17,9 +17,6 @@
 /* Read and write key blocks */
 
 #include "myisamdef.h"
-#ifdef	__WIN__
-#include <errno.h>
-#endif
 
 	/* Fetch a key-page in memory */
 
diff --git a/myisam/mi_rename.c b/myisam/mi_rename.c
index db44b8fe28f..8380ee1bfad 100644
--- a/myisam/mi_rename.c
+++ b/myisam/mi_rename.c
@@ -19,9 +19,6 @@
 */
 
 #include "fulltext.h"
-#ifdef	__WIN__
-#include <errno.h>
-#endif
 
 int mi_rename(const char *old_name, const char *new_name)
 {
diff --git a/myisam/mi_update.c b/myisam/mi_update.c
index d1d41ac351a..f62be133ed9 100644
--- a/myisam/mi_update.c
+++ b/myisam/mi_update.c
@@ -19,11 +19,6 @@
 #include "fulltext.h"
 #include "rt_index.h"
 
-#ifdef	__WIN__
-#include <errno.h>
-#endif
-
-
 int mi_update(register MI_INFO *info, const byte *oldrec, byte *newrec)
 {
   int flag,key_changed,save_errno;
diff --git a/myisam/mi_write.c b/myisam/mi_write.c
index d13ba6c2c4e..4b7a22dac84 100644
--- a/myisam/mi_write.c
+++ b/myisam/mi_write.c
@@ -20,10 +20,6 @@
 #include "rt_index.h"
 #include <assert.h>
 
-#ifdef	__WIN__
-#include <errno.h>
-#endif
-
 #define MAX_POINTER_LENGTH 8
 
 	/* Functions declared in this file */