diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-12 11:12:43 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-12 11:12:43 +0200 |
| commit | f67c2668531d11185dff4a51aada0e3d1ca9f37f (patch) | |
| tree | f268bba5a8eb1475ee761a6e94a45090c518bf27 /mysql-test/r/ndb_restore.result | |
| parent | 3f421aa4aca2e03cd1fdf4958291cbb2cc945520 (diff) | |
| parent | d7dadcd7c7668cf871f3b5cc00825dfaa6450c45 (diff) | |
| download | mariadb-git-f67c2668531d11185dff4a51aada0e3d1ca9f37f.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
null merge, 5.1 already reports correct error
mysql-test/r/ndb_restore.result:
manual merge
mysql-test/t/ndb_restore.test:
manual merge
Diffstat (limited to 'mysql-test/r/ndb_restore.result')
| -rw-r--r-- | mysql-test/r/ndb_restore.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_restore.result b/mysql-test/r/ndb_restore.result index b946d97bea1..21a1eaeb683 100644 --- a/mysql-test/r/ndb_restore.result +++ b/mysql-test/r/ndb_restore.result @@ -16,7 +16,7 @@ CREATE TABLE `t2_c` ( `descrpooppo` varchar(64) default NULL, `svcutonsa` varchar(64) NOT NULL default '', PRIMARY KEY (`capgotod`), -KEY `i_quadaddsvr` (`gotod`) +KEY `i quadaddsvr` (`gotod`) ) ENGINE=ndbcluster DEFAULT CHARSET=latin1; INSERT INTO `t2_c` VALUES (5,4,'','q3.net','addavp:MK_CASELECTOR=1','postorod rattoaa'),(2,1,'4','','addavp:MK_BRANDTAD=345','REDS Brandtad'),(3,2,'4','q3.net','execorder','fixedRatediPO REDS'),(1,1,'3','','addavp:MK_BRANDTAD=123','TEST Brandtad'),(6,5,'','told.q3.net','addavp:MK_BRANDTAD=123','Brandtad Toldzone'),(4,3,'3','q3.net','addavp:MK_POOLHINT=2','ratedi PO TEST'); CREATE TABLE `t3_c` ( |