Commit 851afaa2 authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

Take Jeremy's manual.texi; Will patch this with the deleted text

parents e9dbc43a 0d55e936

configure.in

+9 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

AM_INIT_AUTOMAKE(mysql, 3.23.40)

AM_INIT_AUTOMAKE(mysql, 3.23.41)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -1946,9 +1946,13 @@ AC_SUBST(CLIENT_LIBS) 
AC_SUBST(sql_client_dirs)

AC_SUBST(linked_client_targets)



if test "$with_server" = "yes"

if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"

then

  AC_DEFINE(THREAD)

fi



if test "$with_server" = "yes"

then

  # Avoid _PROGRAMS names

  THREAD_LPROGRAMS="test_thr_alarm test_thr_lock"

  AC_SUBST(THREAD_LPROGRAMS)
@@ -2044,7 +2048,10 @@ EOF 


    AC_DEFINE(HAVE_GEMINI_DB)

  fi

fi



if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"

then

  if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"

  then

    # MIT user level threads

include/mysql_com.h

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ void hash_password(unsigned long *result, const char *password); 
void my_init(void);

void load_defaults(const char *conf_file, const char **groups,

		   int *argc, char ***argv);

void my_thread_end(void);



#define NULL_LENGTH ((unsigned long) ~0) /* For net_store_length */

include/mysqld_error.h

+2 −1
Original line number Diff line number Diff line
@@ -210,4 +210,5 @@ 
#define ER_READ_ONLY_TRANSACTION 1207

#define ER_DROP_DB_WITH_READ_LOCK 1208

#define ER_CREATE_DB_WITH_READ_LOCK 1209

#define ER_ERROR_MESSAGES 210
 
#define ER_WRONG_ARGUMENTS 1210

#define ER_ERROR_MESSAGES 211

myisam/myisamchk.c

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static struct option long_options[] = 


static void print_version(void)

{

  printf("%s  Ver 1.48 for %s at %s\n",my_progname,SYSTEM_TYPE,

  printf("%s  Ver 1.49 for %s at %s\n",my_progname,SYSTEM_TYPE,

	 MACHINE_TYPE);

}
@@ -468,7 +468,7 @@ static void get_options(register int *argc,register char ***argv) 
  if ((check_param.testflag & T_READONLY) &&

      (check_param.testflag &

       (T_REP_BY_SORT | T_REP | T_STATISTICS | T_AUTO_INC |

	T_SORT_RECORDS | T_SORT_INDEX)))

	T_SORT_RECORDS | T_SORT_INDEX | T_FORCE_CREATE)))

  {

    VOID(fprintf(stderr,

		 "%s: Can't use --readonly when repairing or sorting\n",

mysql-test/t/fulltext.test

+21 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Test of fulltext index

#



drop table if exists t1,t2;

drop table if exists t1,t2,t3;



CREATE TABLE t1 (a VARCHAR(200), b TEXT, FULLTEXT (a,b));

INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),('Full-text indexes', 'are called collections'),('Only MyISAM tables','support collections'),('Function MATCH ... AGAINST()','is used to do a search'),('Full-text search in MySQL', 'implements vector space model');
@@ -61,4 +61,23 @@ select * from t2 where MATCH inhalt AGAINST (NULL); 
select * from t2 where  MATCH inhalt AGAINST ('foobar');

select * from t2 having MATCH inhalt AGAINST ('foobar');



drop table t1,t2;
 
#

# check of fulltext errors

#



CREATE TABLE t3 (

  ticket int(11),

  inhalt text,

  KEY tig (ticket),

  fulltext index tix (inhalt)

);



--error 1210

select * from t2 having MATCH inhalt AGAINST (t1.id);

--error 1210

select * from t2 having MATCH ticket AGAINST ('foobar');

--error 1210

select * from t2,t3 having MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');



drop table t1,t2,t3;