diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-10-12 09:40:24 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-10-12 09:40:24 +0200 |
| commit | bc2ecae3e843925829e694096cdd43cbbec218ce (patch) | |
| tree | e2f2754e09749cc68a75e0f08acb5bf894414d62 /sql-bench/test-alter-table.sh | |
| parent | 9b7512af5cb9696275d1a9283e02a263efedc028 (diff) | |
| parent | 06fb8c2d1009fe6d285fd29ab9080b2b040a3d60 (diff) | |
| download | mariadb-git-bc2ecae3e843925829e694096cdd43cbbec218ce.tar.gz | |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b29549-mysql-5.1-target-5.1.22
mysql-test/suite/rpl/t/disabled.def:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Auto merged
sql/log.cc:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/sql_show.cc:
Auto merged
BitKeeper/deleted/.del-rpl_ndb_innodb2ndb.result~1:
Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result
BitKeeper/deleted/.del-rpl_ndb_myisam2ndb.result~1:
Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt:
Manual merge
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test:
Manual merge
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt:
Manual merge
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test:
Manual merge
sql/log_event.cc:
Manual merge
sql/field.cc:
Manual merge and adding comment.
sql/field.h:
Manual merge.
Diffstat (limited to 'sql-bench/test-alter-table.sh')
0 files changed, 0 insertions, 0 deletions