Commit 6926e703 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
parents 3410ce09 fcb2a0ab

innobase/include/sync0rw.h

+1 −2
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ Creates, or rather, initializes an rw-lock object in a specified memory 
location (which must be appropriately aligned). The rw-lock is initialized

to the non-locked state. Explicit freeing of the rw-lock with rw_lock_free

is necessary only if the memory block containing it is freed. */

#define rw_lock_create(L) rw_lock_create_func(\

            (L), __FILE__, __LINE__, __STRING(L))

#define rw_lock_create(L) rw_lock_create_func((L), __FILE__, __LINE__, #L)

          

/*=====================*/

/**********************************************************************

innobase/include/sync0sync.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ location (which must be appropriately aligned). The mutex is initialized 
in the reset state. Explicit freeing of the mutex with mutex_free is

necessary only if the memory block containing it is freed. */



#define mutex_create(M)	mutex_create_func((M), __FILE__, __LINE__, __STRING(M))

#define mutex_create(M)	mutex_create_func((M), __FILE__, __LINE__, #M)

/*===================*/

/**********************************************************************

Creates, or rather, initializes a mutex object in a specified memory

mysql-test/r/mysqldump.result

+1 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1, `"t"1`;

DROP TABLE IF EXISTS t1, `"t"1`, t1aa,t2aa;

drop database if exists mysqldump_test_db;

CREATE TABLE t1(a int);

INSERT INTO t1 VALUES (1), (2);

mysql-test/r/show_check.result

+1 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

drop table if exists t1aa,t2aa;

drop database if exists mysqltest;

delete from mysql.user where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';

delete from mysql.db where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';

mysql-test/r/sp.result

+2 −5
Original line number Diff line number Diff line
@@ -1639,12 +1639,9 @@ yz,yz 
drop procedure bug3368|

drop table t3|

drop table if exists t3|

create table t3 (f1 int, f2 int);

insert into t3 values (1,1);

--disable_warnings|

create table t3 (f1 int, f2 int)|

insert into t3 values (1,1)|

drop procedure if exists bug4579_1|

Warnings:

Note	1305	PROCEDURE bug4579_1 does not exist

create procedure bug4579_1 ()

begin

declare sf1 int;