bk commit into 5.1 tree (jani:1.1950)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1950 05/12/05 10:24:54 jani@stripped +13 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

  storage/myisam/myisampack.c
    1.51 05/12/05 10:24:45 jani@stripped +0 -0
    Auto merged

  storage/myisam/myisamchk.c
    1.120 05/12/05 10:24:45 jani@stripped +0 -0
    Auto merged

  sql/sql_repl.cc
    1.146 05/12/05 10:24:45 jani@stripped +0 -0
    Auto merged

  sql/sql_parse.cc
    1.491 05/12/05 10:24:44 jani@stripped +0 -0
    Auto merged

  sql/sql_class.h
    1.274 05/12/05 10:24:44 jani@stripped +0 -0
    Auto merged

  sql/sp_head.cc
    1.202 05/12/05 10:24:44 jani@stripped +0 -1
    Auto merged

  sql/mysqld.cc
    1.498 05/12/05 10:24:44 jani@stripped +0 -0
    Auto merged

  storage/myisam/myisampack.c
    1.39.12.2 05/12/05 10:24:43 jani@stripped +0 -0
    Merge rename: myisam/myisampack.c -> storage/myisam/myisampack.c

  sql/mysql_priv.h
    1.350 05/12/05 10:24:43 jani@stripped +0 -0
    Auto merged

  sql/log.cc
    1.177 05/12/05 10:24:43 jani@stripped +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.173 05/12/05 10:24:43 jani@stripped +0 -0
    Auto merged

  include/my_sys.h
    1.179 05/12/05 10:24:43 jani@stripped +0 -0
    Auto merged

  include/my_global.h
    1.117 05/12/05 10:24:43 jani@stripped +0 -0
    Auto merged

  client/mysqldump.c
    1.219 05/12/05 10:24:43 jani@stripped +0 -0
    Auto merged

  storage/myisam/myisamchk.c
    1.112.9.2 05/12/05 10:24:42 jani@stripped +0 -0
    Merge rename: myisam/myisamchk.c -> storage/myisam/myisamchk.c

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.1-new/RESYNC

--- 1.178/include/my_sys.h	2005-11-22 02:02:32 +02:00
+++ 1.179/include/my_sys.h	2005-12-05 10:24:43 +02:00
@@ -821,7 +821,11 @@
 #define MAP_NOSYNC      0
 #endif
 
+#ifdef HAVE_MMAP64
+#define my_mmap(a,b,c,d,e,f)    mmap64(a,b,c,d,e,f)
+#else
 #define my_mmap(a,b,c,d,e,f)    mmap(a,b,c,d,e,f)
+#endif
 #ifdef HAVE_GETPAGESIZE
 #define my_getpagesize()        getpagesize()
 #else

--- 1.490/sql/sql_parse.cc	2005-12-01 11:02:45 +02:00
+++ 1.491/sql/sql_parse.cc	2005-12-05 10:24:44 +02:00
@@ -791,6 +791,9 @@
 
   DBUG_PRINT("info",
              ("New connection received on %s", vio_description(net->vio)));
+#ifdef SIGNAL_WITH_VIO_CLOSE
+  thd->set_active_vio(net->vio);
+#endif
 
   if (!thd->main_security_ctx.host)         // If TCP/IP connection
   {

--- 1.116/include/my_global.h	2005-11-24 02:38:32 +02:00
+++ 1.117/include/my_global.h	2005-12-05 10:24:43 +02:00
@@ -541,6 +541,17 @@
 #define __attribute__(A)
 #endif
 
+/*
+  Wen using the embedded library, users might run into link problems,
+  dupicate declaration of __cxa_pure_virtual, solved by declaring it a
+  weak symbol.
+*/
+#ifdef USE_MYSYS_NEW
+C_MODE_START
+int __cxa_pure_virtual () __attribute__ ((weak));
+C_MODE_END
+#endif
+
 /* From old s-system.h */
 
 /*