Commit 62ec077c authored by unknown's avatar unknown
Browse files

Merge from 5.0 to 5.1. Third part with fixes. 


mysql-test/r/mysqldump.result:
  Change in output from low letter to capital letter.
  Fixed test.
scripts/mysql_create_system_tables.sh:
  definer was removed from part of the key.
vio/viosocket.c:
  Fixed output from DBUG_PRINT() to match the style
  in other parts of the code.
parent aca736a4

mysql-test/r/mysqldump.result

+3 −3
Original line number Diff line number Diff line
@@ -1755,15 +1755,15 @@ create table t3(a int); 
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t3`;

CREATE TABLE `t3` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS `t2`;

CREATE TABLE `t2` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

scripts/mysql_create_system_tables.sh

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ then 
  c_ev="$c_ev                         'HIGH_NOT_PRECEDENCE'"

  c_ev="$c_ev                     ) DEFAULT '' NOT NULL,"

  c_ev="$c_ev   comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',"

  c_ev="$c_ev   PRIMARY KEY  (definer, db, name)"

  c_ev="$c_ev   PRIMARY KEY  (db, name)"

  c_ev="$c_ev ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';"

fi

vio/viosocket.c

+15 −8
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ int vio_read(Vio * vio, gptr buf, int size) 
{

  int r;

  DBUG_ENTER("vio_read");

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));

  DBUG_PRINT("enter", ("sd: %d  buf: 0x%lx  size: %d", vio->sd, (long) buf,

                       size));



  /* Ensure nobody uses vio_read_buff and vio_read simultaneously */

  DBUG_ASSERT(vio->read_end == vio->read_pos);
@@ -64,7 +65,8 @@ int vio_read_buff(Vio *vio, gptr buf, int size) 
  int rc;

#define VIO_UNBUFFERED_READ_MIN_SIZE 2048

  DBUG_ENTER("vio_read_buff");

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));

  DBUG_PRINT("enter", ("sd: %d  buf: 0x%lx  size: %d", vio->sd, (long) buf,

                       size));



  if (vio->read_pos < vio->read_end)

  {
@@ -102,7 +104,8 @@ int vio_write(Vio * vio, const gptr buf, int size) 
{

  int r;

  DBUG_ENTER("vio_write");

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));

  DBUG_PRINT("enter", ("sd: %d  buf: 0x%lx  size: %d", vio->sd, (long) buf,

                       size));

#ifdef __WIN__

  r = send(vio->sd, buf, size,0);

#else
@@ -223,7 +226,7 @@ int vio_keepalive(Vio* vio, my_bool set_keep_alive) 
  int r=0;

  uint opt = 0;

  DBUG_ENTER("vio_keepalive");

  DBUG_PRINT("enter", ("sd: %d, set_keep_alive: %d", vio->sd, (int)

  DBUG_PRINT("enter", ("sd: %d  set_keep_alive: %d", vio->sd, (int)

		       set_keep_alive));

  if (vio->type != VIO_TYPE_NAMEDPIPE)

  {
@@ -393,7 +396,8 @@ int vio_read_pipe(Vio * vio, gptr buf, int size) 
{

  DWORD length;

  DBUG_ENTER("vio_read_pipe");

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));

  DBUG_PRINT("enter", ("sd: %d  buf: 0x%lx  size: %d", vio->sd, (long) buf,

                       size));



  if (!ReadFile(vio->hPipe, buf, size, &length, NULL))

    DBUG_RETURN(-1);
@@ -407,7 +411,8 @@ int vio_write_pipe(Vio * vio, const gptr buf, int size) 
{

  DWORD length;

  DBUG_ENTER("vio_write_pipe");

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));

  DBUG_PRINT("enter", ("sd: %d  buf: 0x%lx  size: %d", vio->sd, (long) buf,

                       size));



  if (!WriteFile(vio->hPipe, (char*) buf, size, &length, NULL))

    DBUG_RETURN(-1);
@@ -452,7 +457,8 @@ int vio_read_shared_memory(Vio * vio, gptr buf, int size) 
  char *current_postion;



  DBUG_ENTER("vio_read_shared_memory");

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));

  DBUG_PRINT("enter", ("sd: %d  buf: 0x%lx  size: %d", vio->sd, (long) buf,

                       size));



  remain_local = size;

  current_postion=buf;
@@ -513,7 +519,8 @@ int vio_write_shared_memory(Vio * vio, const gptr buf, int size) 
  char *current_postion;



  DBUG_ENTER("vio_write_shared_memory");

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));

  DBUG_PRINT("enter", ("sd: %d  buf: 0x%lx  size: %d", vio->sd, (long) buf,

                       size));



  remain = size;

  current_postion = buf;