diff options
| author | unknown <igor@olga.mysql.com> | 2007-05-27 21:33:20 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-05-27 21:33:20 -0700 |
| commit | fbaad80e0e55013a214d6314c59e9dbeb6af2af7 (patch) | |
| tree | dedeeb2e328311c46256740fa901059742ffb8f4 /mysql-test/r/ndb_gis.result | |
| parent | 7c5aa30f04d483f6d9d647277e5a22c992c5fea3 (diff) | |
| parent | d7a90fa1724a047d8b9cf81e974c39a9ae64ff84 (diff) | |
| download | mariadb-git-fbaad80e0e55013a214d6314c59e9dbeb6af2af7.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/field.h:
Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/my_decimal.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ndb_gis.result')
0 files changed, 0 insertions, 0 deletions