Commit 0d55e936 authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

Fix when using --without-server --with-thread-safe-client 

Added prototype for my_thread_end
New error message for MATCH
Give error when using myisamchk --force --readonly
parent 493f1055

Docs/manual.texi

+22 −2
Original line number Diff line number Diff line
@@ -21610,6 +21610,15 @@ mysql> select * from bar; 
For each row in table @code{foo}, a row is inserted in @code{bar} with

the values from @code{foo} and default values for the new columns.













@code{CREATE TABLE ... SELECT} will not automaticly create any indexes













for you.  This is done intentionally to make the command as flexible as













possible.  If you want to have indexes in the created table, you should













specify these before the @code{SELECT} statement:

























@example













mysql> create table bar (unique (n)) select n from foo;













@end example



























If any errors occur while copying the data to the table, it will 















automatically be deleted. 
























@@ -29928,12 +29937,23 @@ the Internet with a search engine.  It is with this reasoning that such rows













have been assigned a low semantical value in @strong{this particular dataset}.





























@menu













* Fulltext restrictions::       















* Fulltext Fine-tuning::        















* Fulltext Features to Appear in MySQL 4.0::  















* Fulltext TODO::               















@end menu



























@node Fulltext Fine-tuning, Fulltext Features to Appear in MySQL 4.0, Fulltext Search, Fulltext Search













@node Fulltext restrictions, Fulltext Fine-tuning, Fulltext Search, Fulltext Search













@section Fulltext restrictions













@itemize @bullet













@item













All parameters to the @code{MATCH} function must be columns from the













same table that is part of the same fulltext index.













@item













The argument to @code{AGAINST} must be a constant string.













@end itemize

























@node Fulltext Fine-tuning, Fulltext Features to Appear in MySQL 4.0, Fulltext restrictions, Fulltext Search















@section Fine-tuning MySQL Full-text Search





























Unfortunately, full-text search has no user-tunable parameters yet,










@@ -29990,7 +30010,7 @@ implemented in the 4.0 tree. It explains













@code{OPTIMIZE TABLE} with @code{FULLTEXT} indexes are now















up to 100 times faster.



























@item @code{MATCH ... AGAINST} now supports the following 













@item @code{MATCH ... AGAINST} is going to support the following 















@strong{boolean operators}:





























@itemize @bullet

























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",