Commit 5e8d60bb authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

parents 240ad72f 1d3e058c

Docs/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ info_TEXINFOS = manual.texi 
targets =		manual.txt mysql.info manual.html



BUILT_SOURCES =		$(targets) manual_toc.html include.texi

EXTRA_DIST =		$(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt INSTALL-BINARY

EXTRA_DIST =		$(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \

			INSTALL-BINARY mirrors.texi section.Comparisons.texi



all:			$(targets) txt_files

Docs/manual.texi

+509 −64

File changed.

Preview size limit exceeded, changes collapsed.

include/mysql_com.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY, 
/* RESET (remove all queries) from query cache */

#define REFRESH_QUERY_CACHE	65536

#define REFRESH_QUERY_CACHE_FREE 0x20000L /* pack query cache */

#define REFRESH_DES_KEY_FILE	0x40000L



#define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */

#define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */

myisam/ft_update.c

+5 −4
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ uint _mi_ft_segiterator(register FT_SEG_ITERATOR *ftsi) 
  if (ftsi->seg->flag & HA_BLOB_PART)

  {

    ftsi->len=_mi_calc_blob_length(ftsi->seg->bit_start,ftsi->pos);

    memcpy_fixed(&ftsi->pos,ftsi->pos+ftsi->seg->bit_start,sizeof(char*));

    memcpy_fixed((char*) &ftsi->pos, ftsi->pos+ftsi->seg->bit_start,

		 sizeof(char*));

    set_if_smaller(ftsi->len,ftsi->seg->length);

    return 1;

  }
@@ -107,7 +108,7 @@ FT_WORD * _mi_ft_parserecord(MI_INFO *info, uint keynr, 
{

  TREE ptree;



  bzero(&ptree, sizeof(ptree));

  bzero((char*) &ptree, sizeof(ptree));

  if (_mi_ft_parse(&ptree, info, keynr, record))

    return NULL;

mysql-test/mysql-test-run.sh

+2 −3
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ sleep_until_file_exists () 
  exit 1;

}





# No paths below as we can't be sure where the program is!



BASENAME=`which basename | head -1`
@@ -993,7 +992,7 @@ run_testcase () 
 then

   if [ -f $master_opt_file ] ;

   then

     EXTRA_MASTER_OPT=`$CAT $master_opt_file`

     EXTRA_MASTER_OPT=`$CAT $master_opt_file | $SED -e "s;\\$MYSQL_TEST_DIR;$MYSQL_TEST_DIR;"`

     stop_master

     start_master

   else
@@ -1008,7 +1007,7 @@ run_testcase () 


   if [ -f $slave_opt_file ] ;

   then

     EXTRA_SLAVE_OPT=`$CAT $slave_opt_file`

     EXTRA_SLAVE_OPT=`$CAT $slave_opt_file | $SED -e "s;\\$MYSQL_TEST_DIR;$MYSQL_TEST_DIR;"`

     do_slave_restart=1

   else

    if [ ! -z "$EXTRA_SLAVE_OPT" ] || [ x$SLAVE_RUNNING != x1 ] ;