diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 02:15:21 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 02:15:21 +0500 |
| commit | bba712a6c8ccab1faa8c6deaf62117c5d6a69495 (patch) | |
| tree | c3533e82d947e58c3e943074ef1781a098306c50 /mysql-test/r/events_trans.result | |
| parent | cb3df6f2e9f286fceca4a4a0e125642e52baf342 (diff) | |
| parent | cf145f8f425d8cf1fe86ceae7cb049ef5d01b2ea (diff) | |
| download | mariadb-git-bba712a6c8ccab1faa8c6deaf62117c5d6a69495.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/share/errmsg.txt:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test/r/events_trans.result')
0 files changed, 0 insertions, 0 deletions