diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-26 17:32:33 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-26 17:32:33 +0100 |
| commit | 6151b93dfae6f0961cb93e3dfb98e49f52188376 (patch) | |
| tree | e5e82d87ad12644a1fb0749cd598801a5ef18776 | |
| parent | af48d4a298321c907e59c01afe361c65ee5346ee (diff) | |
| parent | 4fd1419ef7b913a07a0dc662b246d02dc191f181 (diff) | |
| download | mariadb-git-6151b93dfae6f0961cb93e3dfb98e49f52188376.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020
| -rw-r--r-- | VC++Files/client/mysqlslap.vcproj | 2 | ||||
| -rw-r--r-- | VC++Files/mysql.sln | 2 | ||||
| -rw-r--r-- | sql/ha_partition.cc | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/VC++Files/client/mysqlslap.vcproj b/VC++Files/client/mysqlslap.vcproj index 581a852b170..ff0d9a437ed 100644 --- a/VC++Files/client/mysqlslap.vcproj +++ b/VC++Files/client/mysqlslap.vcproj @@ -162,7 +162,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib" + AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" OutputFile="../client_debug/mysqlslap.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" diff --git a/VC++Files/mysql.sln b/VC++Files/mysql.sln index e877ee653d8..44409aff48c 100644 --- a/VC++Files/mysql.sln +++ b/VC++Files/mysql.sln @@ -290,6 +290,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdb", "storage\bdb\bdb.vcpr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlslap", "client\mysqlslap.vcproj", "{2E9332CF-072A-4381-BF37-17C5AB4F8583}" ProjectSection(ProjectDependencies) = postProject + {26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB} + {44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "archive", "storage\archive\archive.vcproj", "{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}" diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 4bca3365cb2..84e9c779c7d 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1780,7 +1780,7 @@ void ha_partition::set_up_table_before_create(TABLE *table, return; // Fatal error table->s->max_rows= part_elem->part_max_rows; table->s->min_rows= part_elem->part_min_rows; - char *partition_name= strrchr(partition_name_with_path, FN_LIBCHAR); + const char *partition_name= strrchr(partition_name_with_path, FN_LIBCHAR); if (part_elem->index_file_name) append_file_to_dir(current_thd, (const char**)&part_elem->index_file_name, |