bzr commit into mysql-6.0-backup branch (hema:2677)

[Hema Sridharan]

#At file:///data0/team6.0aug6/mysql-6.0-backup/

 2677 Hema Sridharan	2008-08-07
      Test modified
modified:
  mysql-test/r/backup_views.result
  mysql-test/t/backup_views.test

=== modified file 'mysql-test/r/backup_views.result'
--- a/mysql-test/r/backup_views.result	2008-08-06 17:04:28 +0000
+++ b/mysql-test/r/backup_views.result	2008-08-07 15:43:25 +0000
@@ -158,16 +158,16 @@ idno	age	education
 6	30	Doctor
 7	31	Lawyer
 5	43	PHD
-SELECT * FROM bup_db1.v6 ORDER BY gender;
+SELECT * FROM bup_db1.v6 ORDER BY education, gender;
 education	gender
-MS	F
-Doctor	F
-BS	F
 BE	F
-Undergrad	M
+BS	F
+Doctor	F
 Lawyer	M
+MS	F
 PHD	M
 School	M
+Undergrad	M
 excercise objects of bup_db2
 SELECT * FROM bup_db2.t2 ORDER BY age;
 idno	age	education
@@ -385,13 +385,13 @@ idno	age	education
 6	30	Doctor
 7	31	Lawyer
 5	43	PHD
-SELECT * FROM bup_db1.v6 ORDER BY gender;
+SELECT * FROM bup_db1.v6 ORDER BY education, gender;
 education	gender
-Doctor	F
-BS	F
 BE	F
-MS	F
+BS	F
+Doctor	F
 Lawyer	M
+MS	F
 PHD	M
 School	M
 Undergrad	M

=== modified file 'mysql-test/t/backup_views.test'
--- a/mysql-test/t/backup_views.test	2008-08-06 17:04:28 +0000
+++ b/mysql-test/t/backup_views.test	2008-08-07 15:43:25 +0000
@@ -158,7 +158,7 @@ SELECT * FROM bup_db1.t5 ORDER BY Gender
 SELECT * FROM bup_db1.v1;
 SELECT * FROM bup_db1.vcomb ORDER BY name;
 SELECT * FROM bup_db1.v5 ORDER BY age;
-SELECT * FROM bup_db1.v6 ORDER BY gender;
+SELECT * FROM bup_db1.v6 ORDER BY education, gender;
 
 --echo excercise objects of bup_db2
 
@@ -241,7 +241,7 @@ SELECT * FROM bup_db1.t5 ORDER BY Gender
 SELECT * FROM bup_db1.v1;
 SELECT * FROM bup_db1.vcomb ORDER BY name;
 SELECT * FROM bup_db1.v5 ORDER BY age;
-SELECT * FROM bup_db1.v6 ORDER BY gender;
+SELECT * FROM bup_db1.v6 ORDER BY education, gender;
 
 --echo excercise objects of bup_db2