Merge bk-internal:/home/bk/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BUILD/compile-dist:
  Auto merged
client/mysqltest.c:
  Auto merged
config/ac-macros/ssl.m4:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/rpl_insert_id_pk.result:
  Auto merged
mysql-test/r/rpl_ndb_multi_update3.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/r/rpl_ndb_sp006.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/r/join_outer.result:
  Manual merge
mysql-test/t/func_group.test:
  Manual merge
mysql-test/t/group_min_max.test:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge

10 files changed, 0 insertions, 10 deletions

diff --git a/mysys/my_append.c b/mysys/my_append.c
index c3549c670c3..6d52c03c6cc 100644
--- a/mysys/my_append.c
+++ b/mysys/my_append.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES				/* sys/types is included */
 #include "mysys_priv.h"
 #include <sys/stat.h>
 #include <m_string.h>
diff --git a/mysys/my_clock.c b/mysys/my_clock.c
index 41d659c0ffe..70bb374a749 100644
--- a/mysys/my_clock.c
+++ b/mysys/my_clock.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "my_global.h"
 
 #if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__NETWARE__)
diff --git a/mysys/my_copy.c b/mysys/my_copy.c
index a8a3a775040..2233c791153 100644
--- a/mysys/my_copy.c
+++ b/mysys/my_copy.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES				/* sys/types is included */
 #include "mysys_priv.h"
 #include <my_dir.h> /* for stat */
 #include <m_string.h>
diff --git a/mysys/my_create.c b/mysys/my_create.c
index d27edb31d32..e1e32b50842 100644
--- a/mysys/my_create.c
+++ b/mysys/my_create.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include <my_dir.h>
 #include "mysys_err.h"
diff --git a/mysys/my_dup.c b/mysys/my_dup.c
index 9666f5b1858..1fdb4db7276 100644
--- a/mysys/my_dup.c
+++ b/mysys/my_dup.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include "mysys_err.h"
 #include <my_dir.h>
diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index 42c57e9d3c4..4ed44b0573f 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -17,7 +17,6 @@
 /* TODO: check for overun of memory for names. */
 /*	 Convert MSDOS-TIME to standar time_t (still needed?) */
 
-#define USES_TYPES		/* sys/types is included */
 #include	"mysys_priv.h"
 #include	<m_string.h>
 #include	<my_dir.h>	/* Structs used by my_dir,includes sys/types */
diff --git a/mysys/my_open.c b/mysys/my_open.c
index 6041ddde9fc..6e57132ae23 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include "mysys_err.h"
 #include <my_dir.h>
diff --git a/mysys/my_redel.c b/mysys/my_redel.c
index abfe84102ef..7782190ae11 100644
--- a/mysys/my_redel.c
+++ b/mysys/my_redel.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES				/* sys/types is included */
 #include "mysys_priv.h"
 #include <my_dir.h>
 #include <m_string.h>
diff --git a/mysys/my_rename.c b/mysys/my_rename.c
index b5d813ad787..9c27238cc72 100644
--- a/mysys/my_rename.c
+++ b/mysys/my_rename.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include <my_dir.h>
 #include "mysys_err.h"
diff --git a/mysys/test_dir.c b/mysys/test_dir.c
index f3d220e942f..c9693ab3c68 100644
--- a/mysys/test_dir.c
+++ b/mysys/test_dir.c
@@ -16,7 +16,6 @@
 
 /* TODO: Test all functions  */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include "my_dir.h"