Commit 646c509b authored by He Zhenxing's avatar He Zhenxing
Browse files

Auto merge from mysql-5.1 main

parents 35e47b31 d62d3f34

client/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -88,11 +88,12 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ 


mysqltest_SOURCES=		mysqltest.c

mysqltest_CFLAGS=		-DTHREAD -UUNDEF_THREADS_HACK

mysqltest_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

mysqltest_LDADD =		$(CXXLDFLAGS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a \

				$(top_builddir)/regex/libregex.a

				$(top_builddir)/regex/libregex.a \

				$(CLIENT_THREAD_LIBS)



mysql_upgrade_SOURCES=          mysql_upgrade.c \

                                $(top_srcdir)/mysys/my_getpagesize.c

client/mysql_upgrade.c

+56 −83
Original line number Diff line number Diff line
@@ -269,6 +269,10 @@ get_one_option(int optid, const struct my_option *opt, 
}





/**

  Run a command using the shell, storing its output in the supplied dynamic

  string.

*/

static int run_command(char* cmd,

                       DYNAMIC_STRING *ds_res)

{
@@ -341,37 +345,15 @@ static int run_tool(char *tool_path, DYNAMIC_STRING *ds_res, ...) 
}





/*

  Try to get the full path to this exceutable



  Return 0 if path found



/**

  Look for the filename of given tool, with the presumption that it is in the

  same directory as mysql_upgrade and that the same executable-searching 

  mechanism will be used when we run our sub-shells with popen() later.

*/



static my_bool get_full_path_to_executable(char* path)

static void find_tool(char *tool_executable_name, const char *tool_name, 

                      const char *self_name)

{

  my_bool ret;

  DBUG_ENTER("get_full_path_to_executable");

#ifdef __WIN__

  ret= (GetModuleFileName(NULL, path, FN_REFLEN) == 0);

#else

  /* my_readlink returns 0 if a symlink was read */

  ret= (my_readlink(path, "/proc/self/exe", MYF(0)) != 0);

  /* Might also want to try with /proc/$$/exe if the above fails */

#endif

  DBUG_PRINT("exit", ("path: %s", path));

  DBUG_RETURN(ret);

}





/*

  Look for the tool in the same directory as mysql_upgrade.

*/



static void find_tool(char *tool_path, const char *tool_name)

{

  size_t path_len;

  char path[FN_REFLEN];

  char *last_fn_libchar;

  DYNAMIC_STRING ds_tmp;

  DBUG_ENTER("find_tool");

  DBUG_PRINT("enter", ("progname: %s", my_progname));
@@ -379,36 +361,24 @@ static void find_tool(char *tool_path, const char *tool_name) 
  if (init_dynamic_string(&ds_tmp, "", 32, 32))

    die("Out of memory");



  /* Initialize path with the full path to this program */

  if (get_full_path_to_executable(path))

  last_fn_libchar= strrchr(self_name, FN_LIBCHAR);



  if (last_fn_libchar == NULL)

  {

    /*

      Easy way to get full executable path failed, try

      other methods

      mysql_upgrade was found by the shell searching the path.  A sibling

      next to us should be found the same way.

    */

    if (my_progname[0] == FN_LIBCHAR)

    {

      /* 1. my_progname contains full path */

      strmake(path, my_progname, FN_REFLEN);

    }

    else if (my_progname[0] == '.')

    {

      /* 2. my_progname contains relative path, prepend wd */

      char buf[FN_REFLEN];

      my_getwd(buf, FN_REFLEN, MYF(0));

      my_snprintf(path, FN_REFLEN, "%s%s", buf, my_progname);

    strncpy(tool_executable_name, tool_name, FN_REFLEN);

  }

  else

  {

      /* 3. Just go for it and hope tool is in path */

      path[0]= 0;

    }

  }

    int len;



  DBUG_PRINT("info", ("path: '%s'", path));



  /* Chop off binary name (i.e mysql-upgrade) from path */

  dirname_part(path, path, &path_len);

    /*

      mysql_upgrade was run absolutely or relatively.  We can find a sibling

      by replacing our name after the LIBCHAR with the new tool name.

    */



    /*

      When running in a not yet installed build and using libtool,
@@ -418,38 +388,32 @@ static void find_tool(char *tool_path, const char *tool_name) 
      mysqlcheck). Thus if path ends in .libs/, step up one directory

      and execute the tools from there

    */

  path[max(path_len-1, 0)]= 0;   /* Chop off last / */

  if (strncmp(path + dirname_length(path), ".libs", 5) == 0)

    if (((last_fn_libchar - 6) >= self_name) &&

        (strncmp(last_fn_libchar - 5, ".libs", 5) == 0) &&

        (*(last_fn_libchar - 6) == FN_LIBCHAR))

    {

    DBUG_PRINT("info", ("Chopping off .libs from '%s'", path));



    /* Chop off .libs */

    dirname_part(path, path, &path_len);

      DBUG_PRINT("info", ("Chopping off \".libs\" from end of path"));

      last_fn_libchar -= 6;

    }



    len= last_fn_libchar - self_name;



  DBUG_PRINT("info", ("path: '%s'", path));



  /* Format name of the tool to search for */

  fn_format(tool_path, tool_name,

            path, "", MYF(MY_REPLACE_DIR));



  verbose("Looking for '%s' in: %s", tool_name, tool_path);

    my_snprintf(tool_executable_name, FN_REFLEN, "%.*s%c%s",

                len, self_name, FN_LIBCHAR, tool_name);

  }



  /* Make sure the tool exists */

  if (my_access(tool_path, F_OK) != 0)

    die("Can't find '%s'", tool_path);

  verbose("Looking for '%s' as: %s", tool_name, tool_executable_name);



  /*

    Make sure it can be executed

  */

  if (run_tool(tool_path,

  if (run_tool(tool_executable_name,

               &ds_tmp, /* Get output from command, discard*/

               "--help",

               "2>&1",

               IF_WIN("> NUL", "> /dev/null"),

               NULL))

    die("Can't execute '%s'", tool_path);

    die("Can't execute '%s'", tool_executable_name);



  dynstr_free(&ds_tmp);
@@ -759,11 +723,20 @@ static const char *load_default_groups[]= 


int main(int argc, char **argv)

{

  char self_name[FN_REFLEN];



  MY_INIT(argv[0]);

#ifdef __NETWARE__

  setscreenmode(SCR_AUTOCLOSE_ON_EXIT);

#endif



#if __WIN__

  if (GetModuleFileName(NULL, self_name, FN_REFLEN) == 0)

#endif

  {

    strncpy(self_name, argv[0], FN_REFLEN);

  }



  if (init_dynamic_string(&ds_args, "", 512, 256))

    die("Out of memory");
@@ -789,10 +762,10 @@ int main(int argc, char **argv) 
  dynstr_append(&ds_args, " ");



  /* Find mysql */

  find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"));

  find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name);



  /* Find mysqlcheck */

  find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"));

  find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name);



  /*

    Read the mysql_upgrade_info file to check if mysql_upgrade

config/ac-macros/character_sets.m4

+4 −4
Original line number Diff line number Diff line
@@ -343,8 +343,8 @@ case $default_charset in 
      default_charset_default_collation="ucs2_general_ci"

      define(UCSC1, ucs2_general_ci ucs2_bin)

      define(UCSC2, ucs2_czech_ci ucs2_danish_ci)

      define(UCSC3, ucs2_esperanto_ci ucs2_estonian_ci ucs2_icelandic_ci)

      define(UCSC4, ucs2_latvian_ci ucs2_lithuanian_ci)

      define(UCSC3, ucs2_esperanto_ci ucs2_estonian_ci ucs2_hungarian_ci)

      define(UCSC4, ucs2_icelandic_ci ucs2_latvian_ci ucs2_lithuanian_ci)

      define(UCSC5, ucs2_persian_ci ucs2_polish_ci ucs2_romanian_ci)

      define(UCSC6, ucs2_slovak_ci ucs2_slovenian_ci)

      define(UCSC7, ucs2_spanish2_ci ucs2_spanish_ci)
@@ -367,8 +367,8 @@ case $default_charset in 
      else

        define(UTFC1, utf8_general_ci utf8_bin)

        define(UTFC2, utf8_czech_ci utf8_danish_ci)

        define(UTFC3, utf8_esperanto_ci utf8_estonian_ci utf8_icelandic_ci)

        define(UTFC4, utf8_latvian_ci utf8_lithuanian_ci)

        define(UTFC3, utf8_esperanto_ci utf8_estonian_ci utf8_hungarian_ci)

        define(UTFC4, utf8_icelandic_ci utf8_latvian_ci utf8_lithuanian_ci)

        define(UTFC5, utf8_persian_ci utf8_polish_ci utf8_romanian_ci)

        define(UTFC6, utf8_slovak_ci utf8_slovenian_ci)

        define(UTFC7, utf8_spanish2_ci utf8_spanish_ci)

mysql-test/extra/rpl_tests/rpl_row_basic.test

+4 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ eval CREATE TABLE t7 (i INT NOT NULL, 
connection master;

INSERT INTO t1 VALUES (1, "", 1);

INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);

sync_slave_with_master;



sync_slave_with_master;
@@ -365,6 +366,7 @@ source include/diff_tables.inc; 
connection master;

INSERT INTO t2 VALUES (1, "", 1);

INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);

sync_slave_with_master;



sync_slave_with_master;
@@ -395,6 +397,7 @@ source include/wait_for_slave_to_start.inc; 
connection master;

INSERT INTO t4 VALUES (1, "", 1);

INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);

sync_slave_with_master;



sync_slave_with_master;
@@ -444,6 +447,7 @@ source include/wait_for_slave_to_start.inc; 
connection master;

INSERT INTO t7 VALUES (1, "", 1);

INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);

sync_slave_with_master;



sync_slave_with_master;

mysql-test/r/func_if.result

+46 −0
Original line number Diff line number Diff line
@@ -131,3 +131,49 @@ drop table t1; 
select if(0, 18446744073709551610, 18446744073709551610);

if(0, 18446744073709551610, 18446744073709551610)

18446744073709551610

CREATE TABLE t1(a DECIMAL(10,3));

SELECT t1.a,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,0)))))))))))))))))))))))))))))) + 1

FROM t1;

a	IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((ROUND(t1.a,2)=1), 2,

IF((R

DROP TABLE t1;

End of 5.0 tests