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 /sql/ha_partition.cc | |
| 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 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 3c25dcd202f..d3979fa0718 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1781,8 +1781,7 @@ int ha_partition::set_up_table_before_create(TABLE *table, } 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, |