diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-21 17:57:32 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-21 17:57:32 +0400 |
| commit | b0fcdce3179bb4334635d0599dde40f2559d62ca (patch) | |
| tree | 6f81975c558c138eaddd5fed456b60e2470a51d6 /mysql-test/r/status.result | |
| parent | 6085445736210d8a8a3667f231825f5cf28431cd (diff) | |
| parent | be7b4043b95f92781f7ef3e425f0b0c148b8306b (diff) | |
| download | mariadb-git-b0fcdce3179bb4334635d0599dde40f2559d62ca.tar.gz | |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'mysql-test/r/status.result')
0 files changed, 0 insertions, 0 deletions