diff options
author | unknown <pgalbraith/patg@govinda.patg.net> | 2006-08-10 15:31:44 -0700 |
---|---|---|
committer | unknown <pgalbraith/patg@govinda.patg.net> | 2006-08-10 15:31:44 -0700 |
commit | 5847a80de489b3978f8f21d7efbfd47c0487f69c (patch) | |
tree | 5987f5e501d310cf789abacf27d2a98227232630 /mysql-test/t/truncate.test | |
parent | fa3ae83813c9fec677b8c77c0e9ace2d1bc83d1c (diff) | |
parent | 58590b3a53e641fab894e754298732d5cd1ed954 (diff) | |
download | mariadb-git-5847a80de489b3978f8f21d7efbfd47c0487f69c.tar.gz |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/t/truncate.test')
0 files changed, 0 insertions, 0 deletions