bk commit into 5.1 tree (iggy:1.2478)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-24 15:56:19-04:00, iggy@alf. +3 -0
  - Fixed failing tests.

  mysql-test/r/windows.result@stripped, 2007-04-24 15:56:15-04:00, iggy@alf. +0 -15
    - Remove duplicate result

  mysql-test/t/windows.test@stripped, 2007-04-24 15:56:16-04:00, iggy@alf. +0 -21
    - Remove dependance on InnoDB for this test.
    - Remove duplicate test

  sql/ha_partition.cc@stripped, 2007-04-24 15:56:16-04:00, iggy@alf. +1 -2
    - Correction.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	alf.
# Root:	D:/src/mysql-5.1-maint_pt

--- 1.12/mysql-test/r/windows.result	2007-04-24 15:56:32 -04:00
+++ 1.13/mysql-test/r/windows.result	2007-04-24 15:56:32 -04:00
@@ -26,18 +26,3 @@ ERROR HY000: No paths allowed for shared
 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;

--- 1.9/mysql-test/t/windows.test	2007-04-24 15:56:32 -04:00
+++ 1.10/mysql-test/t/windows.test	2007-04-24 15:56:32 -04:00
@@ -1,6 +1,5 @@
 # Windows-specific tests
 --source include/windows.inc
--- source include/have_innodb.inc
 
 #
 # Bug 9148: Denial of service
@@ -50,23 +49,3 @@ execute abc;
 execute abc;
 deallocate prepare abc;
 
-#
-# Bug #26074 Mysql crash when creating partitions 
-#
-
-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;

--- 1.88/sql/ha_partition.cc	2007-04-24 15:56:32 -04:00
+++ 1.89/sql/ha_partition.cc	2007-04-24 15:56:32 -04:00
@@ -1781,8 +1781,7 @@ int ha_partition::set_up_table_before_cr
   }
   table->s->max_rows= part_elem->part_max_rows;
   table->s->min_rows= part_elem->part_min_rows;
-  /* Here we have unified path so should always look for '/', not FN_LIBCHAR */
-  partition_name= strrchr(partition_name_with_path, '/');
+  partition_name= strrchr(partition_name_with_path, FN_LIBCHAR);
   if ((part_elem->index_file_name &&
       (error= append_file_to_dir(thd,
                                  (const char**)&part_elem->index_file_name,