diff options
| author | unknown <iggy@recycle.(none)> | 2007-04-24 16:07:52 -0400 |
|---|---|---|
| committer | unknown <iggy@recycle.(none)> | 2007-04-24 16:07:52 -0400 |
| commit | 006d9d65788be02d16911c5ca96bfc618615ff56 (patch) | |
| tree | 0f97e1ddddcc6db80d4aa27a7859f7784c7aaba4 /mysql-test/r/windows.result | |
| parent | 742c70b0a06bc854ec48c26cda363e7f38527094 (diff) | |
| download | mariadb-git-006d9d65788be02d16911c5ca96bfc618615ff56.tar.gz | |
- Resolved conflict between fixes for bugs 25141 and 26074.
- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test
mysql-test/r/windows.result:
- Removed duplicate results.
mysql-test/t/windows.test:
- Removed InnoDB requirement.
- Removed duplicate test case.
sql/ha_partition.cc:
- Reverted changes from bug 26074 because it conflicts with bug 25141.
Diffstat (limited to 'mysql-test/r/windows.result')
| -rw-r--r-- | mysql-test/r/windows.result | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mysql-test/r/windows.result b/mysql-test/r/windows.result index 9f3828bff61..7472b724f47 100644 --- a/mysql-test/r/windows.result +++ b/mysql-test/r/windows.result @@ -26,18 +26,3 @@ ERROR HY000: No paths allowed for shared library execute abc; ERROR HY000: No paths allowed for shared library deallocate prepare abc; -CREATE TABLE t1 ( -`pkid` int(11) NOT NULL AUTO_INCREMENT, -`SALES_DATE` date NOT NULL DEFAULT '0000-00-00', -KEY `pkid` (`pkid`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 -PARTITION BY RANGE (MONTH(SALES_DATE)) -( -PARTITION p0 VALUES LESS THAN (2) ENGINE=INNODB -data DIRECTORY='c:/tmp/' - index DIRECTORY = 'c:/tmp/', -PARTITION p1 VALUES LESS THAN (3) ENGINE=INNODB -data DIRECTORY='c:/tmp/' - index DIRECTORY = 'c:/tmp/' -); -DROP TABLE t1; |