bk commit into 4.1 tree (igreenhoe:1.2538) BUG#16635

[Ian Greenhoe]

Below is the list of changes that have just been committed into a local
4.1 repository of greenman. When greenman 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-15 11:01:40-07:00, igreenhoe@stripped +1 -0
  Fix for bug #16635 (Error messages wrong: absolute path names, "%s"
  format code)
  
  Problem:  The embedded server is more verbose when reporting path
  names than the standalone server.  This is for two reasons:  First,
  since the embedded server has no control over the current working
  directory, it must prepend the path to all files.  Second, the error
  messages that caused a problem with the test case are reporting the
  error from the paths given to the function (with that directory
  prepended.)
  
  Solution:  Fix the test cases so that they ignore the paths returned
  in the error messages if, and only if, they match the path to what
  would otherwise be the current working directory of the server.
  ($MYSQLTEST_VARDIR)
  
  Note:  The origional solution I came up with was to add an
  additional argument to the functions that were reporting the error
  which contained a sanitized version of the path.  Upon a review of
  this code, it was established that this was not a feasable solution
  since the functions were potentially used in code outside of the
  server.  Since the error messages are reporting a superset of the
  required information to the user, it was decided that a better
  solution would be to fix the tests.

  mysql-test/t/innodb.test@stripped, 2006-08-15 11:01:34-07:00, igreenhoe@stripped +3 -0
    Added "-- replace_result" lines to convert verbose output from
    embedded server to look like the less verbose lines from the
    standalone server.

# 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:	igreenhoe
# Host:	anubis.greendragongames.com
# Root:	/home/greenman/workspace-mysql/mysql/bug-4.1-16635

--- 1.80/mysql-test/t/innodb.test	2006-08-15 11:01:45 -07:00
+++ 1.81/mysql-test/t/innodb.test	2006-08-15 11:01:45 -07:00
@@ -1299,6 +1299,7 @@
 
 set foreign_key_checks=0;
 create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb;
+-- replace_result $MYSQLTEST_VARDIR . /master-data/ /
 -- error 1005
 create table t1(a char(10) primary key, b varchar(20)) engine = innodb;
 set foreign_key_checks=1;
@@ -1309,6 +1310,7 @@
 
 set foreign_key_checks=0;
 create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;
+-- replace_result $MYSQLTEST_VARDIR . /master-data/ /
 -- error 1005
 create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8;
 set foreign_key_checks=1;
@@ -1338,6 +1340,7 @@
 set foreign_key_checks=0;
 create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1;
 create table t3(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=utf8;
+-- replace_result $MYSQLTEST_VARDIR . /master-data/ /
 -- error 1025
 rename table t3 to t1;
 set foreign_key_checks=1;