diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-03-28 19:50:41 -0600 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-03-28 19:50:41 -0600 |
| commit | 7cdd99c129e4b206b7bf63fc8f1ed455a1f20d84 (patch) | |
| tree | c9797bd8096d623accc4fea42ca6a16a4af65f3e /mysql-test/t/strict.test | |
| parent | c8fde97f485e61c66124b5b43488bf259738a1dc (diff) | |
| parent | db9af0d82239e2ff016d565e54f2f541f05bb9a3 (diff) | |
| download | mariadb-git-7cdd99c129e4b206b7bf63fc8f1ed455a1f20d84.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
into siva.hindu.god:/home/tsmith/m/bk/maint/51
mysql-test/include/gis_generic.inc:
Auto merged
mysql-test/r/archive_gis.result:
Auto merged
mysql-test/r/innodb_gis.result:
Auto merged
mysql-test/r/ndb_gis.result:
Auto merged
BitKeeper/deleted/.del-bdb_gis.result:
Auto merged
sql/log.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/strict.test')
0 files changed, 0 insertions, 0 deletions