diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-04-30 15:36:29 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-04-30 15:36:29 -0600 |
| commit | d2e8f9010fef50bd4cc2c339aaa46f88528e954c (patch) | |
| tree | e37ce58b2fb58542e20b73ebb2fe32dc60c19e8a /mysql-test/r/query_cache.result | |
| parent | 2a46eda7d2f2931ffb8cd46b69a4793ebe781c1a (diff) | |
| download | mariadb-git-d2e8f9010fef50bd4cc2c339aaa46f88528e954c.tar.gz | |
fix merge issues
mysql-test/r/sp.result:
manual merge
sql/sql_lex.cc:
merge typo
Diffstat (limited to 'mysql-test/r/query_cache.result')
0 files changed, 0 insertions, 0 deletions