diff options
| author | unknown <kostja@bodhi.(none)> | 2007-08-01 12:32:40 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-08-01 12:32:40 +0400 |
| commit | 8e62e86f802f961f5bde1d667aa17aafe862a519 (patch) | |
| tree | f92cb4888afba613c17ae927ae3890d98ddbf6c2 /mysql-test/r/log_tables.result | |
| parent | 2914bad6ac429cd401803210b5a7389d141a27a2 (diff) | |
| parent | 25723542a1ffcd3365b51a48bbab0e238306ab2a (diff) | |
| download | mariadb-git-8e62e86f802f961f5bde1d667aa17aafe862a519.tar.gz | |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
client/mysqldump.c:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/include/mix1.inc:
Manual merge.
mysql-test/r/innodb_mysql.result:
Manual merge.
Diffstat (limited to 'mysql-test/r/log_tables.result')
0 files changed, 0 insertions, 0 deletions