merged

BitKeeper/etc/logging_ok:
  auto-union
include/violite.h:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Build-tools/Do-compile

@@ -10,8 +10,8 @@ use Sys::Hostname;
 $opt_comment=$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env="";
 $opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";
 $opt_tmp=$opt_version_suffix="";
-$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;
-$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=$opt_with_federated=0;
+$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=$opt_with_blackhole=0;
+$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=$opt_with_federated=$opt_with_big_tables=0;
 $global_step="";
 
 GetOptions(
@@ -58,6 +58,8 @@ GetOptions(
 	"user=s",
 	"version-suffix=s",
 	"with-archive",
+        "with-big-tables",
+        "with-blackhole",
 	"with-cluster",
 	"with-csv",
 	"with-debug",
@@ -275,6 +277,7 @@ if ($opt_stage <= 1)
   $opt_config_options.= " --without-ndb-debug" if ($opt_with_debug && $opt_with_cluster);
   $opt_config_options.= " --with-libwrap" if ($opt_libwrap);
   $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);
+  $opt_config_options.= " --with-big-tables" if ($opt_with_big_tables);
   $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);
   $opt_config_options.= " --with-raid" if ($opt_raid);
 	if ($opt_readline)
@@ -288,6 +291,7 @@ if ($opt_stage <= 1)
   $opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);
   $opt_skip_embedded_test= 1 if ($opt_without_embedded);
   $opt_config_options.= " --with-archive-storage-engine" if ($opt_with_archive);
+  $opt_config_options.= " --with-blackhole-storage-engine" if ($opt_with_blackhole);
   $opt_config_options.= " --with-ndbcluster" if ($opt_with_cluster);
   $opt_config_options.= " --with-csv-storage-engine" if ($opt_with_csv);
   $opt_config_options.= " --with-example-storage-engine" if ($opt_with_example);

include/violite.h

@@ -144,8 +144,8 @@ int vio_close_shared_memory(Vio * vio);
 #if !defined(DONT_MAP_VIO)
 #define vio_delete(vio) 			(vio)->viodelete(vio)
 #define vio_errno(vio)	 			(vio)->vioerrno(vio)
-#define vio_read(vio, buf, size) 		(vio)->read(vio,buf,size)
-#define vio_write(vio, buf, size) 		(vio)->write(vio, buf, size)
+#define vio_read(vio, buf, size)                ((vio)->read)(vio,buf,size)
+#define vio_write(vio, buf, size)               ((vio)->write)(vio, buf, size)
 #define vio_blocking(vio, set_blocking_mode, old_mode)\
  	(vio)->vioblocking(vio, set_blocking_mode, old_mode)
 #define vio_is_blocking(vio) 			(vio)->is_blocking(vio)

sql/sql_parse.cc

@@ -4579,6 +4579,7 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
 {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   ulong db_access;
+  bool  db_is_pattern= test(want_access & GRANT_ACL);
 #endif
   ulong dummy;
   DBUG_ENTER("check_access");
@@ -4610,9 +4611,8 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
     */
     db_access= thd->db_access;
     if (!(thd->master_access & SELECT_ACL) &&
-	(db && (!thd->db || strcmp(db,thd->db))))
-      db_access=acl_get(thd->host, thd->ip,
-			thd->priv_user, db, test(want_access & GRANT_ACL));
+	(db && (!thd->db || db_is_pattern || strcmp(db,thd->db))))
+      db_access=acl_get(thd->host, thd->ip, thd->priv_user, db, db_is_pattern);
     *save_priv=thd->master_access | db_access;
     DBUG_RETURN(FALSE);
   }
@@ -4633,9 +4633,8 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
   if (db == any_db)
     DBUG_RETURN(FALSE);				// Allow select on anything
 
-  if (db && (!thd->db || strcmp(db,thd->db)))
-    db_access=acl_get(thd->host, thd->ip,
-		      thd->priv_user, db, test(want_access & GRANT_ACL));
+  if (db && (!thd->db || db_is_pattern || strcmp(db,thd->db)))
+    db_access=acl_get(thd->host, thd->ip, thd->priv_user, db, db_is_pattern);
   else
     db_access=thd->db_access;
   DBUG_PRINT("info",("db_access: %lu", db_access));

strings/my_strtoll10-x86.s

@@ -394,7 +394,7 @@ my_strtoll10:
 	popl %ebp
 	ret
 
-my_strtoll10_end:
+.my_strtoll10_end:
 	.size	my_strtoll10,.my_strtoll10_end-my_strtoll10
         .comm   res,240,32
         .comm   end_ptr,120,32

vio/test-ssl.c

@@ -115,7 +115,7 @@ main(int argc, char**	argv)
   {
     /* child, therefore, client */
     char	xbuf[100];
-    int	r = client_vio->read(client_vio,xbuf, sizeof(xbuf));
+    int	r = vio_read(client_vio,xbuf, sizeof(xbuf));
     if (r<=0) {
       my_free((gptr)ssl_acceptor,MYF(0));
       my_free((gptr)ssl_connector,MYF(0));
@@ -130,7 +130,7 @@ main(int argc, char**	argv)
   else
   {
     const char*	s = "Huhuhuh";
-    int		r = server_vio->write(server_vio,(gptr)s, strlen(s));
+    int		r = vio_write(server_vio,(gptr)s, strlen(s));
     if (r<=0) {
       my_free((gptr)ssl_acceptor,MYF(0));
       my_free((gptr)ssl_connector,MYF(0));

vio/test-sslclient.c

@@ -77,13 +77,13 @@ main(	int	argc __attribute__((unused)),
 	sa.sin_port        = htons     (1111);          /* Server Port number */
 
 	err = connect(client_vio->sd, (struct sockaddr*) &sa,
-		sizeof(sa));          
+		sizeof(sa));
 
 	/* ----------------------------------------------- */
 	/* Now we have TCP conncetion. Start SSL negotiation. */
 	read(client_vio->sd,xbuf, sizeof(xbuf));
         sslconnect(ssl_connector,client_vio,60L);
-	err = client_vio->read(client_vio,xbuf, sizeof(xbuf));
+	err = vio_read(client_vio,xbuf, sizeof(xbuf));
 	if (err<=0) {
 		my_free((gptr)ssl_connector,MYF(0));
 		fatal_error("client:SSL_read");