diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-08-30 10:53:11 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-08-30 10:53:11 -0600 |
| commit | db56cb5b862cc9c4bd9b548bc59a39b9dd214d86 (patch) | |
| tree | 4f3652996129fb156cf227aa8e3bc8dbc55ea5e5 /mysql-test/t | |
| parent | 3edb630197ae42353905325e9d1c8e78d329c23a (diff) | |
| parent | 672c421b1328d97191c3ec3be476fd1323b25cdd (diff) | |
| download | mariadb-git-db56cb5b862cc9c4bd9b548bc59a39b9dd214d86.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
mysql-test/r/comments.result:
failed auto merge
mysql-test/t/comments.test:
failed auto merge
sql/sql_lex.cc:
failed auto merge
Diffstat (limited to 'mysql-test/t')
0 files changed, 0 insertions, 0 deletions