bk commit into 5.1 tree (bar:1.2332) BUG#18736

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar 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
  1.2332 06/04/12 14:45:37 bar@stripped +2 -0
  Bug#18736 test case 'upgrade' fails
  
  "upgrade" failed on windows, because of lower_case_table_name.
  This fix changes letters to lower case, not to depend on OS.
  
  Note, this change does not affect coverage of 
  Bug N 17142 "Crash if create with encoded name",
  which the test war originally written for.

  mysql-test/t/upgrade.test
    1.4 06/04/12 14:45:29 bar@stripped +11 -11
    Changing "P" to "p" not to depend on lower_case_table_name

  mysql-test/r/upgrade.result
    1.4 06/04/12 14:45:29 bar@stripped +12 -12
    Changing "P" to "p" not to depend on lower_case_table_name

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-new

--- 1.3/mysql-test/r/upgrade.result	2006-03-07 13:04:25 +04:00
+++ 1.4/mysql-test/r/upgrade.result	2006-04-12 14:45:29 +05:00
@@ -41,19 +41,19 @@ t1
 t-1
 drop database `mysqltest1`;
 drop database `mysqltest-1`;
-drop table if exists `txu@0023P@0023p1`;
-drop table if exists `txu#P#p1`;
-create table `txu#P#p1` (s1 int);
-insert into `txu#P#p1` values (1);
-select * from `txu@0023P@0023p1`;
-ERROR 42S02: Table 'test.txu@0023P@0023p1' doesn't exist
-create table `txu@0023P@0023p1` (s1 int);
-insert into `txu@0023P@0023p1` values (2);
-select * from `txu@0023P@0023p1`;
+drop table if exists `txu@0023p@0023p1`;
+drop table if exists `txu#p#p1`;
+create table `txu#p#p1` (s1 int);
+insert into `txu#p#p1` values (1);
+select * from `txu@0023p@0023p1`;
+ERROR 42S02: Table 'test.txu@0023p@0023p1' doesn't exist
+create table `txu@0023p@0023p1` (s1 int);
+insert into `txu@0023p@0023p1` values (2);
+select * from `txu@0023p@0023p1`;
 s1
 2
-select * from `txu#P#p1`;
+select * from `txu#p#p1`;
 s1
 1
-drop table `txu@0023P@0023p1`;
-drop table `txu#P#p1`;
+drop table `txu@0023p@0023p1`;
+drop table `txu#p#p1`;

--- 1.3/mysql-test/t/upgrade.test	2006-03-07 13:04:21 +04:00
+++ 1.4/mysql-test/t/upgrade.test	2006-04-12 14:45:29 +05:00
@@ -34,16 +34,16 @@ drop database `mysqltest-1`;
 # Bug#17142: Crash if create with encoded name
 #
 --disable_warnings
-drop table if exists `txu@0023P@0023p1`;
-drop table if exists `txu#P#p1`;
+drop table if exists `txu@0023p@0023p1`;
+drop table if exists `txu#p#p1`;
 --enable_warnings
-create table `txu#P#p1` (s1 int);
-insert into `txu#P#p1` values (1);
+create table `txu#p#p1` (s1 int);
+insert into `txu#p#p1` values (1);
 --error 1146
-select * from `txu@0023P@0023p1`;
-create table `txu@0023P@0023p1` (s1 int);
-insert into `txu@0023P@0023p1` values (2);
-select * from `txu@0023P@0023p1`;
-select * from `txu#P#p1`;
-drop table `txu@0023P@0023p1`;
-drop table `txu#P#p1`;
+select * from `txu@0023p@0023p1`;
+create table `txu@0023p@0023p1` (s1 int);
+insert into `txu@0023p@0023p1` values (2);
+select * from `txu@0023p@0023p1`;
+select * from `txu#p#p1`;
+drop table `txu@0023p@0023p1`;
+drop table `txu#p#p1`;