From efd2066135ec75306c5ef03b31657c5e6a20039d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Nov 2005 10:33:38 +0100 Subject: [PATCH 1/4] Mikaels fix for compiling without partition storage engine --- sql/table.cc | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sql/table.cc b/sql/table.cc index 9fc840f7a3d..aeccab78211 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -539,17 +539,28 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, } if (next_chunk + 4 < buff_end) { - if ((share->partition_info_len= uint4korr(next_chunk))) + uint32 partition_info_len = uint4korr(next_chunk); +#ifdef WITH_PARTITION_STORAGE_ENGINE + if ((share->partition_info_len= partition_info_len)) { if (!(share->partition_info= (uchar*) memdup_root(&share->mem_root, next_chunk + 4, - share->partition_info_len + 1))) + partition_info_len + 1))) { my_free(buff, MYF(0)); goto err; } - next_chunk+= share->partition_info_len + 5; + next_chunk++; } +#else + if (partition_info_len) + { + DBUG_PRINT("info", ("WITH_PARTITION_STORAGE_ENGINE is not defined")); + my_free(buff, MYF(0)); + goto err; + } +#endif + next_chunk+= 4 + partition_info_len; } keyinfo= share->key_info; for (i= 0; i < keys; i++, keyinfo++) From 95b6827587cba7cd8c7448b765b409f467ff7e3d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Nov 2005 10:35:26 +0100 Subject: [PATCH 2/4] Fix example storage engine following table def cache updates. --- sql/examples/ha_example.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc index db7a811df78..38e0171774e 100644 --- a/sql/examples/ha_example.cc +++ b/sql/examples/ha_example.cc @@ -71,7 +71,7 @@ #include "ha_example.h" -static handler* example_create_handler(TABLE *table); +static handler* example_create_handler(TABLE_SHARE *table); handlerton example_hton= { "EXAMPLE", @@ -213,7 +213,7 @@ static int free_share(EXAMPLE_SHARE *share) } -static handler* example_create_handler(TABLE *table) +static handler* example_create_handler(TABLE_SHARE *table) { return new ha_example(table); } From 030558e17eb7c13cd4a38345bb7293bf6215a5ba Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Nov 2005 10:46:28 +0100 Subject: [PATCH 3/4] Fix VS project files following move of storage engines below storage/. --- VC++Files/libmysqld/libmysqld.vcproj | 4 ++-- VC++Files/myisam_ftdump/myisam_ftdump.vcproj | 6 +++--- VC++Files/myisamchk/myisamchk.vcproj | 8 ++++---- VC++Files/myisamlog/myisamlog.vcproj | 8 ++++---- VC++Files/myisampack/myisampack.vcproj | 8 ++++---- VC++Files/mysqldemb/mysqldemb.vcproj | 4 ++-- VC++Files/mysqlserver/mysqlserver.vcproj | 4 ++-- VC++Files/sql/mysqld.vcproj | 8 ++++---- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/VC++Files/libmysqld/libmysqld.vcproj b/VC++Files/libmysqld/libmysqld.vcproj index eb411f79362..4506f677d64 100644 --- a/VC++Files/libmysqld/libmysqld.vcproj +++ b/VC++Files/libmysqld/libmysqld.vcproj @@ -21,7 +21,7 @@ + RelativePath="..\storage\myisam\myisam_ftdump.c"> + RelativePath="..\storage\myisam\myisamchk.c"> + RelativePath="..\storage\myisam\myisamlog.c"> + RelativePath="..\storage\myisam\myisampack.c"> + RelativePath="..\storage\myisammrg\myrg_rnext_same.c"> Date: Fri, 25 Nov 2005 10:48:42 +0100 Subject: [PATCH 4/4] Compile more stuff during make dist to detect more errors already during bootstrap. --- BUILD/compile-dist | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BUILD/compile-dist b/BUILD/compile-dist index a8d180eace1..6cc537cdf9c 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -45,6 +45,11 @@ fi # Make sure to enable all features that affect "make dist" ./configure \ --with-embedded-server \ + --with-archive-storage-engine \ + --with-blackhole-storage-engine \ + --with-csv-storage-engine \ + --with-example-storage-engine \ + --with-federated-storage-engine \ --with-berkeley-db \ --with-innodb \ --enable-thread-safe-client \