bk commit into 5.1 tree (cmiller:1.2293)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-30 18:46:59-04:00, cmiller@stripped +22 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
  MERGE: 1.2280.1.7

  client/mysqltest.c@stripped, 2006-08-30 18:46:54-04:00, cmiller@stripped +0 -1
    Automerged.
    MERGE: 1.221.1.1

  include/config-netware.h@stripped, 2006-08-30 18:34:35-04:00, cmiller@stripped +0
-0
    Auto merged
    MERGE: 1.16.1.1

  mysql-test/r/func_time.result@stripped, 2006-08-30 18:34:35-04:00,
cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.68.1.3

  mysql-test/t/func_time.test@stripped, 2006-08-30 18:34:36-04:00, cmiller@stripped
+0 -0
    Auto merged
    MERGE: 1.54.1.3

  sql/ha_innodb.cc@stripped, 2006-08-30 18:46:54-04:00, cmiller@stripped +0 -0
    Automerged.
    MERGE: 1.284.1.3

  sql/item_timefunc.cc@stripped, 2006-08-30 18:34:40-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.129.1.3

  sql/sql_acl.cc@stripped, 2006-08-30 18:46:54-04:00, cmiller@stripped +0 -0
    Automerged.
    MERGE: 1.204.1.4

  storage/innobase/btr/btr0btr.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -1
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.44.1.1

  storage/innobase/buf/buf0buf.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -2
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.53.1.1

  storage/innobase/dict/dict0dict.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +1 -6
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.83.1.1

  storage/innobase/fil/fil0fil.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -6
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.65.1.1

  storage/innobase/fsp/fsp0fsp.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -1
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.28.1.1

  storage/innobase/include/btr0cur.ic@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -0
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.6.1.1

  storage/innobase/include/buf0buf.ic@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +1 -4
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.20.1.1

  storage/innobase/log/log0log.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -1
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.47.1.1

  storage/innobase/log/log0recv.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -2
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.55.1.1

  storage/innobase/os/os0file.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +1 -7
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.116.1.1

  storage/innobase/row/row0mysql.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -13
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.128.1.1

  storage/innobase/row/row0sel.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -1
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.106.1.1

  storage/innobase/srv/srv0start.c@stripped, 2006-08-30 18:46:54-04:00,
cmiller@stripped +0 -1
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.93.1.1

  storage/innobase/ut/ut0dbg.c@stripped, 2006-08-30 18:46:54-04:00, cmiller@stripped
+1 -2
    Merged doc URL change, but otherwise null-merged.
    MERGE: 1.11.1.1

  tests/mysql_client_test.c@stripped, 2006-08-30 18:46:54-04:00, cmiller@stripped
+0 -0
    Automerged.
    MERGE: 1.204.1.2

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/merge/mysql-5.1-new-maint/RESYNC

--- 1.8/storage/innobase/include/btr0cur.ic	2006-08-30 18:47:07 -04:00
+++ 1.9/storage/innobase/include/btr0cur.ic	2006-08-30 18:47:07 -04:00
@@ -52,7 +52,10 @@
 				/* out: pointer to page */
 	btr_cur_t*	cursor)	/* in: tree cursor */
 {
-	return(buf_frame_align(page_cur_get_rec(&(cursor->page_cur))));
+	page_t*	page = buf_frame_align(page_cur_get_rec(&(cursor->page_cur)));
+	ut_ad(!!page_is_comp(page)
+		== dict_table_is_comp(cursor->index->table));
+	return(page);
 }
 
 /*************************************************************

--- 1.118/storage/innobase/os/os0file.c	2006-08-30 18:47:07 -04:00
+++ 1.119/storage/innobase/os/os0file.c	2006-08-30 18:47:07 -04:00
@@ -2613,7 +2613,7 @@
 The function os_file_dirname returns a directory component of a
 null-terminated pathname string.  In the usual case, dirname returns
 the string up to, but not including, the final '/', and basename
-is the component following the final '/'.  Trailing '/' charac­
+is the component following the final '/'.  Trailing '/' charac­
 ters are not counted as part of the pathname.
 
 If path does not contain a slash, dirname returns the string ".".

--- 1.13/storage/innobase/ut/ut0dbg.c	2006-08-30 18:47:07 -04:00
+++ 1.14/storage/innobase/ut/ut0dbg.c	2006-08-30 18:47:07 -04:00
@@ -42,7 +42,7 @@
 {
 	ut_print_timestamp(stderr);
 	fprintf(stderr,
-		"  InnoDB: Assertion failure in thread %lu"
+		"InnoDB: Assertion failure in thread %lu"
 		" in file %s line %lu\n",
 		os_thread_pf(os_thread_get_curr_id()), file, line);
 	if (expr) {