bk commit into 5.1 tree (msvensson:1.2196)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2196 06/02/28 13:54:32 msvensson@shellback.(none) +2 -0
  Merge 5.0 -> 5.1

  mysql-test/t/grant2.test
    1.32 06/02/28 13:54:26 msvensson@shellback.(none) +4 -7
    Explicitly specify "columns" when inserting into mysql.user and mysql.db

  mysql-test/r/grant2.result
    1.26 06/02/28 13:54:26 msvensson@shellback.(none) +7 -8
    Update test result

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1

--- 1.25/mysql-test/r/grant2.result	2006-02-27 16:41:50 +01:00
+++ 1.26/mysql-test/r/grant2.result	2006-02-28 13:54:26 +01:00
@@ -338,15 +338,14 @@
 create table t2(a int);
 create temporary table t1 as select * from mysql.user;
 delete from mysql.user where host='localhost';
-INSERT INTO mysql.user VALUES
-('%','mysqltest_1',password('password'),'N','N','N','N','N','N',
-'N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N',
-'','','','',0,0,0,0);
-INSERT INTO mysql.db VALUES
-('%','TESTDB','mysqltest_1','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','N','Y','Y','Y','
-Y','N');
+INSERT INTO mysql.user (host, user, password) VALUES
+('%','mysqltest_1',password('password'));
 Warnings:
-Warning	1265	Data truncated for column 'Alter_routine_priv' at row 1
+Warning	1364	Field 'ssl_cipher' doesn't have a default value
+Warning	1364	Field 'x509_issuer' doesn't have a default value
+Warning	1364	Field 'x509_subject' doesn't have a default value
+INSERT INTO mysql.db (host, db, user, select_priv) VALUES
+('%','TESTDB','mysqltest_1','Y');
 FLUSH PRIVILEGES;
 create database TEStdb;
 ERROR 42000: Access denied for user 'mysqltest_1'@'%' to database 'TEStdb'

--- 1.31/mysql-test/t/grant2.test	2006-02-27 16:41:50 +01:00
+++ 1.32/mysql-test/t/grant2.test	2006-02-28 13:54:26 +01:00
@@ -439,13 +439,10 @@
 create table t2(a int);
 create temporary table t1 as select * from mysql.user;
 delete from mysql.user where host='localhost';
-INSERT INTO mysql.user VALUES
-('%','mysqltest_1',password('password'),'N','N','N','N','N','N',
-'N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N',
-'','','','',0,0,0,0);
-INSERT INTO mysql.db VALUES
-('%','TESTDB','mysqltest_1','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','N','Y','Y','Y','
-Y','N');
+INSERT INTO mysql.user (host, user, password) VALUES
+('%','mysqltest_1',password('password'));
+INSERT INTO mysql.db (host, db, user, select_priv) VALUES
+('%','TESTDB','mysqltest_1','Y');
 FLUSH PRIVILEGES;
 
 connect (con1,localhost,mysqltest_1,password,TESTDB);