diff options
author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-04 23:03:27 +0200 |
---|---|---|
committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-04 23:03:27 +0200 |
commit | 8bbbff63a34af79326e061f4b0b7b1080f34f0c4 (patch) | |
tree | de5e82f8a071c0200d8424fa638d06847eade6f8 /sql/sql_trigger.h | |
parent | 18bddf148fe752cb0965bb750aa5b3f8f884199d (diff) | |
parent | a0c4e184f80de8db3b9d1340715502454ee09ef6 (diff) | |
download | mariadb-git-8bbbff63a34af79326e061f4b0b7b1080f34f0c4.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/sql_trigger.h')
0 files changed, 0 insertions, 0 deletions