Commit cfe4b99d authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

Merged

parents 00eba7a2 3cdf3f87

Docs/manual.texi

+14 −3
Original line number Diff line number Diff line
@@ -17603,7 +17603,7 @@ The options work for all table types, if not otherwise indicated: 














@multitable @columnfractions .20 .80















@item @code{AUTO_INCREMENT} @tab The next auto_increment value you want to set for your table (MyISAM).













@item @code{AVG_ROW_LENGTH} @tab An approximation of the average row length for your table. You only need to set this for tables with variable size records.













@item @code{AVG_ROW_LENGTH} @tab An approximation of the average row length for your table. You only need to set this for large tables with variable size records.















@item @code{CHECKSUM} @tab Set this to 1 if you want @strong{MySQL} to maintain a checksum for all rows (makes the table a little slower to update but makes it easier to find corrupted tables) (MyISAM).















@item @code{COMMENT} @tab A 60-character comment for your table.















@item @code{MAX_ROWS} @tab Max number of rows you plan to store in the table.









@@ -17618,7 +17618,8 @@ When you use a @code{MyISAM} table, @strong{MySQL} uses the product of













@code{max_rows * avg_row_length} to decide how big the resulting table















will be.  If you don't specify any of the above options, the maximum size















for a table will be 4G (or 2G if your operating systems only supports 2G













tables).













tables). The reason for this is just to keep down the pointer sizes













to make the index smaller and faster if you don't really need big files.





























If you don't use @code{PACK_KEYS}, the default is to only pack strings,















not numbers.  If you use @code{PACK_KEYS=1}, numbers will be packed as well.










@@ -28516,7 +28517,7 @@ variable in the @strong{MySQL} server is bigger than the













@end table





























The most normal use of @code{mysqldump} is probably for making a backup of













whole databases. @xref{Backup}:













whole databases. @xref{Backup}.





























@example















mysqldump --opt database > backup-file.sql










@@ -38931,6 +38932,16 @@ though, so Version 3.23 is not released as a stable version yet.













Automatically remove Berkeley DB transaction logs that are no longer in















use.















@item













Applied patches for OS2 by @code{Yuri Dario}.













@item













@code{FLUSH TABLES table_name} didn't always flush table properly to













disk; One some cases the index tree wasn't completely written to disk.













@item













@code{--bootstrap} is now run in a separate thread. This fixes the problem













that @code{mysql_install_db} core dumped on some Linux machines.













@item













Changed @code{mi_create()} to use less stack.













@item















Changed crash-me and the MySQL benchmarks to also work with FrontBase.















@item















Allow @code{RESTRICT} and @code{CASCADE} after @code{DROP TABLE} to make

























client/mysql.cc



+6
−6






























Original line number
Diff line number
Diff line








@@ -39,6 +39,8 @@













#include "my_readline.h"















#include <signal.h>





























const char *VER="11.8";





























gptr sql_alloc(unsigned size);	     // Don't use mysqld alloc for these















void sql_element_free(void *ptr);















#include "sql_string.h"










@@ -109,8 +111,6 @@ static HashTable ht;













enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};















typedef enum enum_info_type INFO_TYPE;





























const char *VER="11.7";





























static MYSQL mysql;			/* The connection */















static bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0,















	    connected=0,opt_raw_data=0,unbuffered=0,output_tables=0,










@@ -2156,10 +2156,7 @@ com_status(String *buffer __attribute__((unused)),













  }















#ifndef __WIN__















  tee_fprintf(stdout, "Current pager:\t\t%s\n", pager);













  if (opt_outfile)













    tee_fprintf(stdout, "Using outfile:\t\tYes: '%s'\n", outfile);













  else













    printf("Using outfile:\t\tNo\n");













  tee_fprintf(stdout, "Using outfile:\t\t'%s'\n", opt_outfile ? outfile : "");















#endif















  tee_fprintf(stdout, "Server version:\t\t%s\n", mysql_get_server_info(&mysql));















  tee_fprintf(stdout, "Protocol version:\t%d\n", mysql_get_proto_info(&mysql));









@@ -2169,6 +2166,9 @@ com_status(String *buffer __attribute__((unused)),













    tee_fprintf(stdout, "TCP port:\t\t%d\n", mysql.port);















  else















    tee_fprintf(stdout, "UNIX socket:\t\t%s\n", mysql.unix_socket);













  if (mysql.net.compress)













    tee_fprintf(stdout, "Protocol:\t\tCompressed\n");





























  if ((status=mysql_stat(&mysql)) && !mysql_error(&mysql)[0])















  {















    char *pos,buff[40];

































include/getopt.h



+3
−1






























Original line number
Diff line number
Diff line








@@ -99,7 +99,9 @@ struct option













#define optional_argument	2































#if ( defined (__STDC__) && __STDC__ ) || defined(__cplusplus) || defined(MSDOS)













#ifdef __GNU_LIBRARY__













#ifdef __EMX__













int getopt (int, char **, __const__ char *);













#elif defined( __GNU_LIBRARY__)















/* Many other libraries have conflicting prototypes for getopt, with















   differences in the consts, in stdlib.h.  To avoid compilation















   errors, only prototype getopt for the GNU C library.  */

































include/global.h



+12
−0






























Original line number
Diff line number
Diff line








@@ -21,6 +21,13 @@













#ifndef _global_h















#define _global_h





























#if defined( __EMX__) && !defined( MYSQL_SERVER)













// moved here to use below VOID macro redefinition













#define INCL_BASE













#define INCL_NOPMAPI













#include <os2.h>













#endif // __EMX__





























#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)















#include <config-win.h>















#else










@@ -381,8 +388,13 @@ typedef SOCKET_SIZE_TYPE size_socket;













#define FN_DEVCHAR	':'































#ifndef FN_LIBCHAR













#ifdef __EMX__













#define FN_LIBCHAR	'\\'













#define FN_ROOTDIR	"\\"













#else















#define FN_LIBCHAR	'/'















#define FN_ROOTDIR	"/"













#endif















#define MY_NFILE	1024	/* This is only used to save filenames */















#endif

















































include/my_sys.h



+7
−0






























Original line number
Diff line number
Diff line








@@ -41,6 +41,13 @@ extern int NEAR my_errno;		/* Last error in mysys */





























#include <stdarg.h>  





























#ifdef __EMX__













/* record loging flags (F_GETLK, F_SETLK, F_SETLKW) */













#define F_RDLCK     1           /* FreeBSD: shared or read lock */













#define F_UNLCK     2           /* FreeBSD: unlock */













#define F_WRLCK     3           /* FreeBSD: exclusive or write lock */













#endif





























#define MYSYS_PROGRAM_USES_CURSES()  { error_handler_hook = my_message_curses;	mysys_uses_curses=1; }















#define MYSYS_PROGRAM_DONT_USE_CURSES()  { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;}















#define MY_INIT(name);		{ my_progname= name; my_init(); }