Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 (42116bf2) · Commits · Software / OSDI20 Artifacts / mariadb

Build-tools/Do-solaris-pkg

+4 −2

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		# Script to create Solaris packages
		#
		$INTERACTIVE= 0;
		$hostname= `hostname`;
		chomp ($hostname= `hostname`);
		$find = "/usr/bin/find";
		$pkgproto = "/usr/bin/pkgproto";
		$pkgmk = "/usr/bin/pkgmk -o";
		@@ -75,7 +75,7 @@ $os =~ '\.';
		$os = "sol$'";
		chomp $os;
		$default{"basedir"}= "/usr/local";
		$default{"packagename"}= $fullname . '.pkg';
		$default{"packagename"}= "${fullname}.pkg";

		# Check for correctness of guessed values by userinput

		@@ -136,6 +136,8 @@ system ("gzip /tmp/$packagename");

		# Clean-up the spool area
		system ("(cd /var/spool/pkg; rm -rf $pkg)");
		# Clean-up the ~/packaging/ area
		system ("(rm -rf mysql*)");
		unlink $pkginfo;
		unlink $prototype;
		system ("mv /tmp/${packagename}.gz $pkgdir");

innobase/data/data0type.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ dtype_get_at_most_n_mbchars(
		ulint data_len,
		const char* str)
		{
		#ifndef UNIV_HOTBACKUP
		ut_a(data_len != UNIV_SQL_NULL);

		if (dtype_str_needs_mysql_cmp(dtype)) {
		@@ -99,6 +100,12 @@ dtype_get_at_most_n_mbchars(
		}

		return(data_len);
		#else /* UNIV_HOTBACKUP */
		/* This function depends on MySQL code that is not included in
		InnoDB Hot Backup builds. Besides, this function should never
		be called in InnoDB Hot Backup. */
		ut_error;
		#endif /* UNIV_HOTBACKUP */
		}

		/*************************************************************************

innobase/dict/dict0dict.c

+23 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ rw_lock_t dict_operation_lock; /* table create, drop, etc. reserve
		/* Identifies generated InnoDB foreign key names */
		static char dict_ibfk[] = "_ibfk_";

		#ifndef UNIV_HOTBACKUP
		/**********************************************************************
		Compares NUL-terminated UTF-8 strings case insensitively.

		@@ -76,6 +77,7 @@ void
		innobase_casedn_str(
		/================/
		char* a); /* in/out: string to put in lower case */
		#endif /* !UNIV_HOTBACKUP */

		/**************************************************************************
		Adds a column to the data dictionary hash table. */
		@@ -2095,6 +2097,7 @@ dict_foreign_find_index(
		dict_index_t* types_idx)/* in: NULL or an index to whose types the
		column types must match */
		{
		#ifndef UNIV_HOTBACKUP
		dict_index_t* index;
		const char* col_name;
		ulint i;
		@@ -2139,6 +2142,12 @@ dict_foreign_find_index(
		}

		return(NULL);
		#else /* UNIV_HOTBACKUP */
		/* This function depends on MySQL code that is not included in
		InnoDB Hot Backup builds. Besides, this function should never
		be called in InnoDB Hot Backup. */
		ut_error;
		#endif /* UNIV_HOTBACKUP */
		}

		/**************************************************************************
		@@ -2492,6 +2501,7 @@ dict_scan_col(
		const char** name) /* out,own: the column name; NULL if no name
		was scannable */
		{
		#ifndef UNIV_HOTBACKUP
		dict_col_t* col;
		ulint i;

		@@ -2525,6 +2535,12 @@ dict_scan_col(
		}

		return(ptr);
		#else /* UNIV_HOTBACKUP */
		/* This function depends on MySQL code that is not included in
		InnoDB Hot Backup builds. Besides, this function should never
		be called in InnoDB Hot Backup. */
		ut_error;
		#endif /* UNIV_HOTBACKUP */
		}

		/*************************************************************************
		@@ -2542,6 +2558,7 @@ dict_scan_table_name(
		const char** ref_name)/* out,own: the table name;
		NULL if no name was scannable */
		{
		#ifndef UNIV_HOTBACKUP
		const char* database_name = NULL;
		ulint database_name_len = 0;
		const char* table_name = NULL;
		@@ -2623,6 +2640,12 @@ dict_scan_table_name(
		*table = dict_table_get_low(ref);

		return(ptr);
		#else /* UNIV_HOTBACKUP */
		/* This function depends on MySQL code that is not included in
		InnoDB Hot Backup builds. Besides, this function should never
		be called in InnoDB Hot Backup. */
		ut_error;
		#endif /* UNIV_HOTBACKUP */
		}

		/*************************************************************************

innobase/dict/dict0load.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -8,7 +8,9 @@ Created 4/24/1996 Heikki Tuuri
		*******************************************************/

		#include "dict0load.h"
		#ifndef UNIV_HOTBACKUP
		#include "mysql_version.h"
		#endif /* !UNIV_HOTBACKUP */

		#ifdef UNIV_NONINL
		#include "dict0load.ic"
		@@ -792,6 +794,7 @@ dict_load_table(
		name, (ulong)mix_len);
		}

		#ifndef UNIV_HOTBACKUP
		#if MYSQL_VERSION_ID < 50003
		/* Starting from MySQL 5.0.3, the high-order bit of MIX_LEN is the
		"compact format" flag. */
		@@ -807,6 +810,7 @@ dict_load_table(
		return(NULL);
		}
		#endif /* MYSQL_VERSION_ID < 50300 */
		#endif /* !UNIV_HOTBACKUP */

		ut_a(0 == ut_strcmp("SPACE",
		dict_field_get_col(

innobase/include/data0type.ic

+7 −0

Original line number	Diff line number	Diff line
		@@ -273,6 +273,7 @@ dtype_get_fixed_size(
		/* out: fixed size, or 0 */
		dtype_t* type) /* in: type */
		{
		#ifndef UNIV_HOTBACKUP
		ulint mtype;

		mtype = dtype_get_mtype(type);
		@@ -321,6 +322,12 @@ dtype_get_fixed_size(
		}

		return(0);
		#else /* UNIV_HOTBACKUP */
		/* This function depends on MySQL code that is not included in
		InnoDB Hot Backup builds. Besides, this function should never
		be called in InnoDB Hot Backup. */
		ut_error;
		#endif /* UNIV_HOTBACKUP */
		}

		/***************************************************************************