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 /client | |
| 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 'client')
| -rw-r--r-- | client/mysql.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 036ac06755f..180bc8df848 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2447,6 +2447,7 @@ static char *fieldflags2str(uint f) { ff2s_check_flag(GROUP); ff2s_check_flag(UNIQUE); ff2s_check_flag(BINCMP); + ff2s_check_flag(ON_UPDATE_NOW); #undef ff2s_check_flag if (f) sprintf(s, " unknows=0x%04x", f); |