Commit 26c93519 authored by unknown's avatar unknown
Browse files

Merge 


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
ndb/src/kernel/main.cpp:
  merge
parents 3bd6f299 c03c9b24

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ bar@deer.(none) 
bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@51.0.168.192.in-addr.arpa

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -2926,9 +2926,9 @@ com_status(String *buffer __attribute__((unused)), 
    MYSQL_ROW cur=mysql_fetch_row(result);

    if (cur)

    {

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[0] ? cur[0] : "");

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[2] ? cur[2] : "");

      tee_fprintf(stdout, "Db     characterset:\t%s\n", cur[3] ? cur[3] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[2] ? cur[2] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[0] ? cur[0] : "");

      tee_fprintf(stdout, "Conn.  characterset:\t%s\n", cur[1] ? cur[1] : "");

    }

    mysql_free_result(result);

client/mysqldump.c

+4 −1
Original line number Diff line number Diff line
@@ -493,7 +493,8 @@ static void write_header(FILE *sql_file, char *db_name) 
");

    }

    fprintf(sql_file,

	    "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;\n",

	    "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;\n"

	    "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\n",

	    path?"":"NO_AUTO_VALUE_ON_ZERO",compatible_mode_normal_str[0]==0?"":",",

	    compatible_mode_normal_str);

    check_io(sql_file);
@@ -522,6 +523,8 @@ static void write_footer(FILE *sql_file) 
"/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n"

"/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n"

"/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n");

    fprintf(sql_file,

	    "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;\n");

    fputs("\n", sql_file);

    check_io(sql_file);

  }

extra/my_print_defaults.c

+13 −5
Original line number Diff line number Diff line
@@ -120,25 +120,33 @@ int main(int argc, char **argv) 
  int count, error;

  char **load_default_groups, *tmp_arguments[2],

       **argument, **arguments;

  char *defaults, *extra_defaults;

  MY_INIT(argv[0]);



  get_defaults_files(argc, argv, &defaults, &extra_defaults);



  /*

  ** Check out the args

  */

  if (get_options(&argc,&argv))

    exit(1);

  if (!(load_default_groups=(char**) my_malloc((argc+2)*sizeof(char*),

					       MYF(MY_WME))))

    exit(1);

  if (get_options(&argc,&argv))

    exit(1);



  for (count=0; *argv ; argv++,count++)

    load_default_groups[count]= *argv;

  load_default_groups[count]=0;



  count=1;

  count=0;

  arguments=tmp_arguments;

  arguments[0]=my_progname;

  arguments[1]=0;

  arguments[count++]=my_progname;

  if (extra_defaults)

    arguments[count++]= extra_defaults;

  if (defaults)

    arguments[count++]= defaults;

  arguments[count]= 0;



  if ((error= load_defaults(config_file, (const char **) load_default_groups,

			   &count, &arguments)))

  {

extra/perror.c

+7 −6
Original line number Diff line number Diff line
@@ -245,16 +245,17 @@ int main(int argc,char *argv[]) 
	msg = strerror(code);



      /*

        Don't print message for not existing error messages or for

        unknown errors.  We test for 'Uknown Errors' just as an

        extra safety for Netware

        We don't print the OS error message if it is the same as the

        unknown_error message we retrieved above, or it starts with

        'Unknown Error' (without regard to case).

      */

      if (msg && strcmp(msg, "Unknown Error") &&

      if (msg &&

          my_strnncoll(&my_charset_latin1, msg, 13, "Unknown Error", 13) &&

          (!unknown_error || strcmp(msg, unknown_error)))

      {

	found=1;

	if (verbose)

	  printf("Error code %3d:  %s\n",code,msg);

	  printf("OS error code %3d:  %s\n",code,msg);

	else

	  puts(msg);

      }
@@ -269,7 +270,7 @@ int main(int argc,char *argv[]) 
      else

      {

	if (verbose)

	  printf("MySQL error:  %3d = %s\n",code,msg);

	  printf("MySQL error code %3d: %s\n",code,msg);

	else

	  puts(msg);

      }