diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-08-17 17:19:41 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-08-17 17:19:41 +0200 |
| commit | b32b2ce7afa830257a1052f70b57eb3f3a38710f (patch) | |
| tree | dbb8d11912bd8c6bbb4edc32d540effe9cce852b /mysql-test/r/grant.result | |
| parent | 0073d9be28f42e7d6856e6c6e9496b4fa65d0868 (diff) | |
| parent | 90b069ed34c293f7eb55f7827dd9fd086ff78015 (diff) | |
| download | mariadb-git-b32b2ce7afa830257a1052f70b57eb3f3a38710f.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/tmp_reg
into bk-internal.mysql.com:/data0/bk/mysql-5.1
client/mysql.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/r/information_schema_db.result:
Auto merged
mysql-test/r/type_newdecimal.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
server-tools/instance-manager/messages.cc:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'mysql-test/r/grant.result')
| -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 2a95b8effcf..07bd352fb65 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -528,7 +528,7 @@ Db char(64) NO PRI User char(16) NO PRI Table_name char(64) NO PRI Grantor char(77) NO MUL -Timestamp timestamp YES CURRENT_TIMESTAMP +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; |