diff options
| author | unknown <gluh@eagle.(none)> | 2007-09-20 14:40:24 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-09-20 14:40:24 +0500 |
| commit | 83540130af5e185d44787e2cb5d627fb2ea6a51e (patch) | |
| tree | 1fdc0e37d0891d3ab52612b79fc9022221aca9bc /mysql-test | |
| parent | d0f794247408a25058726c79a6c841f5a6c9d7c8 (diff) | |
| parent | ad57f91294e80016af10f282202fa5abb788bdc9 (diff) | |
| download | mariadb-git-83540130af5e185d44787e2cb5d627fb2ea6a51e.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/r/grant.result:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/grant.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 5b0bf152fef..0d4dad39882 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -529,7 +529,7 @@ Db char(64) NO PRI User char(16) NO PRI Table_name char(64) NO PRI Grantor char(77) NO MUL -Timestamp timestamp NO 0000-00-00 00:00:00 +Timestamp timestamp NO CURRENT_TIMESTAMP Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') NO Column_priv set('Select','Insert','Update','References') NO use test; |