summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authorunknown <iggy@recycle.(none)>2007-04-24 16:07:52 -0400
committerunknown <iggy@recycle.(none)>2007-04-24 16:07:52 -0400
commit006d9d65788be02d16911c5ca96bfc618615ff56 (patch)
tree0f97e1ddddcc6db80d4aa27a7859f7784c7aaba4 /server-tools
parent742c70b0a06bc854ec48c26cda363e7f38527094 (diff)
downloadmariadb-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 'server-tools')
0 files changed, 0 insertions, 0 deletions