diff options
| author | unknown <monty@mysql.com> | 2005-08-12 13:57:20 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-08-12 13:57:20 +0300 |
| commit | ae8f5845b317d0ce2a31c755369ff40038bbbd2f (patch) | |
| tree | ba83e9d8366cb77aea9440035bead75f85d58657 /sql/sql_trigger.h | |
| parent | 73f1342450bc7ab25d6b4ef5f4b64343a3457ca3 (diff) | |
| parent | efcca0894e9e575a1f7e5127739626550947d7b2 (diff) | |
| download | mariadb-git-ae8f5845b317d0ce2a31c755369ff40038bbbd2f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Manual merge (trivial)
Diffstat (limited to 'sql/sql_trigger.h')
0 files changed, 0 insertions, 0 deletions