Merge mysql.com:/my/mysql-4.0

zgreant@mysql.com

tfr@beta.frontier86.ee

Administrador@light.

mwagner@work.mysql.com

Mail by sasha, should be rewritten as a HOWTO sometimes

vva added point C) for Windows-project

-----------

I have set up a repository with BitKeeper on work. There are still some things

 BUILD/compile-pentium-debug

C) Windows project. 

   - Compile Linux-project (see points above)

   - run VC++Files/prepare

   - make repository accessible for Windows (using samba)

   - open VC++Files/mysql.dsw in Microsoft Visual Stidio (5.0 or above)

After you edit a file, you need to check it in using bk citool or bk ci

filename. Note that ci is different than commit - you ci a file, but you commit

a change set. This is a very nice concept - instead of thinking of each

@item

After @code{BitKeeper} is installed, first go to the directory you

want to work from, and then use this command if you want to clone

the MySQL 3.23 branch:

want to work from, and then use one of the following commands to clone

the MySQL version branch of your choice:

To clone the 3.23 branch, use this command:

@example

shell> bk clone bk://work.mysql.com:7000 mysql

shell> bk clone bk://work.mysql.com:7000 mysql-3.23

@end example

To clone the 4.0 branch, use this command instead:

To clone the 4.0 branch, use this command:

@example

shell> bk clone bk://work.mysql.com:7001 mysql-4.0

@end example

In the preceding examples the source tree will be set up in the @file{mysql/}

or @file{mysql-4.0/} subdirectory of your current directory.

To clone the 4.1 branch, use this command:

@example

shell> bk clone bk://work.mysql.com:7004 mysql-4.1

@end example

In the preceding examples the source tree will be set up in the

@file{mysql-3.23/}, @file{mysql-4.0/}, or @file{mysql-4.1/}

subdirectory of your current directory.

The initial download of the source tree may take a while, depending on the

speed of your connection; be patient.

@item

If you want your @code{mysqldump} files to be compatible between

MySQL Version 3.22 and Version 3.23, you should not use the

@code{--opt} or @code{--full} option to @code{mysqldump}.

@code{--opt} or @code{--all} option to @code{mysqldump}.

@item

Check all your calls to @code{DATE_FORMAT()} to make sure there is a

Do a full backup of your databases:

@example

shell> mysqldump --tab=/path/to/some/dir --opt --full

shell> mysqldump --tab=/path/to/some/dir --opt --all

or

@cindex maintaining, log files

@cindex log files, maintaining

MySQL has a lot of log files which make it easy to see what is

going. @xref{Log Files}. One must however from time to time clean up

after @code{MysQL} to ensure that the logs don't take up too much disk

space.

The MySQL Server can create a number of different log files, which make

it easy to see what is going on. @xref{Log Files}. One must however

regularly clean up these files, to ensure that the logs don't take up

too much disk space.

When using MySQL with log files, you will, from time to time,

want to remove/backup old log files and tell MySQL to start

@item @strong{Command} @tab @strong{Description}

@item @code{SLAVE START}

 @tab Starts the slave thread. (Slave)

 @tab Starts the slave thread.

As of MySQL 4.0.2, you can add @code{IO_THREAD} or @code{SQL_THREAD}

options to the statement to start the I/O thread or the SQL thread.

The I/O thread reads queries from the master server and stores them in the

relay log.  The SQL thread reads the relay log and executes the queries.

(Slave)

@item @code{SLAVE STOP}

 @tab Stops the slave thread. (Slave)

 @tab Stops the slave thread. Like @code{SLAVE START}, this statement

may be used with @code{IO_THREAD} and @code{SQL_THREAD} options. (Slave)

@item @code{SET SQL_LOG_BIN=0}

@tab Disables update logging if the user has the @code{SUPER} privilege.

@item delayed_insert_limit @tab num @tab GLOBAL

@item delayed_insert_timeout @tab num @tab GLOBAL

@item delayed_queue_size @tab num @tab GLOBAL

@item error_count @tab num @tab LOCAL

@item flush @tab bool @tab GLOBAL

@item flush_time @tab num @tab GLOBAL

@item foreign_key_checks @tab bool @tab SESSION

@item max_binlog_size @tab num @tab GLOBAL

@item max_connect_errors @tab num @tab GLOBAL

@item max_connections @tab num @tab GLOBAL

@item max_error_count @tab num @tab GLOBAL | SESSION

@item max_delayed_threads @tab num @tab GLOBAL

@item max_heap_table_size @tab num @tab GLOBAL | SESSION

@item max_join_size @tab num @tab GLOBAL | SESSION

@item tx_isolation @tab enum @tab GLOBAL | SESSION

@item version @tab string @tab GLOBAL

@item wait_timeout @tab num @tab GLOBAL | SESSION

@item warning_count @tab num @tab LOCAL

@item unique_checks @tab bool @tab SESSION

@end multitable

@c START_OF_RESERVED_WORDS

@c Reserved word list updated Tue Jul 23 20:41:20 2002 by monty.

@c Reserved word list updated Tue Oct  8 13:03:34 2002 by arjen.

@c To regenerate, use Support/update-reserved-words.pl.

@multitable @columnfractions .33 .33 .34

@item @code{BINARY}

 @tab @code{BLOB}

 @tab @code{BOTH}

@item @code{BY}

@item @code{BTREE}

 @tab @code{BY}

 @tab @code{CASCADE}

 @tab @code{CASE}

@item @code{CHANGE}

@item @code{CASE}

 @tab @code{CHANGE}

 @tab @code{CHAR}

 @tab @code{CHARACTER}

@item @code{COLUMN}

 @tab @code{COLUMNS}

@item @code{CHARACTER}

 @tab @code{COLLATE}

 @tab @code{COLUMN}

@item @code{COLUMNS}

 @tab @code{CONSTRAINT}

@item @code{CREATE}

 @tab @code{CROSS}

 @tab @code{CREATE}

@item @code{CROSS}

 @tab @code{CURRENT_DATE}

@item @code{CURRENT_TIME}

 @tab @code{CURRENT_TIMESTAMP}

 @tab @code{CURRENT_TIME}

@item @code{CURRENT_TIMESTAMP}

 @tab @code{DATABASE}

@item @code{DATABASES}

 @tab @code{DAY_HOUR}

 @tab @code{DATABASES}

@item @code{DAY_HOUR}

 @tab @code{DAY_MINUTE}

@item @code{DAY_SECOND}

 @tab @code{DEC}

 @tab @code{DAY_SECOND}

@item @code{DEC}

 @tab @code{DECIMAL}

@item @code{DEFAULT}

 @tab @code{DELAYED}

 @tab @code{DEFAULT}

@item @code{DELAYED}

 @tab @code{DELETE}

@item @code{DESC}

 @tab @code{DESCRIBE}

 @tab @code{DESC}

@item @code{DESCRIBE}

 @tab @code{DISTINCT}

@item @code{DISTINCTROW}

 @tab @code{DOUBLE}

 @tab @code{DISTINCTROW}

@item @code{DOUBLE}

 @tab @code{DROP}

@item @code{ELSE}

 @tab @code{ENCLOSED}

 @tab @code{ELSE}

@item @code{ENCLOSED}

 @tab @code{ERRORS}

 @tab @code{ESCAPED}

@item @code{EXISTS}

 @tab @code{EXPLAIN}

@item @code{FROM}

 @tab @code{FULLTEXT}

 @tab @code{FUNCTION}

@item @code{GRANT}

@item @code{GEOMETRY}

 @tab @code{GRANT}

 @tab @code{GROUP}

@item @code{HASH}

 @tab @code{HAVING}

@item @code{HIGH_PRIORITY}

 @tab @code{HOUR_MINUTE}

 @tab @code{HIGH_PRIORITY}

@item @code{HOUR_MINUTE}

 @tab @code{HOUR_SECOND}

@item @code{IF}

 @tab @code{IGNORE}

 @tab @code{IF}

@item @code{IGNORE}

 @tab @code{IN}

@item @code{INDEX}

 @tab @code{INFILE}

 @tab @code{INDEX}

@item @code{INFILE}

 @tab @code{INNER}

@item @code{INNODB}

 @tab @code{INSERT}

 @tab @code{INNODB}

@item @code{INSERT}

 @tab @code{INT}

@item @code{INTEGER}

 @tab @code{INTERVAL}

 @tab @code{INTEGER}

@item @code{INTERVAL}

 @tab @code{INTO}

@item @code{IS}

 @tab @code{JOIN}

 @tab @code{IS}

@item @code{JOIN}

 @tab @code{KEY}

@item @code{KEYS}

 @tab @code{KILL}

 @tab @code{KEYS}

@item @code{KILL}

 @tab @code{LEADING}

@item @code{LEFT}

 @tab @code{LIKE}

 @tab @code{LEFT}

@item @code{LIKE}

 @tab @code{LIMIT}

@item @code{LINES}

 @tab @code{LOAD}

 @tab @code{LINES}

@item @code{LOAD}

 @tab @code{LOCK}

@item @code{LONG}

 @tab @code{LONGBLOB}

 @tab @code{LONG}

@item @code{LONGBLOB}

 @tab @code{LONGTEXT}

@item @code{LOW_PRIORITY}

 @tab @code{MASTER_SERVER_ID}

 @tab @code{LOW_PRIORITY}

@item @code{MASTER_SERVER_ID}

 @tab @code{MATCH}

@item @code{MEDIUMBLOB}

 @tab @code{MEDIUMINT}

 @tab @code{MEDIUMBLOB}

@item @code{MEDIUMINT}

 @tab @code{MEDIUMTEXT}

@item @code{MIDDLEINT}

 @tab @code{MINUTE_SECOND}

 @tab @code{MIDDLEINT}

@item @code{MINUTE_SECOND}

 @tab @code{MRG_MYISAM}

@item @code{NATURAL}

 @tab @code{NOT}

 @tab @code{NATURAL}

@item @code{NOT}

 @tab @code{NULL}

@item @code{NUMERIC}

 @tab @code{ON}

 @tab @code{NUMERIC}

@item @code{ON}

 @tab @code{OPTIMIZE}

@item @code{OPTION}

 @tab @code{OPTIONALLY}

 @tab @code{OPTION}

@item @code{OPTIONALLY}

 @tab @code{OR}

@item @code{ORDER}

 @tab @code{OUTER}

 @tab @code{ORDER}

@item @code{OUTER}

 @tab @code{OUTFILE}

@item @code{PARTIAL}

 @tab @code{PRECISION}

 @tab @code{PRIMARY}

@item @code{PRIVILEGES}

@item @code{PRIMARY}

 @tab @code{PRIVILEGES}

 @tab @code{PROCEDURE}

 @tab @code{PURGE}

@item @code{READ}

@item @code{PURGE}

 @tab @code{READ}

 @tab @code{REAL}

 @tab @code{REFERENCES}

@item @code{REGEXP}

@item @code{REFERENCES}

 @tab @code{REGEXP}

 @tab @code{RENAME}

 @tab @code{REPLACE}

@item @code{REQUIRE}

@item @code{REPLACE}

 @tab @code{REQUIRE}

 @tab @code{RESTRICT}

 @tab @code{RETURNS}

@item @code{REVOKE}

@item @code{RETURNS}

 @tab @code{REVOKE}

 @tab @code{RIGHT}

 @tab @code{RLIKE}

@item @code{SELECT}

 @tab @code{SET}

@item @code{RLIKE}

 @tab @code{RTREE}

 @tab @code{SELECT}

@item @code{SET}

 @tab @code{SHOW}

@item @code{SMALLINT}

 @tab @code{SONAME}

 @tab @code{SMALLINT}

@item @code{SONAME}

 @tab @code{SPATIAL}

 @tab @code{SQL_BIG_RESULT}

@item @code{SQL_CALC_FOUND_ROWS}

 @tab @code{SQL_SMALL_RESULT}

@item @code{TINYTEXT}

 @tab @code{TO}

 @tab @code{TRAILING}

@item @code{UNION}

@item @code{TYPES}

 @tab @code{UNION}

 @tab @code{UNIQUE}

 @tab @code{UNLOCK}

@item @code{UNSIGNED}

@item @code{UNLOCK}

 @tab @code{UNSIGNED}

 @tab @code{UPDATE}

 @tab @code{USAGE}

@item @code{USE}

@item @code{USAGE}

 @tab @code{USE}

 @tab @code{USER_RESOURCES}

 @tab @code{USING}

@item @code{VALUES}

@item @code{USING}

 @tab @code{VALUES}

 @tab @code{VARBINARY}

 @tab @code{VARCHAR}

@item @code{VARYING}

 @tab @code{WHEN}

@item @code{VARCHAR}

 @tab @code{VARYING}

 @tab @code{WARNINGS}

@item @code{WHEN}

 @tab @code{WHERE}

@item @code{WITH}

 @tab @code{WRITE}

 @tab @code{WITH}

@item @code{WRITE}

 @tab @code{XOR}

@item @code{YEAR_MONTH}

 @tab @code{ZEROFILL}

 @tab @code{YEAR_MONTH}

@item @code{ZEROFILL}

 @tab

 @tab

@end multitable

UPDATE [LOW_PRIORITY] [IGNORE] tbl_name

    SET col_name1=expr1 [, col_name2=expr2, ...]

    [WHERE where_definition]

    [ORDER BY ...]

    [LIMIT #]

@end example

@appendixsubsec Changes in release 4.0.5

@itemize

@item

Give error if one has more than 2 ^ 32 rows in a MyISAM MERGE file and one

has not compiled MySQL with @code{-DBIG_TABLES}.

Fixed bug with caching system database ('mysql'). Now query to system 

database is not cached by query cache.

@item

Small fix in @code{mysqld_safe} for some shells.

@item

Give error if a @code{MyISAM} @code{MERGE} table has more than 2 ^ 32 rows and

MySQL was not compiled with with @code{-DBIG_TABLES}.

@item

Fixed some @code{ORDER BY ... DESC} problems with InnoDB.

@item

not matching case.

@item

Don't give warning in @code{LOAD DATA INFILE} when setting a

@code{timestamp} to a string of '0'.

@code{timestamp} to a string value of @code{'0'}.

@item

Fixed bug in @code{myisamchk -R} mode.

@item

Fixed that @code{mysqld --help} reports correct values for @code{--datadir}

and @code{--bind-address}.

@item

Fixed that one can drop UDFs that didn't exist when mysqld was started.

Fixed that one can drop UDFs that didn't exist when @code{mysqld} was started.

@item

Fixed core dump problem with @code{SHOW VARIABLES} on some 64 bit systems

(like Solaris sparc).

@appendixsubsec Changes in release 3.23.53

@itemize @bullet

@item

Small fix in @code{safe_mysqld} for some shells.

@item

Fixed that @code{SHOW STATUS} doesn't reset @code{Delayed_insert_threads}.

@item

Fixed core dump bug when using the @code{BINARY} cast on a @code{NULL} value.

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../sql" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../client" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /I "../sql" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /I "../client" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"

BSC32=bscmake.exe

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

# Begin Source File

SOURCE=..\client\mysqlbinlog.cpp

SOURCE=.\mysqlbinlog.cpp

# End Source File

# End Group

# Begin Group "Header Files"

// ChildFrm.cpp : implementation of the CChildFrame class

//

#include "stdafx.h"

#include "MySqlManager.h"

#include "ChildFrm.h"

#ifdef _DEBUG

   #define new DEBUG_NEW

   #undef THIS_FILE

static char THIS_FILE[] = __FILE__;

#endif

/////////////////////////////////////////////////////////////////////////////

// CChildFrame

IMPLEMENT_DYNCREATE(CChildFrame, CMDIChildWnd)

BEGIN_MESSAGE_MAP(CChildFrame, CMDIChildWnd)

//{{AFX_MSG_MAP(CChildFrame)

// NOTE - the ClassWizard will add and remove mapping macros here.

//    DO NOT EDIT what you see in these blocks of generated code !

//}}AFX_MSG_MAP

END_MESSAGE_MAP()

/////////////////////////////////////////////////////////////////////////////

// CChildFrame construction/destruction

CChildFrame::CChildFrame()

{

   // TODO: add member initialization code here

}

CChildFrame::~CChildFrame()

{

}

BOOL CChildFrame::PreCreateWindow(CREATESTRUCT& cs)

{

   // TODO: Modify the Window class or styles here by modifying

   //  the CREATESTRUCT cs

   return CMDIChildWnd::PreCreateWindow(cs);

}

/////////////////////////////////////////////////////////////////////////////

// CChildFrame diagnostics

#ifdef _DEBUG

void CChildFrame::AssertValid() const

{

   CMDIChildWnd::AssertValid();

}

void CChildFrame::Dump(CDumpContext& dc) const

{

   CMDIChildWnd::Dump(dc);

}

#endif //_DEBUG

/////////////////////////////////////////////////////////////////////////////

// CChildFrame message handlers