diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-05-21 20:50:08 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-05-21 20:50:08 +0200 |
| commit | 221e23ad721cb98156ff313d6ee924c88765782e (patch) | |
| tree | 250875cd3699ebe9837bdd77ab3f2b35ff4eb6e0 /include/my_global.h | |
| parent | f40047df9c72d1516d9a2f7d121dc7ce165ef419 (diff) | |
| parent | 8b33c41554b1f9ac173a047f55fa0c522f28af35 (diff) | |
| download | mariadb-git-221e23ad721cb98156ff313d6ee924c88765782e.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
configure.in:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'include/my_global.h')
0 files changed, 0 insertions, 0 deletions