diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-16 10:21:37 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-16 10:21:37 +0200 |
| commit | 853343c2c4278d6b3e1000dd3318d0d96307c0ec (patch) | |
| tree | f1a61b9cb7185c7e5376575b9d60f4cab2db766e /mysql-test/r/select.result | |
| parent | 79b1dd35f3b03ed6b9ed816573790d8dfd978382 (diff) | |
| parent | 603740fb4ec56e7ac44ec60064bd06b321887b75 (diff) | |
| download | mariadb-git-853343c2c4278d6b3e1000dd3318d0d96307c0ec.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/select.result')
0 files changed, 0 insertions, 0 deletions