Merge

gmake -k clean || true 

/bin/rm -f */.deps/*.P config.cache

aclocal && autoheader && aclocal && automake && autoconf

(cd bdb/dist && sh s_all)

(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)

if [ -d gemini ]

then

   (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)

fi

CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static  --with-client-ldflags=-all-static  --with-debug --with-innodb --with-embedded-server

gmake

safe_cd("$host");

if ($opt_stage == 0 && ! $opt_use_old_distribution)

{

  my ($name);

  safe_system("gunzip < $opt_distribution | $tar xf -");

  # Fix file times; This is needed because the time for files may be

  # in the future

  system("touch timestamp; find $var -newer timestamp -print | xargs touch; rm -f timestamp");

  sleep(2);

  # Ensure that files we don't want to rebuild are newer than other files

  foreach $name ("configure",

		 "Docs/include.texi",

		 "Docs/*.html", "Docs/manual.txt", "Docs/mysql.info",

		 "sql/sql_yacc.h", "sql/sql_yacc.cc")

  {

    system("touch $name");

  }

}

safe_cd($ver);

if ($opt_stage <= 1)

{

uses MySQL with 60,000 tables and about 5,000,000,000 rows

@item

All columns have default values.  You can use @code{INSERT} to insert a

subset of a table's columns; those columns that are not explicitly given

values are set to their default values.

@cindex default values

All columns have default values.

You can use @code{INSERT} to insert a subset of a table's columns; those

columns that are not explicitly given values are set to their default

values.

@item

Uses GNU Automake, Autoconf, and Libtool for portability.

@item mSQL

Has a file @file{mSQL.acl} in which you can grant read/write privileges for

users.

@item

@end table

speed of your connection; be patient.

@item

You will need GNU @code{autoconf}, @code{automake}, @code{libtool}, and

@code{m4} to run the next set of commands.

You will need GNU @code{autoconf 2.13}, @code{automake 1.4},

@code{libtool}, and @code{m4} to run the next set of commands.

Note that the new versions of @code{autoconf} (2.52) and @code{automake}

(1.5) do not work.

If you get some strange error during this stage, check that you really

have @code{libtool} installed!

which protocol is used:

@multitable @columnfractions .3 .7

@strong{Host name} @tab @strong{Protocol}

@item @strong{Host name} @tab @strong{Protocol}

@item NULL (none) @tab  On NT, try named pipes first; if that doesn't work, use TCP/IP. On Win95/Win98, TCP/IP is used.

@item . @tab Named pipes

@item localhost @tab TCP/IP to current host

* OpenBSD 2.8::                 OpenBSD 2.8 Notes

@end menu

This section contains notes on OpenBSD.

@node OpenBSD 2.5, OpenBSD 2.8, OpenBSD, BSD Notes

@subsubsection OpenBSD 2.5 Notes

* BSDI4::                       BSD/OS 4.x notes

@end menu

This section contains notes on BSD/OS.

@node BSDI2, BSDI3, BSDI, BSD Notes

@subsubsection BSD/OS Version 2.x Notes

At least the following options should be different per server:

@table @code

@itemize

@item port=#

@item socket=path

@item pid-file=path

@end table

@end itemize

The following options should be different, if they are used:

@table @code

@itemize

@item log=path

@item log-bin=path

@item log-update=path

@item log-isam=path

@item bdb-logdir=path

@end table

@end itemize

If you want more performance, you can also specify the following differently:

@table @code

@itemize

@item tmpdir=path

@item bdb-tmpdir=path

@end table

@end itemize

@xref{Command-line options}.

@code{myisamchk} also has a number of other options you can use to improve

the performance of a table:

@table @code

@itemize

@item -S, --sort-index

@item -R index_num, --sort-records=index_num

@item -a, --analyze

@end table

@end itemize

For a full description of the option. @xref{myisamchk syntax}.

To get a description of a table or statistics about it, use the commands shown

below. We explain some of the information in more detail later:

@table @code

@itemize @bullet

@item myisamchk -d tbl_name

Runs @code{myisamchk} in ``describe mode'' to produce a description of

your table. If you start the MySQL server using the

@item myisamchk -eiv tbl_name

This is like @code{-eis}, but tells you what is being done.

@end table

@end itemize

@cindex examples, @code{myisamchk} output

@cindex @code{myisamchk}, example output

given below.  The ``keyfile'' is the index file.  ``Record'' and ``row''

are synonymous:

@table @code

@itemize @bullet

@item ISAM file

Name of the ISAM (index) file.

A list of all keys in the table. For each key, some low-level information

is presented:

@table @code

@itemize @minus

@item Key

This key's number.

value of 1. This may be updated after a table is loaded (or greatly

changed) with @code{myisamchk -a}. If this is not updated at all, a default

value of 30 is given.

@end table

@end itemize

@item

In the first example above, the 9th key is a multi-part key with two parts.

When the dynamic table format is used, record fragments are linked with

pointers (4 to 7 bytes each). @code{Linkdata} is the sum of the amount of

storage used by all such pointers.

@end table

@end itemize

If a table has been compressed with @code{myisampack}, @code{myisamchk

-d} prints additional information about each table column.  See

@code{16M} and @code{16m} are equivalent:

@cindex variables, values

@table @code

@itemize

@item @code{ansi_mode}.

Is @code{ON} if @code{mysqld} was started with @code{--ansi}.

@xref{ANSI mode}.

@item @code{wait_timeout}

The number of seconds the server waits for activity on a connection before

closing it. See also @code{interactive_timeout}.

@end table

@end itemize

The manual section that describes tuning MySQL contains some

information of how to tune the above variables. @xref{Server parameters}.

@code{safe_mysqld} supports the following options:

@table @code

@itemize

@item --basedir=path

@item --core-file-size=#

Size of the core file @code{mysqld} should be able to create. Passed to @code{ulimit -c}.

@item --timezone=#

Set the timezone (the @code{TZ}) variable to the value of this parameter.

@item --user=#

@end table

@end itemize

The @code{safe_mysqld} script is written so that it normally is able to start

a server that was installed from either a source or a binary version of

@code{mysqld_multi} supports the following options:

@table @code

@itemize

@cindex config-file option

@item --config-file=...

Alternative config file. NOTE: This will not affect this program's own

@cindex version option

@item --version

Print the version number and exit.

@end table

@end itemize

Some notes about @code{mysqld_multi}:

@code{myisampack} supports the following options:

@table @code

@itemize @bullet

@item -b, --backup

Make a backup of the table as @code{tbl_name.OLD}.

invoked with the @code{--skip-locking} option, it is not a good idea to

invoke @code{myisampack} if the table might be updated during the

packing process.

@end table

@end itemize

@cindex examples, compressed tables

The sequence of commands shown below illustrates a typical table compression

is a comma-separated list of @code{master_def} where @code{master_def} is

one of the following: @code{MASTER_HOST}, @code{MASTER_USER},

@code{MASTER_PASSWORD}, @code{MASTER_PORT}, @code{MASTER_CONNECT_RETRY},

@code{MASTER_LOG_FILE}, @code{MASTER_LOG_POS}. Example:

@code{MASTER_LOG_FILE}, @code{MASTER_LOG_POS}. For example:

@example

CHANGE MASTER TO

  MASTER_HOST='master2.mycompany.com',

  MASTER_USER='replication',

  MASTER_PORT=3306,

  MASTER_LOG_FILE='master2-bin.001',

  MASTER_LOG_POS=4;

@end example

You only need to specify the values that need to be changed. The values that

We are also working on some extensions to solve this problem for some

common application niches.

MySQL can work with both transactional and not transactional tables.  To

be able to work smoothly with not transactional tables (which can't

rollback if something goes wrong), MySQL has the following rules:

@cindex default values

@itemize @bullet

@item

All columns has default values.

@item

If you insert a 'wrong' value in a column like a @code{NULL} in a

@code{NOT NULL} column or a too big numerical value in a numerical

column, MySQL will instead of giving an error instead set the column to

the 'best possible value'.  For numerical values this is 0, the smallest

possible values or the largest possible value. For strings this is

either the empty string or the longest possible string that can be in

the column.

@item

All calculated expressions returns a value that can be used instead of

signaling an error condition. For example 1/0 returns @code{NULL}

@end itemize

The reason for the above rules is that we can't check these conditions

before the query starts to execute.  If we encounter a problem after

updating a few rows, we can't just rollback as the table type may not

support this.  We can't stop because in that case the update would be

'half done' which is probably the worst possible scenario.  In this case

it's better to 'do the best you can' and then continue as if nothing

happened.

The above means that one should not use MySQL to check fields content,

but one should do this in the application.

@node Portability, Internal use, Design Limitations, Optimize Overview

@subsection Portability

For example, (run on the same NT 4.0 machine):

@multitable @columnfractions .6 .2 .2

@strong{Reading 2000000 rows by index} @tab @strong{Seconds} @tab @strong{Seconds}

@item @strong{Reading 2000000 rows by index} @tab @strong{Seconds} @tab @strong{Seconds}

@item mysql             @tab 367 @tab 249

@item mysql_odbc	@tab 464

@item db2_odbc		@tab 1206

@end multitable

@multitable @columnfractions .6 .2 .2

@strong{Inserting (350768) rows} @tab @strong{Seconds} @tab @strong{Seconds}

@item @strong{Inserting (350768) rows} @tab @strong{Seconds} @tab @strong{Seconds}

@item mysql		@tab 381 @tab 206

@item mysql_odbc	@tab 619

@item db2_odbc		@tab 3460

the columns in the table, use @code{DESCRIBE tbl_name} to find out.

@item

@cindex default values

Any column not explicitly given a value is set to its default value.  For

example, if you specify a column list that doesn't name all the columns in

the table, unnamed columns are set to their default values.  Default value

assignment is described in @ref{CREATE TABLE, , @code{CREATE TABLE}}.

MySQL always has a default value for all fields. This is something

that is imposed on MySQL to be able to work with both transactional

and not transactional tables.

Our view is that checking of fields content should be done in the

application and not in the database server.

@item

An @code{expression} may refer to any column that was set earlier in a value

list.  For example, you can say this:

value.

@item

@cindex default values

If no @code{DEFAULT} value is specified for a column, MySQL

automatically assigns one.

threaded client. @xref{Threaded clients}.

@menu

* my_init()::                   @code{my_init()}

* mysql_thread_init()::         @code{mysql_thread_init()}

* mysql_thread_end()::          @code{mysql_thread_end()}

* my_init::                       @code{my_init()}

* mysql_thread_init::             @code{mysql_thread_init()}

* mysql_thread_end::              @code{mysql_thread_end()}

@end menu

@node my_init(), mysql_thread_init(), C Thread functions, C Thread functions

@node my_init, mysql_thread_init, C Thread functions, C Thread functions

@subsubsection @code{my_init()}

@findex @code{my_init()}

none.

@node mysql_thread_init(), mysql_thread_end(), my_init(), C Thread functions

@node mysql_thread_init, mysql_thread_end, my_init, C Thread functions

@subsubsection @code{mysql_thread_init()}

@findex @code{mysql_thread_init()}

none.

@node mysql_thread_end(),  , mysql_thread_init(), C Thread functions

@node mysql_thread_end,  , mysql_thread_init, C Thread functions

@subsubsection @code{mysql_thread_end()}

@findex @code{mysql_thread_end()}

a stand-alone server without modifying any code.

@menu

* mysql_server_init()::         

* mysql_server_end()::          

* mysql_server_init::           @code{mysql_server_init()}

* mysql_server_end::            @code{mysql_server_end()}

@end menu

@node mysql_server_init(), mysql_server_end(), C Embedded Server func, C Embedded Server func

@node mysql_server_init, mysql_server_end, C Embedded Server func, C Embedded Server func

@subsubsection @code{mysql_server_init()}

@findex @code{mysql_server_init()}

0 if ok, 1 if an error occurred.

@node mysql_server_end(),  , mysql_server_init(), C Embedded Server func

@node mysql_server_end,  , mysql_server_init, C Embedded Server func

@subsubsection @code{mysql_server_end()}

@findex @code{mysql_server_end()}

A library to use MySQL with Delphi}.

@item @uref{http://www.geocities.com/CapeCanaveral/2064/mysql.html, Delphi TDataset-component}.

@item

@item @uref{http://www.mysql.com/Downloads/Contrib/Win32/SBMySQL50Share.exe, Delphi 5 Shareware MySQL Dataset Components}

@end itemize

Fixed a bug in @code{INSERT DELAYED} and @code{FLUSH TABLES} introduced

in 3.23.42.

@item

Fixed unlikely bug, which returned not matching rows, in SELECT with

Fixed unlikely bug, which returned non-matching rows, in @code{SELECT} with

many tables and multi-column indexes and 'range' type.

@item

Fixed a unlikely core-dump bug when doing @code{EXPLAIN SELECT} when using

Fixed an unlikely core-dump bug when doing @code{EXPLAIN SELECT} when using

many tables and @code{ORDER BY}.

@item

Fixed bug in @code{LOAD DATA FROM MASTER} when using table with

@code{CHECKSUM=1}.

@item

Added unique error message when one gets a DEADLOCK during a transaction with

BDB tables.

@code{BDB} tables.

@item

Fixed problem with @code{BDB} tables and @code{UNIQUE} columns defined

as @code{NULL}.

@item

Fixed problem with @code{myisampack} when using pre-space filled CHAR columns.

Fixed problem with @code{myisampack} when using pre-space filled @code{CHAR}

columns.

@item

Applied patch from Yuri Dario for OS2.

@item

Fixed bug in @code{--safe-user-create}

Fixed bug in @code{--safe-user-create}.

@end itemize

@node News-3.23.42, News-3.23.41, News-3.23.43, News-3.23.x

Changed parsing of @code{TIME} strings to be more strict.  Now the

fractional second part is detected (and currently skipped). The

following formats are supported:

@table @code

@itemize

@item [[DAYS] [H]H:]MM:]SS[.fraction]

@item [[[[[H]H]H]H]MM]SS[.fraction]

@end table

@end itemize

@item

Detect (and ignore) second fraction part from @code{DATETIME}.

@item

online at the @uref{http://www.mysql.com/documentation/, MySQL

documentation page}.

If you have started @code{mysqld} with @code{--with-myisam-recover},

If you have started @code{mysqld} with @code{myisam-recover},

MySQL will automatically check and try to repair @code{MyISAM}

tables if they are marked as 'not closed properly' or 'crashed'.  If

this happens, MySQL will write an entry in the

#define CLIENT_CAPABILITIES	(CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES)

#ifndef OS2

extern "C"

{

 int simple_command(MYSQL *mysql,enum enum_server_command command,

		    const char *arg, uint length, my_bool skipp_check);

  uint net_safe_read(MYSQL* mysql);

}

#endif

char server_version[SERVER_VERSION_LENGTH];

uint32 server_id = 0;

**

** The author's original notes follow :-

**

**		******************************************************

**		*						     *

**		* AUTHOR: Igor Romanenko (igor@frog.kiev.ua)	     *

**		* DATE:   December 3, 1994			     *

**		* WARRANTY: None, expressed, impressed, implied      *

**		*	    or other				     *

**		* STATUS: Public domain				     *

**		* Adapted and optimized for MySQL by		     *

**		* Michael Widenius, Sinisa Milivojevic, Jani Tolonen *

**		* -w --where added 9/10/98 by Jim Faucette	     *

**		* slave code by David Saez Padros <david@ols.es>     *

**		*						     *

**		******************************************************

*/

/* SSL by

** AUTHOR: Igor Romanenko (igor@frog.kiev.ua)

** DATE:   December 3, 1994

** WARRANTY: None, expressed, impressed, implied

**	    or other

** STATUS: Public domain

** Adapted and optimized for MySQL by

** Michael Widenius, Sinisa Milivojevic, Jani Tolonen

** -w --where added 9/10/98 by Jim Faucette

** slave code by David Saez Padros <david@ols.es>

** master/autocommit code by Brian Aker <brian@tangent.org>

** SSL by

** Andrei Errapart <andreie@no.spam.ee>

** Tnu Samuel  <tonu@please.do.not.remove.this.spam.ee>

**/

#define DUMP_VERSION "8.16"

#define DUMP_VERSION "8.17"

#include <my_global.h>

#include <my_sys.h>

		lock_tables=0,ignore_errors=0,flush_logs=0,replace=0,

		ignore=0,opt_drop=0,opt_keywords=0,opt_lock=0,opt_compress=0,

                opt_delayed=0,create_options=0,opt_quoted=0,opt_databases=0,

	        opt_alldbs=0,opt_create_db=0,opt_first_slave=0;

	        opt_alldbs=0,opt_create_db=0,opt_first_slave=0, opt_autocommit=0, opt_master_data;

static MYSQL  mysql_connection,*sock=0;

static char  insert_pat[12 * 1024],*opt_password=0,*current_user=0,

             *current_host=0,*path=0,*fields_terminated=0,

enum md_options {OPT_FTB=256, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC,

		 OPT_KEYWORDS, OPT_LOCKS, OPT_DROP, OPT_OPTIMIZE, OPT_DELAYED,

		 OPT_TABLES, MD_OPT_CHARSETS_DIR, MD_OPT_DEFAULT_CHARSET};

		 OPT_TABLES, MD_OPT_CHARSETS_DIR, MD_OPT_DEFAULT_CHARSET,

		 OPT_AUTOCOMMIT, OPT_MASTER_DATA};

static struct option long_options[] =

{

  {"host",    		required_argument,	0, 'h'},

  {"lines-terminated-by", required_argument,    0, (int) OPT_LTB},

  {"lock-tables",  	no_argument,    0, 	'l'},

  {"master-data",  	no_argument,    0, 	OPT_MASTER_DATA},

  {"no-autocommit",     no_argument,    0,      OPT_AUTOCOMMIT},

  {"no-create-db",      no_argument,    0,      'n'},

  {"no-create-info", 	no_argument,    0, 	't'},

  {"no-data",  		no_argument,    0, 	'd'},

  --add-locks		Add locks around insert statements.\n\

  --allow-keywords	Allow creation of column names that are keywords.\n\

  --delayed-insert      Insert rows with INSERT DELAYED.\n\

  --master-data         This will cause the master position and filename to \n\

                        be appended to your output. This will automagically \n\

                        enable --first-slave.\n\

  -F, --flush-logs	Flush logs file in server before starting dump.\n\

  -f, --force		Continue even if we get an sql-error.\n\

  -h, --host=...	Connect to host.\n");

puts("\

  -l, --lock-tables     Lock all tables for read.\n\

  --no-autocommit       Wrap tables with autocommit/commit statements.\n\

  -n, --no-create-db    'CREATE DATABASE /*!32312 IF NOT EXISTS*/ db_name;'\n\

                        will not be put in the output. The above line will\n\

                        be added otherwise, if --databases or\n\

  -v, --verbose		Print info about the various stages.\n\

  -V, --version		Output version information and exit.\n\

  -w, --where=		dump only selected records; QUOTES mandatory!\n\

  -x, --first-slave     Locks all tables across all databases.\n\

  EXAMPLES: \"--where=user=\'jimf\'\" \"-wuserid>1\" \"-wuserid<1\"\n\

  Use -T (--tab=...) with --fields-...\n\

  --fields-terminated-by=...\n\

static void write_heder(FILE *sql_file, char *db_name)

{

  fprintf(sql_file, "-- MySQL dump %s\n#\n", DUMP_VERSION);

  fprintf(sql_file, "-- MySQL dump %s\n--\n", DUMP_VERSION);

  fprintf(sql_file, "-- Host: %s    Database: %s\n",

	  current_host ? current_host : "localhost", db_name ? db_name : "");

  fputs("---------------------------------------------------------\n",

			long_options, &option_index)) != EOF)

  {

    switch(c) {

    case OPT_MASTER_DATA:

      opt_master_data=1;

      opt_first_slave=1;

      break;

    case OPT_AUTOCOMMIT:

      opt_autocommit=1;

      break;

    case 'a':

      create_options=1;

      break;

        }

        write_heder(sql_file, db);

      }

      fprintf(sql_file, "\n#\n# Table structure for table '%s'\n#\n\n", table);

      fprintf(sql_file, "\n--\n-- Table structure for table '%s'\n--\n\n",table);

      if (opt_drop)

        fprintf(sql_file, "DROP TABLE IF EXISTS %s;\n",table_name);

        }

        write_heder(sql_file, db);

      }

      fprintf(sql_file, "\n#\n# Table structure for table '%s'\n#\n\n", table);

      fprintf(sql_file, "\n--\n-- Table structure for table '%s'\n--\n\n",table);

      if (opt_drop)

        fprintf(sql_file, "DROP TABLE IF EXISTS %s;\n",table_name);

      fprintf(sql_file, "CREATE TABLE %s (\n", table_name);

  }

  else

  {

    fprintf(md_result_file,"\n#\n# Dumping data for table '%s'\n", table);

    fprintf(md_result_file,"\n--\n-- Dumping data for table '%s'\n--\n", table);

    sprintf(query, "SELECT * FROM %s", quote_name(table,table_buff));

    if (where)

    {

    rownr=0;

    init_length=(uint) strlen(insert_pat)+4;

    if (opt_autocommit)

      fprintf(md_result_file, "set autocommit=0;\n");

    while ((row=mysql_fetch_row(res)))

    {

      uint i;

    if (opt_lock)

      fputs("UNLOCK TABLES;\n", md_result_file);

    mysql_free_result(res);

    if (opt_autocommit)

      fprintf(md_result_file, "commit;\n");

  }

} /* dumpTable */

  {

    if (opt_databases || opt_alldbs)

    {

      fprintf(md_result_file,"\n#\n# Current Database: %s\n#\n", database);

      fprintf(md_result_file,"\n--\n-- Current Database: %s\n--\n", database);

      if (!opt_create_db)

	fprintf(md_result_file,"\nCREATE DATABASE /*!32312 IF NOT EXISTS*/ %s;\n",

		database);

int main(int argc, char **argv)

{

  MYSQL_ROW row;

  MYSQL_RES *master;

  MY_INIT(argv[0]);

  /*

  ** Check out the args

  if (opt_first_slave)

  {

    if (opt_master_data)

    {

      if (mysql_query(sock, "SHOW MASTER STATUS") ||

	  !(master = mysql_store_result(sock)))

      {

	my_printf_error(0, "Error: Couldn't execute 'SHOW MASTER STATUS': %s",

			MYF(0), mysql_error(sock));

      } 

      else 

      {

	row = mysql_fetch_row(master);

	if(row[0] && row[1]) {

	  fprintf(md_result_file,

		  "\n--\n-- Position to start replication from\n--\n\n");

	  fprintf(md_result_file,

		  "CHANGE MASTER TO MASTER_LOG_FILE='%s' ;\n", row[0]);

	  fprintf(md_result_file, "CHANGE MASTER TO MASTER_LOG_POS=%s ;\n",

		  row[1]);

	}

	mysql_free_result(master);

      }

    }

    if (mysql_query(sock, "FLUSH MASTER"))

    {

      my_printf_error(0, "Error: Couldn't execute 'FLUSH MASTER': %s",