Commit 27a116aa authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 

into  janus.mylan:/usr/home/serg/Abk/mysql-5.0


heap/hp_write.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 986d6a28 a9f4be70

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ could be out of memory"); 
    }

    if (len < 8 && net->read_pos[0] == 254)

      break; // end of data

    DBUG_PRINT("info",( "len: %lu, net->read_pos[5]: %d\n",

    DBUG_PRINT("info",( "len: %lu  net->read_pos[5]: %d\n",

			len, net->read_pos[5]));

    if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 ,

                                        len - 1, &error_msg,

include/raid.h

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ class RaidFd { 
    inline void Calculate()

    {

      DBUG_ENTER("RaidFd::_Calculate");

      DBUG_PRINT("info",("_position: %lu _raid_chunksize: %d, _size: %lu",

      DBUG_PRINT("info",("_position: %lu  _raid_chunksize: %lu  _size: %lu",

			 (ulong) _position, _raid_chunksize, (ulong) _size));



      _total_block = (ulong) (_position / _raid_chunksize);
@@ -148,7 +148,7 @@ class RaidFd { 
      _remaining_bytes = (uint) (_raid_chunksize -

				 (_position - _total_block * _raid_chunksize));

      DBUG_PRINT("info",

		 ("_total_block: %d  this_block: %d  _remaining_bytes:%d",

		 ("_total_block: %lu  this_block: %d  _remaining_bytes: %d",

		  _total_block, _this_block, _remaining_bytes));

      DBUG_VOID_RETURN;

    }

mysql-test/r/sp.result

+15 −0
Original line number Diff line number Diff line
@@ -5969,6 +5969,21 @@ SUM(f2) bug25373(f1) 
21.300000071526	NULL

DROP FUNCTION bug25373|

DROP TABLE t3|

DROP DATABASE IF EXISTS mysqltest1|

DROP DATABASE IF EXISTS mysqltest2|

CREATE DATABASE mysqltest1|

CREATE DATABASE mysqltest2|

CREATE PROCEDURE mysqltest1.p1()

DROP DATABASE mysqltest2|

use mysqltest2|

CALL mysqltest1.p1()|

Warnings:

Note	1049	Unknown database 'mysqltest2'

SELECT DATABASE()|

DATABASE()

NULL

DROP DATABASE mysqltest1|

use test|

drop table t1,t2;

CREATE TABLE t1 (a int auto_increment primary key) engine=MyISAM;

CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb;

mysql-test/t/sp.test

+41 −0
Original line number Diff line number Diff line
@@ -6929,6 +6929,47 @@ INSERT INTO t3 VALUES (1, 3.4), (1, 2), (1, 0.9), (2, 8), (2, 7)| 
SELECT SUM(f2), bug25373(f1) FROM t3 GROUP BY bug25373(f1) WITH ROLLUP|

DROP FUNCTION bug25373|

DROP TABLE t3|





#

# BUG#25082: Default database change on trigger execution breaks replication.

#

# As it turned out, this bug has actually two bugs. So, here we have two test

# cases -- one in sp.test, the other in sp-security.test.

#



#

# Test case 1: error on dropping the current database.

#



# Prepare.



--disable_warnings

DROP DATABASE IF EXISTS mysqltest1|

DROP DATABASE IF EXISTS mysqltest2|

--enable_warnings



CREATE DATABASE mysqltest1|

CREATE DATABASE mysqltest2|



# Test.



CREATE PROCEDURE mysqltest1.p1()

  DROP DATABASE mysqltest2|



use mysqltest2|



CALL mysqltest1.p1()|



SELECT DATABASE()|



# Cleanup.



DROP DATABASE mysqltest1|



use test|





#

# NOTE: The delimiter is `|`, and not `;`. It is changed to `;`

#       at the end of the file!

mysys/my_handler.c

+0 −1
Original line number Diff line number Diff line
@@ -557,4 +557,3 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) 
  }

  return keyseg;

}