Commit 1e562819 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge

parents 26b3f751 3f28181b

BitKeeper/etc/logging_ok

+3 −3
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ paul@work.mysql.com 
sasha@mysql.sashanet.com

sasha@work.mysql.com

serg@infomag.ape.relarn.ru

serg@serg.mysql.com

serg@work.mysql.com

sinisa@work.mysql.com

spurr@nslinux.bedford.progress.com

tim@localhost.polyesthetic.msg

tim@threads.polyesthetic.msg

tim@work.mysql.com

tonu@work.mysql.com
 
spurr@nslinux.bedford.progress.com

tim@threads.polyesthetic.msg

serg@serg.mysql.com

Docs/manual.texi

+878 −402

File changed.

Preview size limit exceeded, changes collapsed.

client/mysql.cc

+3 −4
Original line number Diff line number Diff line
@@ -1543,12 +1543,12 @@ com_edit(String *buffer,char *line __attribute__((unused))) 
  put_info("Sorry, you can't send the result to an editor in Win32",

	   INFO_ERROR);

#else

  char	*filename,buff[160];

  char	filename[FN_REFLEN],buff[160];

  int	fd,tmp;

  const char *editor;



  filename = my_tempnam(NullS,"sql",MYF(MY_WME));

  if ((fd = my_create(filename,0,O_CREAT | O_WRONLY, MYF(MY_WME))) < 0)

  if ((fd=create_temp_file(filename,NullS,"sql", O_CREAT | O_WRONLY,

			   MYF(MY_WME))) < 0)

    goto err;

  if (buffer->is_empty() && !old_buffer.is_empty())

    (void) my_write(fd,(byte*) old_buffer.ptr(),old_buffer.length(),
@@ -1576,7 +1576,6 @@ com_edit(String *buffer,char *line __attribute__((unused))) 
  (void) my_close(fd,MYF(0));

  (void) my_delete(filename,MYF(MY_WME));

err:

  free(filename);

#endif

  return 0;

}

config.guess

+3 −0
Original line number Diff line number Diff line
@@ -987,6 +987,9 @@ EOF 
    *:Rhapsody:*:*)

	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}

	exit 0 ;;

    *:Darwin:*:*)

	echo `uname -p`-apple-darwin${UNAME_RELEASE}

	exit 0 ;;

esac



#echo '(No uname command or uname output not recognized.)' 1>&2

config.sub

+1 −1
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ case $os in 
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \

	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \

	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)

	      | -interix* | -uwin* | -rhapsody* | -darwin* | -openstep* | -oskit*)

	# Remember, each alternative MUST END IN *, to match a version number.

		;;

	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \