diff options
| author | unknown <evgen@moonbone.local> | 2007-11-13 13:29:42 +0000 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-11-13 13:29:42 +0000 |
| commit | 8021e495cf6d51f60347d03264659f9ea165ebf5 (patch) | |
| tree | b6425904c47190b32bfd29d6e467b9aa62f6875c /mysql-test/r/log_tables.result | |
| parent | d742b9cb7d6ddbaa882df365ab3c4c656fc20d95 (diff) | |
| parent | b1b1d62776124492a28dd15af75d8ae84d35ba09 (diff) | |
| download | mariadb-git-8021e495cf6d51f60347d03264659f9ea165ebf5.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into moonbone.local:/work/30081-bug-5.1-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/log_tables.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/log_tables.result')
| -rw-r--r-- | mysql-test/r/log_tables.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 6004c3d082b..f3578598195 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -50,7 +50,7 @@ general_log CREATE TABLE `general_log` ( ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log' show fields from mysql.general_log; Field Type Null Key Default Extra -event_time timestamp NO CURRENT_TIMESTAMP +event_time timestamp NO CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP user_host mediumtext NO NULL thread_id int(11) NO NULL server_id int(11) NO NULL @@ -73,7 +73,7 @@ slow_log CREATE TABLE `slow_log` ( ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log' show fields from mysql.slow_log; Field Type Null Key Default Extra -start_time timestamp NO CURRENT_TIMESTAMP +start_time timestamp NO CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP user_host mediumtext NO NULL query_time time NO NULL lock_time time NO NULL |