Commit 6bdf9d27 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/field.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
parents b1a3417b ee9930bf

VC++Files/mysql.sln

+5 −22
Original line number Diff line number Diff line
@@ -823,32 +823,21 @@ Global 
		{62E85884-3ACF-4F4C-873B-60B878147890}.TLS_DEBUG.ActiveCfg = Debug|Win32

		{62E85884-3ACF-4F4C-873B-60B878147890}.TLS_DEBUG.Build.0 = Debug|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic.ActiveCfg = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic.Build.0 = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic nt.ActiveCfg = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic nt.Build.0 = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Debug.ActiveCfg = Debug|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Debug.Build.0 = Debug|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Classic.ActiveCfg = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Debug.ActiveCfg = Debug|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Pro.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_ProGPL.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Release.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max nt.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max nt.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.nt.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.nt.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro.ActiveCfg = pro|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro.Build.0 = pro|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl nt.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl nt.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro nt.ActiveCfg = pro|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro nt.Build.0 = pro|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS_DEBUG.ActiveCfg = Debug|Win32
@@ -916,32 +905,26 @@ Global 
		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS_DEBUG.ActiveCfg = Debug|Win32

		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS_DEBUG.Build.0 = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Debug.ActiveCfg = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Debug.Build.0 = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Classic.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Classic.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Debug.ActiveCfg = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Debug.Build.0 = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Pro.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Pro.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_ProGPL.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_ProGPL.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Release.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Release.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Max.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Max.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Max nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Max nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS_DEBUG.ActiveCfg = Debug|Win32

VC++Files/storage/example/example.vcproj

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;WITH_PARTITION_STORAGE_ENGINE"

				StringPooling="TRUE"

				RuntimeLibrary="0"

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

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS;WITH_PARTITION_STORAGE_ENGINE"

				StringPooling="TRUE"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\example___Win32_TLS_DEBUG/example.pch"
@@ -123,7 +123,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS;WITH_PARTITION_STORAGE_ENGINE"

				StringPooling="TRUE"

				RuntimeLibrary="0"

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

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;WITH_PARTITION_STORAGE_ENGINE"

				StringPooling="TRUE"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/example.pch"

client/Makefile.am

+26 −18
Original line number Diff line number Diff line
@@ -21,6 +21,13 @@ if HAVE_YASSL 
else

  yassl_dummy_link_fix=

endif



if THREAD_SAFE_CLIENT

LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql_r/libmysqlclient_r.la

else

LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql/libmysqlclient.la

endif



#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_builddir)/include \

				-I$(top_srcdir)/include \
@@ -29,9 +36,6 @@ INCLUDES = -I$(top_builddir)/include \ 
LIBS =				@CLIENT_LIBS@

LDADD=				@CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \

				$(top_builddir)/libmysql/libmysqlclient.la

LDADD_R=			@CLIENT_EXTRA_LDFLAGS@ \

                                $(CLIENT_THREAD_LIBS) \

                                $(top_builddir)/libmysql_r/libmysqlclient_r.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

				mysqldump mysqlimport mysqltest mysqlbinlog \

				mysqltestmanagerc mysqltestmanager-pwgen \
@@ -51,9 +55,13 @@ mysqlbinlog_SOURCES = mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \ 
				$(top_srcdir)/mysys/my_vle.c \

				$(top_srcdir)/mysys/base64.c

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

mysqlslap_LDADD =		$(CXXLDFLAGS) $(LDADD_R) \

mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a 

mysqlimport_LDADD =		$(CXXLDFLAGS) $(LDADD_R) \

mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a 

mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c 

mysqltestmanagerc_SOURCES=	mysqlmanagerc.c $(yassl_dummy_link_fix)

client/mysqltest.c

+26 −24
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ enum {OPT_MANAGER_USER=256,OPT_MANAGER_HOST,OPT_MANAGER_PASSWD, 
  The list of error codes to --error are stored in an internal array of

  structs. This struct can hold numeric SQL error codes or SQLSTATE codes

  as strings. The element next to the last active element in the list is

  set to type ERR_EMPTY. When an SQL statement return an error we use

  set to type ERR_EMPTY. When an SQL statement returns an error, we use

  this list to check if this is an expected error.

*/
@@ -380,13 +380,6 @@ const char *command_names[]= 
  "connection",

  "query",

  "connect",

  /* the difference between sleep and real_sleep is that sleep will use

     the delay from command line (--sleep) if there is one.

     real_sleep always uses delay from mysqltest's command line argument.

     the logic is that sometimes delays are cpu-dependent (and --sleep

     can be used to set this delay. real_sleep is used for cpu-independent

     delays

   */

  "sleep",

  "real_sleep",

  "inc",
@@ -1105,8 +1098,8 @@ int do_source(struct st_query *query) 
    *p++= 0;

  query->last_argument= p;

  /*

     If this file has already been sourced, dont source it again.

     It's already available in the q_lines cache

     If this file has already been sourced, don't source it again.

     It's already available in the q_lines cache.

  */

  if (parser.current_line < (parser.read_lines - 1))

    return 0;
@@ -1430,7 +1423,7 @@ int do_modify_var(struct st_query *query, const char *name, 
    system <command>



    Eval the query to expand any $variables in the command.

    Execute the command withe the "system" command.

    Execute the command with the "system" command.



  NOTE

   If mysqltest is executed from cygwin shell, the command will be
@@ -1781,11 +1774,19 @@ int do_disable_rpl_parse(struct st_query *query __attribute__((unused))) 
   do_sleep()

    q	       called command

    real_sleep  use the value from opt_sleep as number of seconds to sleep

                if real_sleep is false



  DESCRIPTION

    sleep <seconds>

    real_sleep



    real_sleep <seconds>



  The difference between the sleep and real_sleep commands is that sleep

  uses the delay from the --sleep command-line option if there is one.

  (If the --sleep option is not given, the sleep command uses the delay

  specified by its argument.) The real_sleep command always uses the

  delay specified by its argument.  The logic is that sometimes delays are

  cpu-dependent, and --sleep can be used to set this delay.  real_sleep is

  used for cpu-independent delays.

*/



int do_sleep(struct st_query *query, my_bool real_sleep)
@@ -1794,18 +1795,19 @@ int do_sleep(struct st_query *query, my_bool real_sleep) 
  char *p= query->first_argument;

  char *sleep_start, *sleep_end= query->end;

  double sleep_val;

  char *cmd = (real_sleep ? "real_sleep" : "sleep");



  while (my_isspace(charset_info, *p))

    p++;

  if (!*p)

    die("Missing argument to sleep");

    die("Missing argument to %s", cmd);

  sleep_start= p;

  /* Check that arg starts with a digit, not handled by my_strtod */

  if (!my_isdigit(charset_info, *sleep_start))

    die("Invalid argument to sleep \"%s\"", query->first_argument);

    die("Invalid argument to %s \"%s\"", cmd, query->first_argument);

  sleep_val= my_strtod(sleep_start, &sleep_end, &error);

  if (error)

    die("Invalid argument to sleep \"%s\"", query->first_argument);

    die("Invalid argument to %s \"%s\"", cmd, query->first_argument);



  /* Fixed sleep time selected by --sleep option */

  if (opt_sleep && !real_sleep)
@@ -2457,7 +2459,7 @@ int safe_connect(MYSQL* mysql, const char *host, const char *user, 




/*

  Connect to a server and handle connection errors in case when they occur.

  Connect to a server and handle connection errors in case they occur.



  SYNOPSIS

    connect_n_handle_errors()
@@ -2893,7 +2895,7 @@ my_bool end_of_query(int c) 
    Normally that means it will read lines until it reaches the

    "delimiter" that marks end of query. Default delimiter is ';'

    The function should be smart enough not to detect delimiter's

    found inside strings sorrounded with '"' and '\'' escaped strings.

    found inside strings surrounded with '"' and '\'' escaped strings.



    If the first line in a query starts with '#' or '-' this line is treated

    as a comment. A comment is always terminated when end of line '\n' is
@@ -3178,7 +3180,7 @@ static struct my_option my_long_options[] = 
  {"compress", 'C', "Use the compressed server/client protocol.",

   (gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,

   0, 0, 0},

  {"cursor-protocol", OPT_CURSOR_PROTOCOL, "Use cursors for prepared statment",

  {"cursor-protocol", OPT_CURSOR_PROTOCOL, "Use cursors for prepared statements.",

   (gptr*) &cursor_protocol, (gptr*) &cursor_protocol, 0,

   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"database", 'D', "Database to use.", (gptr*) &db, (gptr*) &db, 0,
@@ -3222,7 +3224,7 @@ static struct my_option my_long_options[] = 
  {"result-file", 'R', "Read/Store result from/in this file.",

   (gptr*) &result_file, (gptr*) &result_file, 0, GET_STR, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"server-arg", 'A', "Send enbedded server this as a paramenter.",

  {"server-arg", 'A', "Send option value to embedded server as a parameter.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"server-file", 'F', "Read embedded server arguments from file.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -4896,7 +4898,7 @@ void get_query_type(struct st_query* q) 
    q->type=(enum enum_commands) type;		/* Found command */

    /*

      If queries are disabled, only recognize

      --enable-queries and --disable-queries

      --enable_parsing and --disable_parsing

    */

    if (parsing_disabled && q->type != Q_ENABLE_PARSING &&

        q->type != Q_DISABLE_PARSING)
@@ -5406,8 +5408,8 @@ int main(int argc, char **argv) 
    /*

      my_stat() successful on result file. Check if we have not run a

      single query, but we do have a result file that contains data.

      Note that we don't care, if my_stat() fails. For example for

      non-existing or non-readable file we assume it's fine to have

      Note that we don't care, if my_stat() fails. For example, for a

      non-existing or non-readable file, we assume it's fine to have

      no query output from the test file, e.g. regarded as no error.

    */

    die("No queries executed but result file found!");

config/ac-macros/replication.m4

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ dnl --------------------------------------------------------------------------- 


AC_DEFUN([MYSQL_CHECK_REPLICATION], [

  AC_ARG_WITH([row-based-replication],

              AC_HELP_STRING([--with-row-based-replication],

                             [Include row-based replication]),

              AC_HELP_STRING([--without-row-based-replication],

                             [Don't include row-based replication]),

              [row_based="$withval"],

              [row_based=yes])

  AC_MSG_CHECKING([for row-based replication])