diff options
| author | unknown <monty@mysql.com> | 2004-05-06 13:42:26 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-06 13:42:26 +0300 |
| commit | 29b87b34d79da9e35f4bc5c8e6f89c2c084c7b83 (patch) | |
| tree | 9a75e17ac46c0c2c536c9050f133f4319e09c69e /sql/item_timefunc.h | |
| parent | 97794e7e6ae7c1f098a51e63774dd8de9f201e6d (diff) | |
| parent | afb882c43a644b79d6a11574160fe8b95d8d3018 (diff) | |
| download | mariadb-git-29b87b34d79da9e35f4bc5c8e6f89c2c084c7b83.tar.gz | |
Merge with 4.0 to get security patch for check_grant_colum
innobase/include/os0file.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/rpl_server_id2.result:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/slave.cc:
Merge with 4.0
Diffstat (limited to 'sql/item_timefunc.h')
0 files changed, 0 insertions, 0 deletions