Commit 03951972 authored by unknown's avatar unknown
Browse files

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents dad03459 fc7b19d4

include/violite.h

+2 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ int vio_close_shared_memory(Vio * vio); 
#if defined(HAVE_VIO) && !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

+5 −6
Original line number Diff line number Diff line
@@ -3731,6 +3731,7 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv, 
                      db ? db : "", want_access, thd->master_access));

#ifndef NO_EMBEDDED_ACCESS_CHECKS

  ulong db_access;

  bool  db_is_pattern= test(want_access & GRANT_ACL);

#endif

  ulong dummy;

  if (save_priv)
@@ -3757,9 +3758,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);

  }
@@ -3777,9 +3777,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

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ main( int argc __attribute__((unused)), 
	/* 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");