Commit 1081dd6f authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents edeea349 2660a6bb

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c 
mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)

mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)

mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c my_user.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c my_user.c \

	                        $(top_srcdir)/mysys/mf_getdate.c \

                                $(yassl_dummy_link_fix)

mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)

mysql_upgrade_SOURCES=          mysql_upgrade.c $(yassl_dummy_link_fix)

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

client/mysql.cc

+4 −1
Original line number Diff line number Diff line
@@ -2858,7 +2858,7 @@ com_connect(String *buffer, char *line) 
  bzero(buff, sizeof(buff));

  if (buffer)

  {

    strmov(buff, line);

    strmake(buff, line, sizeof(buff));

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {
@@ -3724,6 +3724,9 @@ static const char* construct_prompt() 
      case 't':

	processed_prompt.append('\t');

	break;

      case 'l':

	processed_prompt.append(delimiter_str);

	break;

      default:

	processed_prompt.append(c);

      }

client/mysqldump.c

+7 −0
Original line number Diff line number Diff line
@@ -565,6 +565,13 @@ static void write_footer(FILE *sql_file) 
    fprintf(sql_file,

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

    fputs("\n", sql_file);

    if (opt_comments)

    {

      char time_str[20];

      get_date(time_str, GETDATE_DATE_TIME, 0);

      fprintf(sql_file, "-- Dump completed on %s\n",

              time_str);

    }

    check_io(sql_file);

  }

} /* write_footer */

client/mysqlimport.c

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ int main(int argc, char **argv) 
    return(1); /* purecov: deadcode */

  }



  if (mysql_query(sock, "set @@character_set_database=binary;"))

  if (mysql_query(sock, "/*!40101 set @@character_set_database=binary */;"))

  {

    db_error(sock); /* We shall countinue here, if --force was given */

    return(1);

client/mysqltest.c

+10 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ typedef struct 
static test_file file_stack[MAX_INCLUDE_DEPTH];

static test_file* cur_file;

static test_file* file_stack_end;

uint start_lineno; /* Start line of query */

uint start_lineno= 0; /* Start line of query */



static char TMPDIR[FN_REFLEN];

static char delimiter[MAX_DELIMITER]= DEFAULT_DELIMITER;
@@ -620,7 +620,7 @@ static void die(const char *fmt, ...) 
    if (cur_file && cur_file != file_stack)

      fprintf(stderr, "In included file \"%s\": ",

              cur_file->file_name);

    if (start_lineno != 0)

    if (start_lineno > 0)

      fprintf(stderr, "At line %u: ", start_lineno);

    vfprintf(stderr, fmt, args);

    fprintf(stderr, "\n");
@@ -4757,6 +4757,14 @@ int main(int argc, char **argv) 
	  q->require_file=require_file;

	  save_file[0]=0;

	}

        /*

          To force something being sent as a query to the mysqld one can

          use the prefix "query". Remove "query" from string before executing

        */

        if (strncmp(q->query, "query ", 6) == 0)

        {

          q->query= q->first_argument;

        }

	run_query(&cur_con->mysql, q, flags);

	query_executed= 1;

        q->last_argument= q->end;