Commit 9ea1d5e2 authored by unknown's avatar unknown
Browse files

Merge zim.(none):/home/brian/mysql/mysql-5.0 

into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues. 


BitKeeper/etc/config:
  Auto merged
Makefile.am:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
configure.in:
  Fixed the resolve of versions.
mysql-test/r/alter_table.result:
  Fixed results.
parents 172392f2 8d173601

Makefile.am

+18 −3
Original line number Diff line number Diff line
@@ -105,10 +105,25 @@ test: 
	cd mysql-test; \

	./mysql-test-run && ./mysql-test-run --ps-protocol



# Test installation. Ports are configurable from the environment.



MYSQL_TEST_MANAGER_PORT =	9305

MYSQL_TEST_MASTER_PORT =	9306

MYSQL_TEST_SLAVE_PORT =		9308

MYSQL_TEST_NDB_PORT =		9350

MYSQL_TEST_RUN_ARGS =		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

				--master_port=$(MYSQL_TEST_MASTER_PORT) \

				--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

				--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)

test:

	cd mysql-test ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \

	./mysql-test-run.pl --ps-protocol $(MYSQL_TEST_RUN_ARGS)



test-force:

	cd mysql-test ; \

	./mysql-test-run --force ;\

	./mysql-test-run --ps-protocol --force

	./mysql-test-run --force $(MYSQL_TEST_RUN_ARGS) ; \

	./mysql-test-run --ps-protocol --force $(MYSQL_TEST_RUN_ARGS)



# Don't update the files from bitkeeper

%::SCCS/s.%

VC++Files/libmysqld/libmysqld.vcproj

+118 −118

File changed.

Preview size limit exceeded, changes collapsed.

VC++Files/sql/mysqld.vcproj

+82 −7
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;USE_SYMDIR;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;USE_SYMDIR;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -148,7 +148,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -212,7 +212,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include"

				PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -276,7 +276,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include"

				PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;MYSQL_SERVER;LICENSE=Commercial;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;LICENSE=Commercial;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -336,7 +336,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysqld.pch"

				AssemblerListingLocation=".\debug/"
@@ -398,7 +398,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include"

				PreprocessorDefinitions="MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE"

				PreprocessorDefinitions="MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -521,7 +521,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../zlib,../include,../regex,../extra/yassl/include"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -1326,6 +1326,81 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="examples\ha_example.cpp">

			<FileConfiguration

				Name="classic nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Max|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Max nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="ha_berkeley.cpp">

			<FileConfiguration

client/client_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -50,5 +50,6 @@ enum options_client 
  OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,

#endif

  OPT_TRIGGERS,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_AUTO_CLOSE

};

client/mysql.cc

+17 −8
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int com_nopager(String *str, char*), com_pager(String *str, char*), 
           com_edit(String *str,char*), com_shell(String *str, char *);

#endif



static int read_lines(bool execute_commands);

static int read_and_execute(bool interactive);

static int sql_connect(char *host,char *database,char *user,char *password,

		       uint silent);

static int put_info(const char *str,INFO_TYPE info,uint error=0,
@@ -468,7 +468,7 @@ int main(int argc,char *argv[]) 
	  "Type 'help [[%]function name[%]]' to get help on usage of function.\n");

#endif

  put_info(buff,INFO_INFO);

  status.exit_status=read_lines(1);		// read lines and execute them

  status.exit_status= read_and_execute(!status.batch);

  if (opt_outfile)

    end_tee();

  mysql_end(0);
@@ -526,6 +526,10 @@ static struct my_option my_long_options[] = 
   0, 0, 0, 0, 0},

  {"help", 'I', "Synonym for -?", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,

   0, 0, 0, 0, 0},

#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"auto-rehash", OPT_AUTO_REHASH,

   "Enable automatic rehashing. One doesn't need to use 'rehash' to get table and field completion, but startup and reconnecting may take a longer time. Disable with --disable-auto-rehash.",

   (gptr*) &rehash, (gptr*) &rehash, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
@@ -750,6 +754,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
	       char *argument)

{

  switch(optid) {

#ifdef __NETWARE__

  case OPT_AUTO_CLOSE:

    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);

    break;

#endif

  case OPT_CHARSETS_DIR:

    strmov(mysql_charsets_dir, argument);

    charsets_dir = mysql_charsets_dir;
@@ -948,7 +957,7 @@ static int get_options(int argc, char **argv) 
  return(0);

}



static int read_lines(bool execute_commands)

static int read_and_execute(bool interactive)

{

#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__)

  char linebuffer[254];
@@ -963,7 +972,7 @@ static int read_lines(bool execute_commands) 
  

  for (;;)

  {

    if (status.batch || !execute_commands)

    if (!interactive)

    {

      line=batch_readline(status.line_buff);

      line_number++;
@@ -1041,7 +1050,7 @@ static int read_lines(bool execute_commands) 
      Check if line is a mysql command line

      (We want to allow help, print and clear anywhere at line start

    */

    if (execute_commands && (named_cmds || glob_buffer.is_empty()) 

    if ((named_cmds || glob_buffer.is_empty())

	&& !in_string && (com=find_command(line,0)))

    {

      if ((*com->func)(&glob_buffer,line) > 0)
@@ -1049,7 +1058,7 @@ static int read_lines(bool execute_commands) 
      if (glob_buffer.is_empty())		// If buffer was emptied

	in_string=0;

#ifdef HAVE_READLINE

      if (status.add_to_history && not_in_history(line))

      if (interactive && status.add_to_history && not_in_history(line))

	add_history(line);

#endif

      continue;
@@ -1059,7 +1068,7 @@ static int read_lines(bool execute_commands) 
  }

  /* if in batch mode, send last query even if it doesn't end with \g or go */



  if ((status.batch || !execute_commands) && !status.exit_status)

  if (!interactive && !status.exit_status)

  {

    remove_cntrl(glob_buffer);

    if (!glob_buffer.is_empty())
@@ -2774,7 +2783,7 @@ static int com_source(String *buffer, char *line) 
  status.line_buff=line_buff;

  status.file_name=source_name;

  glob_buffer.length(0);			// Empty command buffer

  error=read_lines(0);				// Read lines from file

  error= read_and_execute(false);

  status=old_status;				// Continue as before

  my_fclose(sql_file,MYF(0));

  batch_readline_end(line_buff);