Merge with 3.23.51

Fixed wrong usage of sprintf() in ha_innodb.cc


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.ja.texi:
  Auto merged
include/config-os2.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/ibuf/ibuf0ibuf.c:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/page/page0cur.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0purge.c:
  Auto merged
innobase/row/row0umod.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/key.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
Docs/manual.texi:
  Merge with 3.23.51
configure.in:
  Merge with 3.23.51
include/Makefile.am:
  Merge with 3.23.51
innobase/dict/dict0load.c:
  Merge with 3.23.51
innobase/include/univ.i:
  Merge with 3.23.51
innobase/row/row0mysql.c:
  Merge with 3.23.51
innobase/srv/srv0srv.c:
  Merge with 3.23.51
innobase/srv/srv0start.c:
  Merge with 3.23.51
myisam/mi_cache.c:
  Merge with 3.23.51
myisammrg/myrg_rnext.c:
  Merge with 3.23.51
myisammrg/myrg_rprev.c:
  Merge with 3.23.51
sql/ha_innodb.cc:
  Merge with 3.23.51
  Changed used of sprintf() to make code portable.
sql/handler.cc:
  Indentation change
sql/lex.h:
  Comment cleanup
sql/log.cc:
  Merge with 3.23.51
sql/log_event.h:
  Merge with 3.23.51
sql/mysql_priv.h:
  Merge with 3.23.51
sql/mysqld.cc:
  Merge with 3.23.51
  Cleaned up handling of innodb_flush_log_at_trx_commit
sql/share/portuguese/errmsg.txt:
  Merge with 3.23.51
sql/slave.cc:
  Not merged as this affects many files; Will be fixed in next changeset
sql/slave.h:
  Merge with 3.23.51
sql/sql_acl.cc:
  Merge with 3.23.51 (no changes)
sql/sql_db.cc:
  Merge with 3.23.51
sql/sql_parse.cc:
  Merge with 3.23.51
sql/sql_yacc.yy:
  Merge with 3.23.51
  (Renamed NO_FOREIGN_KEY_CHECKS and RELAXED_UNIQUE_CHECKS)
support-files/mysql.spec.sh:
  Merge with 3.23.51

3 files changed, 22 insertions, 6 deletions

diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index 3ca07b7b80b..646bedf9603 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -21,7 +21,10 @@ INCLUDES =		@MT_INCLUDES@ -I$(srcdir)/../include -I../include -I.. -I$(srcdir)
 pkglib_LIBRARIES =	libmysys.a
 LDADD =			libmysys.a ../dbug/libdbug.a \
 			../strings/libmystrings.a
-noinst_HEADERS =	mysys_priv.h my_static.h
+noinst_HEADERS =	mysys_priv.h my_static.h \
+			my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
+			my_os2dlfcn.c my_os2file64.c my_os2mutex.c \
+			my_os2thread.c my_os2tls.c
 libmysys_a_SOURCES =	my_init.c my_getwd.c mf_getdate.c\
 			mf_path.c mf_loadpath.c\
 			my_open.c my_create.c my_dup.c my_seek.c my_read.c \
diff --git a/mysys/my_os2file64.c b/mysys/my_os2file64.c
index b7ee40d292e..2f41d344e32 100644
--- a/mysys/my_os2file64.c
+++ b/mysys/my_os2file64.c
@@ -22,6 +22,7 @@ void        _OS2errno( APIRET rc);
 longlong    _lseek64( int fd, longlong offset, int seektype);
 int         _lock64( int fd, int locktype, my_off_t start,
                      my_off_t length, myf MyFlags);
+int         _sopen64( const char *name, int oflag, int shflag, int mask);
 
 //
 // this class is used to define a global c++ variable, that
@@ -191,8 +192,17 @@ inline _SetFileLocksL(HFILE hFile,
                           ULONG timeout,
                           ULONG flags)
 {
-   if (_DosSetFileLocksL)
-      return _DosSetFileLocksL( hFile, pflUnlock, pflLock, timeout, flags);
+   if (_DosSetFileLocksL) {
+      APIRET rc;
+      rc = _DosSetFileLocksL( hFile, pflUnlock, pflLock, timeout, flags);
+
+      // on FAT/HPFS/LAN a INVALID_PARAMETER is returned, seems that 
+      // only JFS can handle >2GB ranges.
+      if (rc != 87)
+         return rc;
+
+      // got INVALID_PARAMETER, fallback to standard call
+   }
 
    FILELOCK flUnlock = { pflUnlock->lOffset, pflUnlock->lRange };
    FILELOCK flLock = { pflLock->lOffset, pflLock->lRange };
@@ -254,7 +264,7 @@ int         _lock64( int fd, int locktype, my_off_t start,
    return(-1);
 }
 
-int         _sopen( const char *name, int oflag, int shflag, int mask)
+int         sopen( const char *name, int oflag, int shflag, int mask)
 {
    int      fail_errno;
    APIRET   rc = 0;
diff --git a/mysys/my_os2thread.c b/mysys/my_os2thread.c
index 017ba7f316b..89a3311c10b 100644
--- a/mysys/my_os2thread.c
+++ b/mysys/my_os2thread.c
@@ -53,6 +53,7 @@ void win_pthread_init(void)
 
 static pthread_handler_decl(pthread_start,param)
 {
+  DBUG_ENTER("pthread_start");
   pthread_handler func=((struct pthread_map *) param)->func;
   void *func_param=((struct pthread_map *) param)->param;
   my_thread_init();			/* Will always succeed in windows */
@@ -60,8 +61,10 @@ static pthread_handler_decl(pthread_start,param)
   win_pthread_self=((struct pthread_map *) param)->pthreadself;
   pthread_mutex_unlock(&THR_LOCK_thread);
   free((char*) param);			  /* Free param from create */
-  pthread_exit((void*) (*func)(func_param));
-  return 0;				  /* Safety */
+  //pthread_exit((void*) (*func)(func_param));
+  (*func)(func_param);
+  DBUG_RETURN(0);
+  //return 0;				  /* Safety */
 }