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

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_parse.cc:
  Auto merged
parents 37c4eadb 9b14dc88

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -382,8 +382,11 @@ libmysqld/examples/link_sources 
libmysqld/examples/my_readline.h

libmysqld/examples/mysql

libmysqld/examples/mysql.cc

libmysqld/examples/mysql_client_test.c

libmysqld/examples/mysql_client_test_embedded

libmysqld/examples/mysqltest

libmysqld/examples/mysqltest.c

libmysqld/examples/mysqltest_embedded

libmysqld/examples/readline.cc

libmysqld/examples/sql_string.cc

libmysqld/examples/sql_string.h

BUILD/compile-pentium64-debug

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium64_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $static_link"



extra_configs="$extra_configs "



. "$path/FINISH.sh"

VC++Files/libmysqld/libmysqld.dsp

+0 −4
Original line number Diff line number Diff line
@@ -228,10 +228,6 @@ SOURCE=..\sql\ha_innodb.cpp 
# End Source File

# Begin Source File



SOURCE=..\sql\ha_isammrg.cpp

# End Source File

# Begin Source File



SOURCE=..\sql\ha_myisam.cpp

# End Source File

# Begin Source File

VC++Files/mysqldemb/mysqldemb.dsp

+0 −4
Original line number Diff line number Diff line
@@ -169,10 +169,6 @@ SOURCE=..\sql\ha_innodb.cpp 
# End Source File

# Begin Source File



SOURCE=..\sql\ha_isammrg.cpp

# End Source File

# Begin Source File



SOURCE=..\sql\ha_myisam.cpp

# End Source File

# Begin Source File

client/mysql.cc

+12 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include <locale.h>

#endif



const char *VER= "14.7";

const char *VER= "14.8";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024
@@ -144,6 +144,7 @@ static char *current_host,*current_db,*current_user=0,*opt_password=0, 
            *current_prompt=0, *delimiter_str= 0,

            *default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME;

static char *histfile;

static char *histfile_tmp;

static String glob_buffer,old_buffer;

static String processed_prompt;

static char *full_username=0,*part_username=0,*default_prompt=0;
@@ -442,6 +443,13 @@ int main(int argc,char *argv[]) 
      if (verbose)

	tee_fprintf(stdout, "Reading history-file %s\n",histfile);

      read_history(histfile);

      if (!(histfile_tmp= (char*) my_malloc((uint) strlen(histfile) + 5,

					    MYF(MY_WME))))

      {

	fprintf(stderr, "Couldn't allocate memory for temp histfile!\n");

	exit(1);

      }

      sprintf(histfile_tmp, "%s.TMP", histfile);

    }

  }

#endif
@@ -470,7 +478,8 @@ sig_handler mysql_end(int sig) 
    /* write-history */

    if (verbose)

      tee_fprintf(stdout, "Writing history-file %s\n",histfile);

    write_history(histfile);

    if (!write_history(histfile_tmp))

      my_rename(histfile_tmp, histfile, MYF(MY_WME));

  }

  batch_readline_end(status.line_buff);

  completion_hash_free(&ht);
@@ -485,6 +494,7 @@ sig_handler mysql_end(int sig) 
  my_free(opt_password,MYF(MY_ALLOW_ZERO_PTR));

  my_free(opt_mysql_unix_port,MYF(MY_ALLOW_ZERO_PTR));

  my_free(histfile,MYF(MY_ALLOW_ZERO_PTR));

  my_free(histfile_tmp,MYF(MY_ALLOW_ZERO_PTR));

  my_free(current_db,MYF(MY_ALLOW_ZERO_PTR));

  my_free(current_host,MYF(MY_ALLOW_ZERO_PTR));

  my_free(current_user,MYF(MY_ALLOW_ZERO_PTR));