Merge mysql.com:/home/jonas/src/mysql-5.0

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

innobase/include/rem0rec.h

@@ -139,7 +139,7 @@ bits of a record.  (Only compact records have status bits.) */
 UNIV_INLINE
 ulint
 rec_get_info_and_status_bits(
-/*==============*/
+/*=========================*/
 			/* out: info bits */
 	rec_t*	rec,	/* in: physical record */
 	ibool	comp);	/* in: TRUE=compact page format */
@@ -149,7 +149,7 @@ bits of a record.  (Only compact records have status bits.) */
 UNIV_INLINE
 void
 rec_set_info_and_status_bits(
-/*==============*/
+/*=========================*/
 	rec_t*	rec,	/* in: physical record */
 	ibool	comp,	/* in: TRUE=compact page format */
 	ulint	bits);	/* in: info bits */

innobase/include/rem0rec.ic

@@ -564,7 +564,7 @@ rec_set_info_and_status_bits(
 	} else {
 		ut_ad(!(bits & ~(REC_INFO_BITS_MASK >> REC_INFO_BITS_SHIFT)));
 	}
-	rec_set_info_bits(rec, bits & ~REC_NEW_STATUS_MASK, comp);
+	rec_set_info_bits(rec, comp, bits & ~REC_NEW_STATUS_MASK);
 }
 
 /**********************************************************

libmysqld/examples/Makefile.am

@@ -29,7 +29,7 @@ mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
 mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
 
 mysql_client_test_embedded_LINK = $(CXXLINK)
-mysql_client_test_embedded_SOURCES = $(top_srcdir)/tests/mysql_client_test.c
+mysql_client_test_embedded_SOURCES = mysql_client_test.c
 
 clean:
 	rm -f $(client_sources)

mysql-test/t/ndb_index_unique.test

 -- source include/have_ndb.inc
 
 --disable_warnings
-drop table if exists t1, t2, t3, t4, t5, t6, t7;
+drop table if exists t1, t2, t3, t4, t5, t6, t7, t8;
 --enable_warnings
 
 #