Skip to content

M
MariaDB
Commit 54e36baf authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files
Options

Merge work.mysql.com:/home/bk/mysql 

into threads.polyesthetic.msg:/usr/local/src/my/3
parents a37b9715 2f990484
Hide whitespace changes
Inline Side-by-side
Showing with 653 additions and 364 deletions
BitKeeper/etc/logging_ok
View file @ 54e36baf
mwagner@evoq.mwagner.org mwagner@evoq.mwagner.org
tim@threads.polyesthetic.msg tim@threads.polyesthetic.msg
tim@work.mysql.com tim@work.mysql.com
heikki@donna.mysql.fi
paul@central.snake.net
monty@donna.mysql.fi
Docs/manual.texi
View file @ 54e36baf
...@@ -538,7 +538,7 @@ InnoDB Tables ...@@ -538,7 +538,7 @@ InnoDB Tables
* InnoDB overview:: InnoDB tables overview * InnoDB overview:: InnoDB tables overview
* InnoDB start:: InnoDB startup options * InnoDB start:: InnoDB startup options
* Creating an InnoDB database:: Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. * Creating an InnoDB database:: Creating an InnoDB database.
* Using InnoDB tables:: Creating InnoDB tables * Using InnoDB tables:: Creating InnoDB tables
* Adding and removing:: Adding and removing InnoDB data and log files * Adding and removing:: Adding and removing InnoDB data and log files
* Backing up:: Backing up and recovering an InnoDB database * Backing up:: Backing up and recovering an InnoDB database
...@@ -553,7 +553,7 @@ InnoDB Tables ...@@ -553,7 +553,7 @@ InnoDB Tables
Creating an InnoDB database Creating an InnoDB database
* Error createing InnoDB:: * Error creating InnoDB::
Backing up and recovering an InnoDB database Backing up and recovering an InnoDB database
...@@ -561,7 +561,7 @@ Backing up and recovering an InnoDB database ...@@ -561,7 +561,7 @@ Backing up and recovering an InnoDB database
InnoDB transaction model InnoDB transaction model
* InnoDB consinsten read:: * InnoDB consistent read::
* InnoDB locking reads:: * InnoDB locking reads::
* InnoDB Next-key locking:: * InnoDB Next-key locking::
* InnoDB Locks set:: * InnoDB Locks set::
...@@ -1384,7 +1384,7 @@ in this email @email{advertising@@mysql.com}. ...@@ -1384,7 +1384,7 @@ in this email @email{advertising@@mysql.com}.
@item @item
We are building a partner program to be able to provide @strong{MySQL} We are building a partner program to be able to provide @strong{MySQL}
services in every country. If you are interested in becomming a partner services in every country. If you are interested in becoming a partner
of @strong{MySQL AB} please visit of @strong{MySQL AB} please visit
@uref{http://www.mysql.com/information/partners.html} or email @uref{http://www.mysql.com/information/partners.html} or email
@email{partner@@mysql.com}. @email{partner@@mysql.com}.
...@@ -2544,7 +2544,7 @@ which services were discovered on which dial-up numbers in your organization. ...@@ -2544,7 +2544,7 @@ which services were discovered on which dial-up numbers in your organization.
@item @uref{http://www.urbanresearch.com/software/utils/urbsql/index.html, urSQL} @item @uref{http://www.urbanresearch.com/software/utils/urbsql/index.html, urSQL}
SQL Editor and Query Utility. Custom syntax highlighting, editable SQL Editor and Query Utility. Custom syntax highlighting, editable
results grid, exportable result-sets, basic @strong{MySQL} admin functions, results grid, exportable result-sets, basic @strong{MySQL} admin functions,
Etc.. For windows. Etc.. For Windows.
@item @uref{http://www.edatanew.com/, MySQL Data Manager} @item @uref{http://www.edatanew.com/, MySQL Data Manager}
@strong{MySQL} Data Manager * is platform independent web client @strong{MySQL} Data Manager * is platform independent web client
...@@ -2575,7 +2575,7 @@ different formats (SQL, HTML, CVS, text, ZIP, GZIP...) ...@@ -2575,7 +2575,7 @@ different formats (SQL, HTML, CVS, text, ZIP, GZIP...)
@item @uref{http://dlabs.4t2.com} @item @uref{http://dlabs.4t2.com}
M2D, a @strong{MySQL} Administration client for Windows. M2D supports M2D, a @strong{MySQL} Administration client for Windows. M2D supports
administration of @strong{MySQL} databases, creation of new databasess and administration of @strong{MySQL} databases, creation of new databases and
tables, editing, and more. tables, editing, and more.
@item @uref{http://www.scibit.com/Products/Software/Utils/Mascon.asp} @item @uref{http://www.scibit.com/Products/Software/Utils/Mascon.asp}
...@@ -2795,9 +2795,9 @@ don't know of anyone that has tried that. ...@@ -2795,9 +2795,9 @@ don't know of anyone that has tried that.
@cindex SCMDB @cindex SCMDB
@item @uref{http://www.dedecker.net/jessie/scmdb/} @item @uref{http://www.dedecker.net/jessie/scmdb/}
SCMDB - an add-on for SCM that ports the mysql C library to scheme (SCM). SCMDB - an add-on for SCM that ports the @strong{MySQL} C library to scheme
With this library scheme developers can make connections to a mySQL (SCM). With this library scheme developers can make connections to a
database and use embedded SQL in their programs. @strong{MySQL} database and use embedded SQL in their programs.
@end table @end table
@subheading Other @strong{MySQL}-related Links @subheading Other @strong{MySQL}-related Links
...@@ -3276,7 +3276,7 @@ the one that the program produces. (Even the case should be observed!) ...@@ -3276,7 +3276,7 @@ the one that the program produces. (Even the case should be observed!)
You should never try to remember what the error message was; instead, copy You should never try to remember what the error message was; instead, copy
and paste the entire message into your report! and paste the entire message into your report!
If you have a problem with MyODBC, you should try to genereate a MyODBC If you have a problem with MyODBC, you should try to generate a MyODBC
trace file. @xref{MyODBC bug report}. trace file. @xref{MyODBC bug report}.
Please remember that many of the people who will read your report will Please remember that many of the people who will read your report will
...@@ -4596,7 +4596,7 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. ...@@ -4596,7 +4596,7 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
@c @uref{ftp://ftp.dnttm.ro/pub/mysql, FTP} @c @uref{ftp://ftp.dnttm.ro/pub/mysql, FTP}
@c @item @c @item
@c Not ok 20001123; Non-existant (Matt) @c Not ok 20001123; Non-existent (Matt)
@c EMAIL: tim@lbi.ro (Bogdan Surdu) @c EMAIL: tim@lbi.ro (Bogdan Surdu)
@c @image{Flags/romania} @c @image{Flags/romania}
@c Romania [Bucharest] @ @c Romania [Bucharest] @
...@@ -4971,7 +4971,7 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. ...@@ -4971,7 +4971,7 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
@c @uref{ftp://ftp.wownet.net/mysql/, FTP} @c @uref{ftp://ftp.wownet.net/mysql/, FTP}
@c @item @c ********************************** @c @item @c **********************************
@c No conntact 980106 @c No contact 980106
@c EX: serge@oneway.net @c EX: serge@oneway.net
@c @image{Flags/taiwan} Taiwan [Oneway] @ @c @image{Flags/taiwan} Taiwan [Oneway] @
@c @uref{ftp://ftp.oneway.com.tw/pub/mysql/, FTP} @c @uref{ftp://ftp.oneway.com.tw/pub/mysql/, FTP}
...@@ -5059,7 +5059,7 @@ SuSE Linux Version 7.x. ...@@ -5059,7 +5059,7 @@ SuSE Linux Version 7.x.
Note that for many operating systems, the native thread support works only Note that for many operating systems, the native thread support works only
in the latest versions. @strong{MySQL} has been reported to compile in the latest versions. @strong{MySQL} has been reported to compile
sucessfully on the following operating system/thread package combinations: successfully on the following operating system/thread package combinations:
@itemize @bullet @itemize @bullet
@item @item
...@@ -5151,7 +5151,7 @@ platform in similar configurations. If this number is high, the chances of ...@@ -5151,7 +5151,7 @@ platform in similar configurations. If this number is high, the chances of
hitting some platform-specific surprise are much smaller. hitting some platform-specific surprise are much smaller.
@end itemize @end itemize
Based on the above criterea, the best platforms for running Based on the above criteria, the best platforms for running
@strong{MySQL} at this point are x86 with SuSE Linux 7.1, 2.4 kernel and @strong{MySQL} at this point are x86 with SuSE Linux 7.1, 2.4 kernel and
ReiserFS (or any similar Linux distribution) and Sparc with Solaris 2.7 ReiserFS (or any similar Linux distribution) and Sparc with Solaris 2.7
or 2.8. FreeBSD comes third, but we really hope it will join the top or 2.8. FreeBSD comes third, but we really hope it will join the top
...@@ -5206,23 +5206,23 @@ fatal bugs and make small, relatively safe changes to that version. ...@@ -5206,23 +5206,23 @@ fatal bugs and make small, relatively safe changes to that version.
The second decision to make is whether you want to use a source The second decision to make is whether you want to use a source
distribution or a binary distribution. In most cases you should probably distribution or a binary distribution. In most cases you should probably
use a binary distribution, if there exist one for your platform, as this use a binary distribution, if one exists for your platform, as this
is generally, it will be easier to install than a source distribution. generally will be easier to install than a source distribution.
In the following cases you will probably be better off with a source In the following cases you probably will be better off with a source
installation: installation:
@itemize @bullet @itemize @bullet
@item @item
If you want to install @strong{MySQL} at some explicit location. (The standard If you want to install @strong{MySQL} at some explicit location. (The standard
binary distributions are 'ready to run' at any place, but you may want binary distributions are ``ready to run'' at any place, but you may want
to get even more flexibility). to get even more flexibility).
@item @item
To be able to satisfy different user requirements, we are providing two To be able to satisfy different user requirements, we are providing two
different binary versions; One compiled with the non-transactional table different binary versions; One compiled with the non-transactional table
handlers, (a small, fast binary), and one configurated with the most handlers, (a small, fast binary), and one configured with the most
important extended options like transaction safe tables. Both versions important extended options like transaction-safe tables. Both versions
are compiled from the same source distribution. All native @code{MySQL} are compiled from the same source distribution. All native @code{MySQL}
clients can connect to both @strong{MySQL} versions. clients can connect to both @strong{MySQL} versions.
...@@ -5230,11 +5230,11 @@ The extended @strong{MySQL} binary distribution is marked with the ...@@ -5230,11 +5230,11 @@ The extended @strong{MySQL} binary distribution is marked with the
@code{-max} suffix and is configured with the same options as @code{-max} suffix and is configured with the same options as
@code{mysqld-max}. @xref{mysqld-max}. @code{mysqld-max}. @xref{mysqld-max}.
If you are want to use the @code{MySQL-Max} RPM, you must first If you want to use the @code{MySQL-Max} RPM, you must first
install the standard @code{MySQL} RPM. install the standard @code{MySQL} RPM.
@item @item
If you want to configure @code{mysqld} with some extra feature that is NOT in If you want to configure @code{mysqld} with some extra feature that are NOT in
the standard binary distributions. Here is a list of the most common the standard binary distributions. Here is a list of the most common
extra options that you may want to use: extra options that you may want to use:
...@@ -5254,7 +5254,7 @@ the same processor family. ...@@ -5254,7 +5254,7 @@ the same processor family.
If you want a faster @strong{MySQL} server you may want to recompile it If you want a faster @strong{MySQL} server you may want to recompile it
with support for only the character sets you need, use a better compiler with support for only the character sets you need, use a better compiler
(like pgcc) or use compiler options that are better optimized for your (like @code{pgcc}) or use compiler options that are better optimized for your
processor. processor.
@item @item
...@@ -5291,7 +5291,7 @@ new features, or may fail to compile on some systems. ...@@ -5291,7 +5291,7 @@ new features, or may fail to compile on some systems.
@item @item
The third number (@code{17}) is the version number within the The third number (@code{17}) is the version number within the
release level. This is incremented for each new distribution. Usually you release level. This is incremented for each new distribution. Usually you
want the latest version for the release level you have choosen. want the latest version for the release level you have chosen.
@item @item
The suffix (@code{beta}) indicates the stability level of the release. The suffix (@code{beta}) indicates the stability level of the release.
...@@ -5568,7 +5568,7 @@ indicates the type of operating system for which the distribution is intended ...@@ -5568,7 +5568,7 @@ indicates the type of operating system for which the distribution is intended
@item @item
If you see a binary distribution marked with the @code{-max} prefix, this If you see a binary distribution marked with the @code{-max} prefix, this
means that the binary has support for transaction safe tables and other means that the binary has support for transaction-safe tables and other
features. @xref{mysqld-max}. Note that all binaries are built from features. @xref{mysqld-max}. Note that all binaries are built from
the same @strong{MySQL} source distribution. the same @strong{MySQL} source distribution.
...@@ -5831,7 +5831,7 @@ case you probably get the following error message when you run ...@@ -5831,7 +5831,7 @@ case you probably get the following error message when you run
Sorry, the host 'xxxx' could not be looked up Sorry, the host 'xxxx' could not be looked up
@end example @end example
or the following error when you try to run mysqld with the @code{--user} or the following error when you try to run @code{mysqld} with the @code{--user}
option: option:
@example @example
...@@ -5852,7 +5852,7 @@ instead (except for @code{localhost}). If you are using an old @strong{MySQL} ...@@ -5852,7 +5852,7 @@ instead (except for @code{localhost}). If you are using an old @strong{MySQL}
release that doesn't support @code{--force}, you have to remove the release that doesn't support @code{--force}, you have to remove the
@code{resolveip} test in @code{mysql_install} with an editor. @code{resolveip} test in @code{mysql_install} with an editor.
@item @item
Start mysqld with @code{su} instead of using @code{--user}. Start @code{mysqld} with @code{su} instead of using @code{--user}.
@end itemize @end itemize
The Linux-Intel binary and RPM releases of @strong{MySQL} are configured The Linux-Intel binary and RPM releases of @strong{MySQL} are configured
...@@ -6457,19 +6457,18 @@ system-specific sections later in this chapter. ...@@ -6457,19 +6457,18 @@ system-specific sections later in this chapter.
@end itemize @end itemize
@node Installing source tree, Compilation problems, Installing source, Installing @node Installing source tree, Compilation problems, Installing source, Installing
@section Installing from development source tree @section Installing from the Development Source Tree
@cindex development source tree @cindex development source tree
@cindex BitKeeper tree @cindex BitKeeper tree
@cindex cvs tree @cindex cvs tree
@strong{CAUTION:} You should only read this section if you are @strong{CAUTION:} You should read this section only if you are interested
interested in helping us test our new code. If you just want to get in helping us test our new code. If you just want to get @strong{MySQL} up
@strong{MySQL} up and running on your system, you should use either and running on your system, you should use a standard release distribution
source or binary distribution. (either a source or binary distribution will do).
Below are the instructions to obtain our most recent development To obtain our most recent development source tree, use these instructions:
source tree:
@enumerate @enumerate
@item @item
...@@ -6481,62 +6480,76 @@ Download @strong{BitKeeper} from ...@@ -6481,62 +6480,76 @@ Download @strong{BitKeeper} from
Follow the instructions to install it. Follow the instructions to install it.
@item @item
Once @strong{BitKeeper} is installed, if you want to clone 3.23 branch, After @strong{BitKeeper} is installed, use this command if you want to clone
@code{bk clone bk://work.mysql.com:7000 mysql}, and the @strong{MySQL} 3.23 branch:
@code{bk clone bk://work.mysql.com:7001 mysql-4.0} for 4.0 branch.
The initial download may take a while, depending on the speed of your @example
connection. shell> bk clone bk://work.mysql.com:7000 mysql
@end example
To clone the 4.0 branch, use this command instead:
@example
shell> bk clone bk://work.mysql.com:7001 mysql-4.0
@end example
The initial download of the source tree may take a while, depending on the
speed of your connection; be patient.
@item @item
You will need GNU autoconf, automake, libtool, and m4 to do the next stage. You will need GNU @code{autoconf}, @code{automake}, @code{libtool}, and
If you get some strange error during the first stage, check that you really @code{m4} to run the next set of commands.
have libtool installed! If you get some strange error during this stage, check that you really
have @code{libtool} installed!
@example @example
cd mysql shell> cd mysql
bk -r edit shell> bk -r edit
aclocal; autoheader; autoconf; automake; shell> aclocal; autoheader; autoconf; automake;
./configure # Add your favorite options here shell> ./configure # Add your favorite options here
make shell> make
@end example @end example
We have a collection of our standard configure scripts in the @file{BUILD/} A collection of our standard configure scripts is located in the
subdirectory. If you are lazy, you can use @file{BUILD/} subdirectory. If you are lazy, you can use
@file{BUILD/compile-pentium-debug}. It will actually work on a lot of @file{BUILD/compile-pentium-debug}. It will actually work on a lot of
non-x86 machines despite its name. non-x86 machines despite its name.
@item @item
Once the build is done, @code{make install}. Be careful with this on When the build is done, run @code{make install}. Be careful with this
a production machine - this may overwrite your live release binary. We on a production machine; the command may overwrite your live release
recommend that if you have another installation of @strong{MySQL} that installation. If you have another installation of @strong{MySQL}, we
you @code{./configure} with different values for @code{prefix}, recommand that you run @code{./configure} with different values for the
@code{tcp-port}, and @code{unix-socket-path}. @code{prefix}, @code{tcp-port}, and @code{unix-socket-path} options than
those used for your production server.
@item @item
Play hard with your new installation and try to make the new features Play hard with your new installation and try to make the new features
crash. Start by running @code{make test}. @xref{MySQL test suite}. crash. Start by running @code{make test}. @xref{MySQL test suite}.
@item @item
If you have gotten to the @code{make} stage and it does not compile, If you have gotten to the @code{make} stage and the distribution does
please report it to @email{bugs@@lists.mysql.com}. If you have not compile, please report it to @email{bugs@@lists.mysql.com}. If you
installed the latest version of the required GNU tools, and they crash have installed the latest versions of the required GNU tools, and they
trying to process our configuration files, please report it also. However, crash trying to process our configuration files, please report that also.
if you execute @code{aclocal} and get @code{command not found}, or a However, if you execute @code{aclocal} and get a @code{command not found}
similar problem, do not report it, make sure all the needed tools are error or a similar problem, do not report it. Instead, make sure all
installed and your @code{PATH} variable is set correctly. the necessary tools are installed and that your @code{PATH} variable is
set correctly so your shell can find them.
@item @item
After the initial @code{bk clone}, do @code{bk pull} to get the updates. After the initial @code{bk clone} operation to get the source tree, you
should run @code{bk pull} periodically to get the updates.
@item @item
You can examine change history of the tree with all the diffs with You can examine the change history for the tree with all the diffs by using
@code{bk sccstool}. If you see some funny diffs or code that you have a @code{bk sccstool}. If you see some funny diffs or code that you have a
question about, do not hesitate and e-mail @email{internals@@lists.mysql.com}. question about, do not hesitate to send e-mail to
Also if you think you have a better idea on how to do something, send an email @email{internals@@lists.mysql.com}. Also, if you think you have a better idea
to the same place with a patch. @code{bk diffs} will produce a patch for you on how to do something, send an email to the same address with a patch.
after you have made changes to the source. If you do not have the time to code @code{bk diffs} will produce a patch for you after you have made changes
your idea, just send a description. to the source. If you do not have the time to code your idea, just send
a description.
@item @item
@strong{BitKeeper} has a nice help utility that you can access via @strong{BitKeeper} has a nice help utility that you can access via
...@@ -7213,7 +7226,7 @@ ac_cv_sys_restartable_syscalls=$@{ac_cv_sys_restartable_syscalls='no'@} ...@@ -7213,7 +7226,7 @@ ac_cv_sys_restartable_syscalls=$@{ac_cv_sys_restartable_syscalls='no'@}
If you are using Solaris on a SPARC, the recommended compiler is If you are using Solaris on a SPARC, the recommended compiler is
@code{gcc} 2.95.2. You can find this at @uref{http://gcc.gnu.org/}. @code{gcc} 2.95.2. You can find this at @uref{http://gcc.gnu.org/}.
Note that @code{egs} 1.1.1 and @code{gcc} 2.8.1 don't work reliably on Note that @code{egcs} 1.1.1 and @code{gcc} 2.8.1 don't work reliably on
SPARC! SPARC!
The recommended @code{configure} line when using @code{gcc} 2.95.2 is: The recommended @code{configure} line when using @code{gcc} 2.95.2 is:
...@@ -7509,10 +7522,10 @@ experimentally discovered, will successfully unmap an already mapped region ...@@ -7509,10 +7522,10 @@ experimentally discovered, will successfully unmap an already mapped region
if you ask it to map out an address already in use, zeroing out the data if you ask it to map out an address already in use, zeroing out the data
on the entire page, instead of returning an error. So, the safety of on the entire page, instead of returning an error. So, the safety of
@code{mysqld} or any other threaded application depends on the "gentleman" @code{mysqld} or any other threaded application depends on the "gentleman"
behaviour of the code that creates threads. The user must take measures to behavior of the code that creates threads. The user must take measures to
make sure the number of running threads at any time is sufficiently low for make sure the number of running threads at any time is sufficiently low for
thread stacks to stay away from the global heap. With @code{mysqld}, you thread stacks to stay away from the global heap. With @code{mysqld}, you
should enforce this "gentleman" behaviour by setting a reasonable value for should enforce this "gentleman" behavior by setting a reasonable value for
the @code{max_connections} variable. the @code{max_connections} variable.
If you build @strong{MySQL} yourself and do not what to mess with patching If you build @strong{MySQL} yourself and do not what to mess with patching
...@@ -7579,7 +7592,7 @@ you link @strong{MySQL} against unmodified @strong{LinuxThreads}, ...@@ -7579,7 +7592,7 @@ you link @strong{MySQL} against unmodified @strong{LinuxThreads},
removing processors from the machine improves @strong{MySQL} performance removing processors from the machine improves @strong{MySQL} performance
in many cases. We have made a patch available for @strong{glibc 2.1.3}, in many cases. We have made a patch available for @strong{glibc 2.1.3},
@uref{http://www.mysql.com/Downloads/Linux/linuxthreads-2.1-patch,linuxthreads-2.1-patch} @uref{http://www.mysql.com/Downloads/Linux/linuxthreads-2.1-patch,linuxthreads-2.1-patch}
to correct this behaviour. to correct this behavior.
With @strong{glibc-2.2.2} With @strong{glibc-2.2.2}
@strong{MySQL} version 3.23.36 will use the adaptive mutex, which is much @strong{MySQL} version 3.23.36 will use the adaptive mutex, which is much
...@@ -7587,7 +7600,7 @@ better than even the patched one in @strong{glibc-2.1.3}. Be warned, however, ...@@ -7587,7 +7600,7 @@ better than even the patched one in @strong{glibc-2.1.3}. Be warned, however,
that under some conditions, the current mutex code in @strong{glibc-2.2.2} that under some conditions, the current mutex code in @strong{glibc-2.2.2}
overspins, which hurts @strong{MySQL} performance. The chance of this overspins, which hurts @strong{MySQL} performance. The chance of this
condition can be reduced by renicing @code{mysqld} process to the highest condition can be reduced by renicing @code{mysqld} process to the highest
priority. We have also been able to correct the overspin behaviour with priority. We have also been able to correct the overspin behavior with
a patch, available @uref{http://www.mysql.com/Downloads/Linux/linuxthreads-2.2.2.patch,here}. It combines the correction of overspin, maximum number of a patch, available @uref{http://www.mysql.com/Downloads/Linux/linuxthreads-2.2.2.patch,here}. It combines the correction of overspin, maximum number of
threads, and stack spacing all in one. You will need to apply it in the threads, and stack spacing all in one. You will need to apply it in the
@code{linuxthreads} directory with @code{linuxthreads} directory with
...@@ -7634,14 +7647,14 @@ If you see a dead @code{mysqld} daemon process with @code{ps}, this usually ...@@ -7634,14 +7647,14 @@ If you see a dead @code{mysqld} daemon process with @code{ps}, this usually
means that you have found a bug in @strong{MySQL} or you have a corrupted means that you have found a bug in @strong{MySQL} or you have a corrupted
table. @xref{Crashing}. table. @xref{Crashing}.
To get a core dump on Linux if mysqld dies with a SIGSEGV To get a core dump on Linux if @code{mysqld} dies with a SIGSEGV
signal, you can start mysqld with the @code{--core-file} option. Note signal, you can start @code{mysqld} with the @code{--core-file} option. Note
that you also probably need to raise the @code{core file size} by adding that you also probably need to raise the @code{core file size} by adding
@code{ulimit -c 1000000} to @code{safe_mysqld} or starting @code{safe_mysqld} @code{ulimit -c 1000000} to @code{safe_mysqld} or starting @code{safe_mysqld}
with @code{--core-file-sizes=1000000}. @xref{safe_mysqld}. with @code{--core-file-sizes=1000000}. @xref{safe_mysqld}.
To get a core dump on Linux if mysqld dies with a SIGSEGV signal, you can To get a core dump on Linux if @code{mysqld} dies with a SIGSEGV signal, you can
start mysqld with the @code{--core-file} option. Note that you also probably start @code{mysqld} with the @code{--core-file} option. Note that you also probably
need to raise the @code{core file size} by adding @code{ulimit -c 1000000} to need to raise the @code{core file size} by adding @code{ulimit -c 1000000} to
@code{safe_mysqld} or starting @code{safe_mysqld} with @code{safe_mysqld} or starting @code{safe_mysqld} with
@code{--core-file-sizes=1000000}. @xref{safe_mysqld}. @code{--core-file-sizes=1000000}. @xref{safe_mysqld}.
...@@ -7887,9 +7900,9 @@ Debugging threaded applications like @strong{MySQL} will not work with ...@@ -7887,9 +7900,9 @@ Debugging threaded applications like @strong{MySQL} will not work with
@code{gdb 4.18}. You should download and use gdb 5.0 instead! @code{gdb 4.18}. You should download and use gdb 5.0 instead!
@item @item
If you try linking mysqld statically when using gcc, the resulting image If you try linking @code{mysqld} statically when using @code{gcc}, the
will core dump at start. In other words, @strong{DON'T} use resulting image will core dump at start. In other words, @strong{DON'T}
@code{--with-mysqld-ldflags=-all-static} with gcc. use @code{--with-mysqld-ldflags=-all-static} with @code{gcc}.
@end itemize @end itemize
@node MKLinux, Qube2, Linux-Alpha, Linux @node MKLinux, Qube2, Linux-Alpha, Linux
...@@ -8193,16 +8206,16 @@ remove them all with pkg_delete if you no longer want @strong{MySQL} on that ...@@ -8193,16 +8206,16 @@ remove them all with pkg_delete if you no longer want @strong{MySQL} on that
machine. machine.
@end itemize @end itemize
It is reccomended you use MIT-pthreads on FreeBSD 2.x and native threads on It is recommended you use MIT-pthreads on FreeBSD 2.x and native threads on
Versions 3 and up. It is possible to run with native threads on some late Versions 3 and up. It is possible to run with native threads on some late
2.2.x versions but you may encounter problems shutting down mysqld. 2.2.x versions but you may encounter problems shutting down @code{mysqld}.
The @strong{MYSQL} Makefiles require GNU make (@code{gmake}) to work. The @strong{MYSQL} Makefiles require GNU make (@code{gmake}) to work.
If you want to compile @strong{MYSQL} you need to install GNU make If you want to compile @strong{MYSQL} you need to install GNU make
first. first.
Be sure to have your name resolver setup correct. Otherwise you may Be sure to have your name resolver setup correct. Otherwise you may
experience resolver delays or failures when connecting to mysqld. experience resolver delays or failures when connecting to @code{mysqld}.
Make sure that the @code{localhost} entry in the @file{/etc/hosts} file is Make sure that the @code{localhost} entry in the @file{/etc/hosts} file is
correct (otherwise you will have problems connecting to the database). The correct (otherwise you will have problems connecting to the database). The
...@@ -8226,7 +8239,7 @@ shell> ./configure --with-mit-threads ...@@ -8226,7 +8239,7 @@ shell> ./configure --with-mit-threads
FreeBSD is also known to have a very low default file handle limit. FreeBSD is also known to have a very low default file handle limit.
@xref{Not enough file handles}. Uncomment the ulimit -n section in @xref{Not enough file handles}. Uncomment the ulimit -n section in
safe_mysqld or raise the limits for the mysqld user in /etc/login.conf safe_mysqld or raise the limits for the @code{mysqld} user in /etc/login.conf
(and rebuild it with cap_mkdb /etc/login.conf). Also be sure you set the (and rebuild it with cap_mkdb /etc/login.conf). Also be sure you set the
appropriate class for this user in the password file if you are not appropriate class for this user in the password file if you are not
using the default (use: chpass mysqld-user-name). @xref{safe_mysqld}. using the default (use: chpass mysqld-user-name). @xref{safe_mysqld}.
...@@ -8837,7 +8850,7 @@ We are interested in finding someone to do a port, and we will help them ...@@ -8837,7 +8850,7 @@ We are interested in finding someone to do a port, and we will help them
with any technical questions they may have while doing the port. with any technical questions they may have while doing the port.
We have previously talked with some BeOS developers that have said that We have previously talked with some BeOS developers that have said that
@strong{MySQL} is 80% ported to BeOS, but we haven't heard from these @strong{MySQL} is 80% ported to BeOS, but we haven't heard from them
in a while. in a while.
@node Windows, OS/2, Source install system issues, Installing @node Windows, OS/2, Source install system issues, Installing
...@@ -8875,8 +8888,8 @@ To install either distribution, unzip it in some empty directory and run the ...@@ -8875,8 +8888,8 @@ To install either distribution, unzip it in some empty directory and run the
By default, @strong{MySQL}-Windows is configured to be installed in By default, @strong{MySQL}-Windows is configured to be installed in
@file{C:\mysql}. If you want to install @strong{MySQL} elsewhere, install it @file{C:\mysql}. If you want to install @strong{MySQL} elsewhere, install it
in @file{C:\mysql}, then move the installation to where you want it. If you in @file{C:\mysql} first, then move the installation to where you want it. If
do move @strong{MySQL}, you must tell @code{mysqld} where everything is by you do move @strong{MySQL}, you must tell @code{mysqld} where everything is by
supplying options to @code{mysqld}. Use @code{C:\mysql\bin\mysqld --help} to supplying options to @code{mysqld}. Use @code{C:\mysql\bin\mysqld --help} to
display all options! For example, if you have moved the @strong{MySQL} display all options! For example, if you have moved the @strong{MySQL}
distribution to @file{D:\programs\mysql}, you must start @code{mysqld} with: distribution to @file{D:\programs\mysql}, you must start @code{mysqld} with:
...@@ -8885,12 +8898,12 @@ distribution to @file{D:\programs\mysql}, you must start @code{mysqld} with: ...@@ -8885,12 +8898,12 @@ distribution to @file{D:\programs\mysql}, you must start @code{mysqld} with:
With all newer @strong{MySQL} versions, you can also create a With all newer @strong{MySQL} versions, you can also create a
@file{C:\my.cnf} file that holds any default options for the @file{C:\my.cnf} file that holds any default options for the
@strong{MySQL} server. Copy the file @file{\mysql\my-xxxxx.cnf} to @strong{MySQL} server. Copy the file @file{\mysql\my-xxxxx.cnf} to
@file{C:\my.cnf} and edit this to suit your setup. Note that you should @file{C:\my.cnf} and edit it to suit your setup. Note that you should
specify all paths with @samp{/} instead of @samp{\}. If you use specify all paths with @samp{/} instead of @samp{\}. If you use
@samp{\}, you need to specify this twice, as @samp{\} is the escape @samp{\}, you need to specify it twice, as @samp{\} is the escape
character in @strong{MySQL}. @xref{Option files}. character in @strong{MySQL}. @xref{Option files}.
Starting from @strong{MySQL} 3.23.38 the windows distribution includes Starting from @strong{MySQL} 3.23.38, the Windows distribution includes
both the normal and the @strong{MySQL-Max} binaries. The main benefit both the normal and the @strong{MySQL-Max} binaries. The main benefit
of using the normal @code{mysqld.exe} binary is that it's a little of using the normal @code{mysqld.exe} binary is that it's a little
faster and uses less resources. faster and uses less resources.
...@@ -8904,21 +8917,21 @@ symbolic links, BDB and InnoDB tables. ...@@ -8904,21 +8917,21 @@ symbolic links, BDB and InnoDB tables.
@item @code{mysqld-opt} @tab @item @code{mysqld-opt} @tab
Optimized binary with no support for transactional tables. Optimized binary with no support for transactional tables.
@item @code{mysqld-nt} @tab @item @code{mysqld-nt} @tab
Optimized for a Pentium pro processor. Has support for Optimized for a Pentium Pro processor. Has support for
named pipes. One can run this version on Win98, but in named pipes. You can run this version on Win98, but in
this case no named pipes are created and one must this case no named pipes are created and you must
have TCP/IP installed. have TCP/IP installed.
@item mysqld-max @tab @item @code{mysqld-max} @tab
Optimized binary with support for symbolic links, BDB and InnoDB tables. Optimized binary with support for symbolic links, BDB and InnoDB tables.
@item mysqld-max-nt @tab @item @code{mysqld-max-nt} @tab
Like mysqld-max, but compiled with support for named pipes. Like @code{mysqld-max}, but compiled with support for named pipes.
@end multitable @end multitable
All of the above binaries are optimized for the Pentium pro processor but All of the above binaries are optimized for the Pentium Pro processor but
should work on any Intel processor >= i386. should work on any Intel processor >= i386.
NOTE: If you want to use InnoDB tables, you need to specify some startup NOTE: If you want to use InnoDB tables, there are certain startup
options in your my.ini file! @xref{InnoDB start}. options that must be specified in your @file{my.ini} file! @xref{InnoDB start}.
@node Win95 start, NT start, Windows installation, Windows @node Win95 start, NT start, Windows installation, Windows
@subsection Starting MySQL on Windows 95 or Windows 98 @subsection Starting MySQL on Windows 95 or Windows 98
...@@ -8937,7 +8950,7 @@ the above doesn't apply for Win98. ...@@ -8937,7 +8950,7 @@ the above doesn't apply for Win98.
To start the @code{mysqld} server, you should start an MS-DOS window and type: To start the @code{mysqld} server, you should start an MS-DOS window and type:
@example @example
C:\mysql\bin\mysqld C:\> C:\mysql\bin\mysqld
@end example @end example
This will start @code{mysqld} in the background without a window. This will start @code{mysqld} in the background without a window.
...@@ -8945,25 +8958,25 @@ This will start @code{mysqld} in the background without a window. ...@@ -8945,25 +8958,25 @@ This will start @code{mysqld} in the background without a window.
You can kill the @strong{MySQL} server by executing: You can kill the @strong{MySQL} server by executing:
@example @example
C:\mysql\bin\mysqladmin -u root shutdown C:\> C:\mysql\bin\mysqladmin -u root shutdown
@end example @end example
Note that Win95/Win98 don't support creation of named pipes. On Note that Win95 and Win98 don't support creation of named pipes. On
Win95/Win98, you can only use named pipes to connect to a remote Win95 and Win98, you can only use named pipes to connect to a remote
@strong{MySQL} running on an NT server. @strong{MySQL} running on an NT server.
If @code{mysqld} doesn't start, please check whether or not the If @code{mysqld} doesn't start, please check whether or not the
@file{\mysql\mysql.err} file contains any reason for this. You can also @file{\mysql\mysql.err} file contains any reason for this. You can also
try to start it with @code{mysqld --standalone}; In this case you may try to start the server with @code{mysqld --standalone}; In this case, you may
get some useful information on the screen that may help solve this. get some useful information on the screen that may help solve the problem.
The last option is to start @code{mysqld} with @code{--standalone The last option is to start @code{mysqld} with @code{--standalone
--debug}. In this case @code{mysqld} will write a log file in --debug}. In this case @code{mysqld} will write a log file
@file{C:\mysqld.trace} that should contain the reason why @code{mysqld} @file{C:\mysqld.trace} that should contain the reason why @code{mysqld}
doesn't start. @xref{Making trace files}. doesn't start. @xref{Making trace files}.
@node NT start, Windows running, Win95 start, Windows @node NT start, Windows running, Win95 start, Windows
@subsection Starting MySQL on NT or Windows 2000 @subsection Starting MySQL on Windows NT or Windows 2000
The Win95/Win98 section also applies to @strong{MySQL} on NT/Win2000, with The Win95/Win98 section also applies to @strong{MySQL} on NT/Win2000, with
the following differences: the following differences:
...@@ -8978,38 +8991,40 @@ For NT/Win2000, the server name is @code{mysqld-nt}. Normally you ...@@ -8978,38 +8991,40 @@ For NT/Win2000, the server name is @code{mysqld-nt}. Normally you
should install @strong{MySQL} as a service on NT/Win2000: should install @strong{MySQL} as a service on NT/Win2000:
@example @example
C:\mysql\bin\mysqld-nt --install C:\> C:\mysql\bin\mysqld-nt --install
@end example
or or
C:\mysql\bin\mysqld-max-nt --install @example
C:\> C:\mysql\bin\mysqld-max-nt --install
@end example @end example
(You can also use @code{mysqld} binaries that doesn't end with (You can also use @code{mysqld} binaries that don't end with
@code{-nt.exe} on NT, but those cannot be started as a service or use @code{-nt.exe} on NT, but those cannot be started as a service or use
named pipes.) named pipes.)
You can start and stop the @strong{MySQL} service with: You can start and stop the @strong{MySQL} service with these commands:
@example @example
NET START mysql C:\> NET START mysql
NET STOP mysql C:\> NET STOP mysql
@end example @end example
Note that in this case you can't use any other options for @code{mysqld-nt}! Note that in this case you can't use any other options for @code{mysqld-nt}!
You can also run @code{mysqld-nt} as a stand-alone program on NT if you need You can also run @code{mysqld-nt} as a stand-alone program on NT if you need
to start @code{mysqld-nt} with any options! If you start @code{mysqld-nt} to start @code{mysqld-nt} with any options! If you start @code{mysqld-nt}
without options on NT, @code{mysqld-nt} tries to starts itself as a service without options on NT, @code{mysqld-nt} tries to start itself as a service
with the default service options. If you have stopped @code{mysqld-nt}, you with the default service options. If you have stopped @code{mysqld-nt}, you
have to start it with @code{NET START mysql}. have to start it with @code{NET START mysql}.
The service is installed with the name @code{MySQL}. Once installed, it must The service is installed with the name @code{MySQL}. Once installed, it must
be started using the Services Control Manager (SCM) Utility (found in Control be started using the Services Control Manager (SCM) Utility (found in Control
Panel) or by using the @code{NET START MySQL} command. If any options are Panel) or by using the @code{NET START MySQL} command. If any options are
desired, they must be specified as "Startup parameters" in the SCM utility desired, they must be specified as ``Startup parameters'' in the SCM utility
before you start the @strong{MySQL} service. Once running, @code{mysqld-nt} before you start the @strong{MySQL} service. Once running, @code{mysqld-nt}
can be stopped using @code{mysqladmin} or from the SCM utility or by using can be stopped using @code{mysqladmin}, or from the SCM utility or by using
the command @code{NET STOP MySQL}. If you use SCM to stop @code{mysqld-nt}, the command @code{NET STOP MySQL}. If you use SCM to stop @code{mysqld-nt},
there is a strange message from SCM about @code{mysqld shutdown normally}. there is a strange message from SCM about @code{mysqld shutdown normally}.
When run as a service, @code{mysqld-nt} has no access to a console and so no When run as a service, @code{mysqld-nt} has no access to a console and so no
...@@ -9027,7 +9042,7 @@ If you have problems installing @code{mysqld-nt} as a service, try starting ...@@ -9027,7 +9042,7 @@ If you have problems installing @code{mysqld-nt} as a service, try starting
it with the full path: it with the full path:
@example @example
C:\mysql\bin\mysqld-nt --install C:\> C:\mysql\bin\mysqld-nt --install
@end example @end example
If this doesn't work, you can get @code{mysqld-nt} to start properly by fixing If this doesn't work, you can get @code{mysqld-nt} to start properly by fixing
...@@ -9037,13 +9052,13 @@ If you don't want to start @code{mysqld-nt} as a service, you can start it as ...@@ -9037,13 +9052,13 @@ If you don't want to start @code{mysqld-nt} as a service, you can start it as
follows: follows:
@example @example
C:\mysql\bin\mysqld-nt --standalone C:\> C:\mysql\bin\mysqld-nt --standalone
@end example @end example
or or
@example @example
C:\mysql\bin\mysqld --standalone --debug C:\> C:\mysql\bin\mysqld --standalone --debug
@end example @end example
The last version gives you a debug trace in @file{C:\mysqld.trace}. The last version gives you a debug trace in @file{C:\mysqld.trace}.
...@@ -9076,10 +9091,10 @@ You can test whether or not @strong{MySQL} is working by executing the ...@@ -9076,10 +9091,10 @@ You can test whether or not @strong{MySQL} is working by executing the
following commands: following commands:
@example @example
C:\mysql\bin\mysqlshow C:\> C:\mysql\bin\mysqlshow
C:\mysql\bin\mysqlshow -u root mysql C:\> C:\mysql\bin\mysqlshow -u root mysql
C:\mysql\bin\mysqladmin version status proc C:\> C:\mysql\bin\mysqladmin version status proc
C:\mysql\bin\mysql test C:\> C:\mysql\bin\mysql test
@end example @end example
If @code{mysqld} is slow to answer to connections on Win95/Win98, there is If @code{mysqld} is slow to answer to connections on Win95/Win98, there is
...@@ -9097,32 +9112,32 @@ There are two versions of the @strong{MySQL} command-line tool: ...@@ -9097,32 +9112,32 @@ There are two versions of the @strong{MySQL} command-line tool:
@end multitable @end multitable
If you want to use @code{mysqlc.exe}, you must copy If you want to use @code{mysqlc.exe}, you must copy
@file{C:\mysql\lib\cygwinb19.dll} to @file{\windows\system} (or similar @file{C:\mysql\lib\cygwinb19.dll} to your Windows system directory
place). (@file{\windows\system} or similar place).
The default privileges on Windows give all local users full privileges The default privileges on Windows give all local users full privileges
to all databases. To make @strong{MySQL} more secure, you to all databases without specifying a password. To make @strong{MySQL}
should set a password for all users and remove the row in the more secure, you should set a password for all users and remove the row in
@code{mysql.user} table that has @code{Host='localhost'} and the @code{mysql.user} table that has @code{Host='localhost'} and
@code{User=''}. @code{User=''}.
You should also add a password for the @code{root} user. (The following You should also add a password for the @code{root} user. The following
example starts by removing the anonymous user, that allows anyone to access example starts by removing the anonymous user that can be used by anyone
the 'test' database.): to access the @code{test} database, then sets a @code{root} user password:
@example @example
C:\mysql\bin\mysql mysql C:\> C:\mysql\bin\mysql mysql
mysql> DELETE FROM user WHERE Host='localhost' AND User=''; mysql> DELETE FROM user WHERE Host='localhost' AND User='';
mysql> QUIT mysql> QUIT
C:\mysql\bin\mysqladmin reload C:\> C:\mysql\bin\mysqladmin reload
C:\mysql\bin\mysqladmin -u root password your_password C:\> C:\mysql\bin\mysqladmin -u root password your_password
@end example @end example
After you've set the password, if you want to take down the @code{mysqld} After you've set the password, if you want to take down the @code{mysqld}
server, you can do so using this command: server, you can do so using this command:
@example @example
mysqladmin --user=root --password=your_password shutdown C:\> mysqladmin --user=root --password=your_password shutdown
@end example @end example
If you are using the old shareware version of @strong{MySQL} Version 3.21 If you are using the old shareware version of @strong{MySQL} Version 3.21
...@@ -9147,14 +9162,14 @@ Here is a note about how to connect to get a secure connection to remote ...@@ -9147,14 +9162,14 @@ Here is a note about how to connect to get a secure connection to remote
@itemize @bullet @itemize @bullet
@item @item
Install an SSH client on your windows machine - As a user, the best non-free Install an SSH client on your Windows machine --- As a user, the best non-free
one I've found is from @code{SecureCRT} from @uref{http://www.vandyke.com/}. one I've found is from @code{SecureCRT} from @uref{http://www.vandyke.com/}.
Another option is @code{f-secure} from @uref{http://www.f-secure.com/}. You Another option is @code{f-secure} from @uref{http://www.f-secure.com/}. You
can also find some free ones on @strong{Google} at can also find some free ones on @strong{Google} at
@uref{http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/}. @uref{http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/}.
@item @item
Start your windows SSH client. Start your Windows SSH client.
Set @code{Host_Name = yourmysqlserver_URL_or_IP}. Set @code{Host_Name = yourmysqlserver_URL_or_IP}.
Set @code{userid=your_userid} to log in to your server (probably not the same Set @code{userid=your_userid} to log in to your server (probably not the same
as your @strong{MySQL} login/password. as your @strong{MySQL} login/password.
...@@ -9170,35 +9185,37 @@ Save everything, otherwise you'll have to redo it the next time. ...@@ -9170,35 +9185,37 @@ Save everything, otherwise you'll have to redo it the next time.
Log in to your server with SSH session you just created. Log in to your server with SSH session you just created.
@item @item
Start some ODBC application on your windows machine (for example Access). On your Windows machine, start some ODBC application (such as Access).
@item @item
Create a new file in windows and link to @strong{MySQL} using the ODBC driver the same way Create a new file in Windows and link to @strong{MySQL} using the ODBC
you normally do, EXCEPT type in @code{localhost} for the @strong{MySQL} host server - not @code{yourmysqlservername}. driver the same way you normally do, EXCEPT type in @code{localhost}
for the @strong{MySQL} host server --- not @code{yourmysqlservername}.
@end itemize @end itemize
You should now have your ODBC connection to @strong{MySQL} encrypted using SSH. You should now have an ODBC connection to @strong{MySQL}, encrypted using SSH.
@cindex symbolic links @cindex symbolic links
@cindex using multiple disks to start data @cindex using multiple disks to start data
@cindex disks, splitting data across @cindex disks, splitting data across
@node Windows symbolic links, Windows compiling, Windows and SSH, Windows @node Windows symbolic links, Windows compiling, Windows and SSH, Windows
@subsection Splitting Data Across Different Disks Under Windows @subsection Splitting Data Across Different Disks on Windows
On windows @strong{MySQL} Version 3.23.16 and above is compiled with the Beginning with @strong{MySQL} Version 3.23.16, the @strong{MySQL}
@code{-DUSE_SYMDIR} option. This allows you to put a database on distribution is compiled with the @code{-DUSE_SYMDIR} option. This allows
different disk by adding a symbolic link to it (in a similar manner that you to put a database on different disk by adding a symbolic link to it
symbolic links works on Unix). (in a manner similar to the way that symbolic links work on Unix).
On windows you make a symbolic link to a database by creating a file On Windows, you make a symbolic link to a database by creating a file
that contains the path to the destination directory and saving this in that contains the path to the destination directory and saving this in
the @file{mysql_data} directory under the filename @file{database.sym}. the @file{mysql_data} directory under the filename @file{database.sym}.
Note that the symbolic link will only be used if the directory Note that the symbolic link will be used only if the directory
@file{mysql_data_dir\database} doesn't exist. @file{mysql_data_dir\database} doesn't exist.
For example, if you want to have database @code{foo} on @file{D:\data\foo}, you For example, if the @strong{MySQL} data directory is @file{C:\mysql\data}
and you want to have database @code{foo} located at @file{D:\data\foo}, you
should create the file @file{C:\mysql\data\foo.sym} that contains the should create the file @file{C:\mysql\data\foo.sym} that contains the
text @code{D:\data\foo}. After this, all tables created in the database text @code{D:\data\foo}. After that, all tables created in the database
@code{foo} will be created in @file{D:\data\foo}. @code{foo} will be created in @file{D:\data\foo}.
@cindex compiling, on Windows @cindex compiling, on Windows
...@@ -9207,7 +9224,7 @@ text @code{D:\data\foo}. After this, all tables created in the database ...@@ -9207,7 +9224,7 @@ text @code{D:\data\foo}. After this, all tables created in the database
@subsection Compiling MySQL Clients on Windows @subsection Compiling MySQL Clients on Windows
In your source files, you should include @file{windows.h} before you include In your source files, you should include @file{windows.h} before you include
@code{mysql.h}: @file{mysql.h}:
@example @example
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
...@@ -9244,10 +9261,10 @@ with the following exceptions: ...@@ -9244,10 +9261,10 @@ with the following exceptions:
@table @strong @table @strong
@item Win95 and threads @item Win95 and threads
Win95 leaks about 200 bytes of main memory for each thread creation. Because Win95 leaks about 200 bytes of main memory for each thread creation.
of this, you shouldn't run @code{mysqld} for an extended time on Win95 if Each connection in @strong{MySQL} creates a new thread, so you shouldn't
you do many connections, because each connection in @strong{MySQL} creates run @code{mysqld} for an extended time on Win95 if your server handles
a new thread! WinNT and Win98 don't suffer from this bug. many connections! WinNT and Win98 don't suffer from this bug.
@item Concurrent reads @item Concurrent reads
@strong{MySQL} depends on the @code{pread()} and @code{pwrite()} calls to be @strong{MySQL} depends on the @code{pread()} and @code{pwrite()} calls to be
...@@ -9255,9 +9272,9 @@ able to mix @code{INSERT} and @code{SELECT}. Currently we use mutexes ...@@ -9255,9 +9272,9 @@ able to mix @code{INSERT} and @code{SELECT}. Currently we use mutexes
to emulate @code{pread()}/@code{pwrite()}. We will, in the long run, to emulate @code{pread()}/@code{pwrite()}. We will, in the long run,
replace the file level interface with a virtual interface so that we can replace the file level interface with a virtual interface so that we can
use the @code{readfile()}/@code{writefile()} interface on NT to get more speed. use the @code{readfile()}/@code{writefile()} interface on NT to get more speed.
The current implementation will however limit the number of open files The current implementation limits the number of open files @strong{MySQL}
@strong{MySQL} can use to 1024, which means that you will not be able to can use to 1024, which means that you will not be able to run as many
run as many concurrent threads on NT as on Unix. concurrent threads on NT as on Unix.
@item Blocking read @item Blocking read
@strong{MySQL} uses a blocking read for each connection. @strong{MySQL} uses a blocking read for each connection.
...@@ -9280,8 +9297,8 @@ If a connection hangs, it's impossible to break it without killing ...@@ -9280,8 +9297,8 @@ If a connection hangs, it's impossible to break it without killing
connections. connections.
@end itemize @end itemize
We plan to fix this when our Windows developers have figured out a nice We plan to fix this problem when our Windows developers have figured out a
workaround for this. nice workaround.
@item UDF functions @item UDF functions
For the moment, @strong{MySQL}-Windows does not support user-definable For the moment, @strong{MySQL}-Windows does not support user-definable
...@@ -9297,18 +9314,25 @@ utility in Win95. You must take it down with @code{mysqladmin shutdown}. ...@@ -9297,18 +9314,25 @@ utility in Win95. You must take it down with @code{mysqladmin shutdown}.
@item Case-insensitive names @item Case-insensitive names
Filenames are case insensitive on Windows, so database and table names Filenames are case insensitive on Windows, so database and table names
are also case insensitive in @strong{MySQL} for Windows. The only are also case insensitive in @strong{MySQL} for Windows. The only
restriction is that database and table names must be given in the same restriction is that database and table names must be specified using the same
case throughout a given statement. @xref{Name case sensitivity}. case throughout a given statement. @xref{Name case sensitivity}.
@item The @samp{\} directory character @item The @samp{\} directory character
Pathname components in Win95 are separated by the @samp{\} character, which is Pathname components in Win95 are separated by the @samp{\} character, which is
also the escape character in @strong{MySQL}. If you are using @code{LOAD also the escape character in @strong{MySQL}. If you are using @code{LOAD
DATA INFILE} or @code{SELECT ... INTO OUTFILE}, you must double the @samp{\} DATA INFILE} or @code{SELECT ... INTO OUTFILE}, you must double the @samp{\}
character or use Unix style filenames @samp{/} characters: character:
@example @example
LOAD DATA INFILE "C:\\tmp\\skr.txt" INTO TABLE skr; mysql> LOAD DATA INFILE "C:\\tmp\\skr.txt" INTO TABLE skr;
SELECT * INTO OUTFILE 'C:/tmp/skr.txt' FROM skr; mysql> SELECT * INTO OUTFILE 'C:\\tmp\\skr.txt' FROM skr;
@end example
Alternatively, use Unix style filenames with @samp{/} characters:
@example
mysql> LOAD DATA INFILE "C:/tmp/skr.txt" INTO TABLE skr;
mysql> SELECT * INTO OUTFILE 'C:/tmp/skr.txt' FROM skr;
@end example @end example
@item @code{Can't open named pipe} error @item @code{Can't open named pipe} error
...@@ -9322,8 +9346,8 @@ error 2017: can't open named pipe to host: . pipe... ...@@ -9322,8 +9346,8 @@ error 2017: can't open named pipe to host: . pipe...
@tindex .my.cnf file @tindex .my.cnf file
This is because the release version of @strong{MySQL} uses named pipes on NT This is because the release version of @strong{MySQL} uses named pipes on NT
by default. You can avoid this error by using the @code{--host=localhost} by default. You can avoid this error by using the @code{--host=localhost}
option to the new @strong{MySQL} clients or create a file @file{C:\my.cnf} option to the new @strong{MySQL} clients or create an option file
that contains the following information: @file{C:\my.cnf} that contains the following information:
@example @example
[client] [client]
...@@ -9344,16 +9368,16 @@ following information: ...@@ -9344,16 +9368,16 @@ following information:
@end example @end example
@item @code{ALTER TABLE} @item @code{ALTER TABLE}
While you are doing an @code{ALTER TABLE} the table is locked from usage While you are executing an @code{ALTER TABLE} statement, the table is locked
by other threads. This has to do with the fact that you on Windows can't from usage by other threads. This has to do with the fact that on Windows,
delete a file that is in use by another threads. (We may in the future you can't delete a file that is in use by another threads. (In the future,
find some way to go around this problem.) we may find some way to work around this problem.)
@item @code{DROP TABLE} on a table that is in use by a @code{MERGE} table will not work. @item @code{DROP TABLE} on a table that is in use by a @code{MERGE} table will not work
The @code{MERGE} handler does it table mapping hidden from @strong{MySQL}. The @code{MERGE} handler does its table mapping hidden from @strong{MySQL}.
Because Windows doesn't allow one to drop files that are open, you have Because Windows doesn't allow you to drop files that are open, you first
to first flush all @code{MERGE} tables (with @code{FLUSH TABLES}) or drop the must flush all @code{MERGE} tables (with @code{FLUSH TABLES}) or drop the
@code{MERGE} table before droping the table. We will fix this at the same @code{MERGE} table before dropping the table. We will fix this at the same
time we introduce @code{VIEW}s. time we introduce @code{VIEW}s.
@end table @end table
...@@ -9376,14 +9400,14 @@ Add some nice start and shutdown icons to the @strong{MySQL} installation. ...@@ -9376,14 +9400,14 @@ Add some nice start and shutdown icons to the @strong{MySQL} installation.
Create a tool to manage registry entries for the @strong{MySQL} startup Create a tool to manage registry entries for the @strong{MySQL} startup
options. The registry entry reading is already coded into @file{mysqld.cc}, options. The registry entry reading is already coded into @file{mysqld.cc},
but it should be recoded to be more parameter oriented. The tool should but it should be recoded to be more parameter oriented. The tool should
also be able to update the @file{\my.cnf} file if the user prefers to use also be able to update the @file{C:\my.cnf} option file if the user prefers
this instead of the registry. to use that instead of the registry.
@item @item
When registering @code{mysqld} as a service with @code{--install} (on NT) When registering @code{mysqld} as a service with @code{--install} (on NT)
it would be nice if you could also add default options on the command line. it would be nice if you could also add default options on the command line.
For the moment, the workaround is to update the @file{C:\my.cnf} file For the moment, the workaround is to list the parameters in the
instead. @file{C:\my.cnf} file instead.
@item @item
When you suspend a laptop running Win95, the @code{mysqld} daemon doesn't When you suspend a laptop running Win95, the @code{mysqld} daemon doesn't
...@@ -9406,10 +9430,6 @@ It would be nice if the socket read and write functions in @file{net.c} were ...@@ -9406,10 +9430,6 @@ It would be nice if the socket read and write functions in @file{net.c} were
interruptible. This would make it possible to kill open threads with interruptible. This would make it possible to kill open threads with
@code{mysqladmin kill} on Windows. @code{mysqladmin kill} on Windows.
@item
Documentation of which Windows programs work with @strong{MySQL}-Windows or
@strong{MyODBC} and what must be done to get them working.
@item @item
@code{mysqld} always starts in the "C" locale and not in the default locale. @code{mysqld} always starts in the "C" locale and not in the default locale.
We would like to have @code{mysqld} use the current locale for the sort order. We would like to have @code{mysqld} use the current locale for the sort order.
...@@ -9473,14 +9493,14 @@ For example, in Unix, the shared module might be named @file{example.so} ...@@ -9473,14 +9493,14 @@ For example, in Unix, the shared module might be named @file{example.so}
and you would load a function from it like this: and you would load a function from it like this:
@example @example
CREATE FUNCTION metaphon RETURNS STRING SONAME "example.so"; mysql> CREATE FUNCTION metaphon RETURNS STRING SONAME "example.so";
@end example @end example
Is OS/2, the module would be named @file{example.udf}, but you would not Is OS/2, the module would be named @file{example.udf}, but you would not
specify the module extension: specify the module extension:
@example @example
CREATE FUNCTION metaphon RETURNS STRING SONAME "example"; mysql> CREATE FUNCTION metaphon RETURNS STRING SONAME "example";
@end example @end example
@cindex binary distributions @cindex binary distributions
...@@ -9830,7 +9850,7 @@ It will also not do anything if you already have @strong{MySQL} privilege ...@@ -9830,7 +9850,7 @@ It will also not do anything if you already have @strong{MySQL} privilege
tables installed! tables installed!
If you want to re-create your privilege tables, you should take down If you want to re-create your privilege tables, you should take down
the mysqld server, if it's running, and then do something like: the @code{mysqld} server, if it's running, and then do something like:
@example @example
mv mysql-data-directory/mysql mysql-data-directory/mysql-old mv mysql-data-directory/mysql mysql-data-directory/mysql-old
...@@ -10023,14 +10043,14 @@ If you find something like the following in the log file: ...@@ -10023,14 +10043,14 @@ If you find something like the following in the log file:
000729 14:50:10 Can't init databases 000729 14:50:10 Can't init databases
@end example @end example
This means that you didn't start mysqld with @code{--bdb-no-recover} This means that you didn't start @code{mysqld} with @code{--bdb-no-recover}
and Berkeley DB found something wrong with its log files when it and Berkeley DB found something wrong with its log files when it
tried to recover your databases. To be able to continue, you should tried to recover your databases. To be able to continue, you should
move away the old Berkeley DB log file from the database directory to move away the old Berkeley DB log file from the database directory to
some other place, where you can later examine these. The log files are some other place, where you can later examine these. The log files are
named @file{log.0000000001}, where the number will increase over time. named @file{log.0000000001}, where the number will increase over time.
If you are running @code{mysqld} with BDB table support and mysqld core If you are running @code{mysqld} with BDB table support and @code{mysqld} core
dumps at start this could be because of some problems with the BDB dumps at start this could be because of some problems with the BDB
recover log. In this case you can try starting @code{mysqld} with recover log. In this case you can try starting @code{mysqld} with
@code{--bdb-no-recover}. If this helps, then you should remove all @code{--bdb-no-recover}. If this helps, then you should remove all
...@@ -10060,9 +10080,11 @@ it is using by executing this command: ...@@ -10060,9 +10080,11 @@ it is using by executing this command:
@example @example
shell> mysqladmin variables shell> mysqladmin variables
@end example
or or
@example
shell> mysqladmin -h 'your-host-name' variables shell> mysqladmin -h 'your-host-name' variables
@end example @end example
...@@ -10077,7 +10099,7 @@ this: ...@@ -10077,7 +10099,7 @@ this:
This problem occurs only on systems that don't have a working thread This problem occurs only on systems that don't have a working thread
library and for which @strong{MySQL} must be configured to use MIT-pthreads. library and for which @strong{MySQL} must be configured to use MIT-pthreads.
If you can't get mysqld to start you can try to make a trace file If you can't get @code{mysqld} to start you can try to make a trace file
to find the problem. @xref{Making trace files}. to find the problem. @xref{Making trace files}.
If you are using BDB (Berkeley DB) tables, you should familiarize If you are using BDB (Berkeley DB) tables, you should familiarize
...@@ -10191,7 +10213,7 @@ IP address to bind to. ...@@ -10191,7 +10213,7 @@ IP address to bind to.
Directory where character sets are. @xref{Character sets}. Directory where character sets are. @xref{Character sets}.
@item --chroot=path @item --chroot=path
Chroot mysqld daemon during startup. Recommended security measure. It will Chroot @code{mysqld} daemon during startup. Recommended security measure. It will
somewhat limit @code{LOAD DATA INFILE} and @code{SELECT ... INTO OUTFILE} somewhat limit @code{LOAD DATA INFILE} and @code{SELECT ... INTO OUTFILE}
though. though.
...@@ -10271,15 +10293,16 @@ the priority of only one query, or by ...@@ -10271,15 +10293,16 @@ the priority of only one query, or by
thread. @xref{Table locking}. thread. @xref{Table locking}.
@item --memlock @item --memlock
Lock the @code{mysqld} process in memory. This works only if your system Lock the @code{mysqld} process in memory. This works only if your
supports the @code{mlockall()} system call. This may help if you have system supports the @code{mlockall()} system call (like Solaris). This
a problem where the operating system is causing @code{mysqld} to swap on disk. may help if you have a problem where the operating system is causing
@code{mysqld} to swap on disk.
@item --myisam-recover [=option[,option...]]] where option is one of DEFAULT, BACKUP, FORCE or QUICK. @item --myisam-recover [=option[,option...]]] where option is one of DEFAULT, BACKUP, FORCE or QUICK.
If this option is used, @code{mysqld} will on open check if the table is If this option is used, @code{mysqld} will on open check if the table is
marked as crashed or if if the table wasn't closed properly. (The last marked as crashed or if if the table wasn't closed properly. (The last
option only works if you are running with @code{--skip-locking}). If this option only works if you are running with @code{--skip-locking}). If this
is the case mysqld will run check on the table. If the table was corrupted, is the case @code{mysqld} will run check on the table. If the table was corrupted,
@code{mysqld} will attempt to repair it. @code{mysqld} will attempt to repair it.
The following options affects how the repair works. The following options affects how the repair works.
...@@ -10593,7 +10616,7 @@ In some cases you may want to have many different @code{mysqld} daemons ...@@ -10593,7 +10616,7 @@ In some cases you may want to have many different @code{mysqld} daemons
(servers) running on the same machine. You may for example want to run (servers) running on the same machine. You may for example want to run
a new version of @strong{MySQL} for testing together with an old version a new version of @strong{MySQL} for testing together with an old version
that is in production. Another case is when you want to give different that is in production. Another case is when you want to give different
users access to different mysqld servers that they manage themselves. users access to different @code{mysqld} servers that they manage themselves.
One way to get a new server running is by starting it with a different One way to get a new server running is by starting it with a different
socket and port as follows: socket and port as follows:
...@@ -11258,7 +11281,7 @@ SELECT @@t1:=(@@t2:=1)+@@t3:=4,@@t1,@@t2,@@t3; ...@@ -11258,7 +11281,7 @@ SELECT @@t1:=(@@t2:=1)+@@t3:=4,@@t1,@@t2,@@t3;
@cindex running, ANSI mode @cindex running, ANSI mode
@cindex ANSI mode, running @cindex ANSI mode, running
If you start mysqld with the @code{--ansi} option, the following behavior If you start @code{mysqld} with the @code{--ansi} option, the following behavior
of @strong{MySQL} changes: of @strong{MySQL} changes:
@itemize @bullet @itemize @bullet
...@@ -11467,7 +11490,7 @@ differently or write more. If you are new to the atomic operations ...@@ -11467,7 +11490,7 @@ differently or write more. If you are new to the atomic operations
paradigm, or more familiar or more comfortable with transactions, do not paradigm, or more familiar or more comfortable with transactions, do not
jump to the conclusion that @strong{MySQL} has not addressed these jump to the conclusion that @strong{MySQL} has not addressed these
issues. Reliability and integrity are foremost in our minds. Recent issues. Reliability and integrity are foremost in our minds. Recent
estimates indicate that there are more than 1,000,000 mysqld servers estimates indicate that there are more than 1,000,000 @code{mysqld} servers
currently running, many of which are in production environments. We currently running, many of which are in production environments. We
hear very, very seldom from our users that they have lost any data, and hear very, very seldom from our users that they have lost any data, and
in almost all of those cases user error is involved. This is, in our in almost all of those cases user error is involved. This is, in our
...@@ -13285,7 +13308,7 @@ Another way to set the password is by using the @code{mysqladmin} command: ...@@ -13285,7 +13308,7 @@ Another way to set the password is by using the @code{mysqladmin} command:
shell> mysqladmin -u root password new_password shell> mysqladmin -u root password new_password
@end example @end example
Only users with write/update access to the mysql database can change the Only users with write/update access to the @code{mysql} database can change the
password for others users. All normal users (not anonymous ones) can only password for others users. All normal users (not anonymous ones) can only
change their own password with either of the above commands or with change their own password with either of the above commands or with
@code{SET PASSWORD=PASSWORD('new password')}. @code{SET PASSWORD=PASSWORD('new password')}.
...@@ -13760,9 +13783,9 @@ Try to find out what is wrong with your DNS server and fix this. ...@@ -13760,9 +13783,9 @@ Try to find out what is wrong with your DNS server and fix this.
@item @item
Specify IPs instead of hostnames in the @strong{MySQL} privilege tables. Specify IPs instead of hostnames in the @strong{MySQL} privilege tables.
@item @item
Start mysqld with @code{--skip-name-resolve}. Start @code{mysqld} with @code{--skip-name-resolve}.
@item @item
Start mysqld with @code{--skip-host-cache}. Start @code{mysqld} with @code{--skip-host-cache}.
@item @item
Connect to @code{localhost} if you are running the server and the client Connect to @code{localhost} if you are running the server and the client
on the same machine. on the same machine.
...@@ -14024,7 +14047,7 @@ A tab character. ...@@ -14024,7 +14047,7 @@ A tab character.
@findex (Control-Z) \z @findex (Control-Z) \z
@item \z @item \z
ASCII(26) (Control-Z). This character can be encoded to allow you to ASCII(26) (Control-Z). This character can be encoded to allow you to
go around the problem that ASCII(26) stands for END-OF-FILE on windows. go around the problem that ASCII(26) stands for END-OF-FILE on Windows.
(ASCII(26) will cause problems if you try to use (ASCII(26) will cause problems if you try to use
@code{mysql database < filename}). @code{mysql database < filename}).
...@@ -14325,7 +14348,7 @@ adopt a consistent convention, such as always creating databases and ...@@ -14325,7 +14348,7 @@ adopt a consistent convention, such as always creating databases and
tables using lowercase names. tables using lowercase names.
One way to avoid this problem is to start @code{mysqld} with @code{-O One way to avoid this problem is to start @code{mysqld} with @code{-O
lower_case_table_names=1}. By default this option is 1 on windows and 0 on lower_case_table_names=1}. By default this option is 1 on Windows and 0 on
Unix. Unix.
If @code{lower_case_table_names} is 1 @strong{MySQL} will convert all If @code{lower_case_table_names} is 1 @strong{MySQL} will convert all
...@@ -19479,7 +19502,7 @@ exist. ...@@ -19479,7 +19502,7 @@ exist.
@code{RESTRICT} and @code{CASCADE} are allowed to make porting easier. @code{RESTRICT} and @code{CASCADE} are allowed to make porting easier.
For the moment they don't do anything. For the moment they don't do anything.
@strong{NOTE}: @code{DROP TABLE} is not transaction safe and will @strong{NOTE}: @code{DROP TABLE} is not transaction-safe and will
automatically commit any active transactions. automatically commit any active transactions.
@cindex tables, defragment @cindex tables, defragment
...@@ -21773,7 +21796,7 @@ The supported character sets. ...@@ -21773,7 +21796,7 @@ The supported character sets.
@item @code{concurrent_inserts} @item @code{concurrent_inserts}
If @code{ON} (the default), @strong{MySQL} will allow you to use @code{INSERT} If @code{ON} (the default), @strong{MySQL} will allow you to use @code{INSERT}
on @code{MyISAM} tables at the same time as you run @code{SELECT} queries on @code{MyISAM} tables at the same time as you run @code{SELECT} queries
on them. You can turn this option off by starting mysqld with @code{--safe} on them. You can turn this option off by starting @code{mysqld} with @code{--safe}
or @code{--skip-new}. or @code{--skip-new}.
@cindex timeout @cindex timeout
...@@ -22737,7 +22760,7 @@ You can also lock all tables in all databases with read locks with the ...@@ -22737,7 +22760,7 @@ You can also lock all tables in all databases with read locks with the
convenient way to get backups if you have a file system, like Veritas, convenient way to get backups if you have a file system, like Veritas,
that can take snapshots in time. that can take snapshots in time.
@strong{NOTE}: @code{LOCK TABLES} is not transaction safe and will @strong{NOTE}: @code{LOCK TABLES} is not transaction-safe and will
automatically commit any active transactions before attempting to lock the automatically commit any active transactions before attempting to lock the
tables. tables.
...@@ -23446,7 +23469,7 @@ SQL servers that supports different table types (like copying tables to ...@@ -23446,7 +23469,7 @@ SQL servers that supports different table types (like copying tables to
a slave that is optimized for speed by not having transactional tables). a slave that is optimized for speed by not having transactional tables).
This automatic table changing can however also be very confusing for new This automatic table changing can however also be very confusing for new
@strong{MySQL} users. We plan to fix this by introducing warnings in @strong{MySQL} users. We plan to fix this by introducing warnings in
@strong{MySQL} 4.0 and giving a warning when a table type is automaticly @strong{MySQL} 4.0 and giving a warning when a table type is automatically
changed. changed.
You can convert tables between different types with the @code{ALTER You can convert tables between different types with the @code{ALTER
...@@ -23618,7 +23641,7 @@ The following options to @code{mysqld} can be used to change the behavior of ...@@ -23618,7 +23641,7 @@ The following options to @code{mysqld} can be used to change the behavior of
@strong{NOTE} that this paramter is given in megabytes! @strong{NOTE} that this paramter is given in megabytes!
@end multitable @end multitable
The automatic recovery is activated if you start mysqld with The automatic recovery is activated if you start @code{mysqld} with
@code{--myisam-recover=#}. @xref{Command-line options}. @code{--myisam-recover=#}. @xref{Command-line options}.
On open, the table is checked if it's marked as crashed or if the open On open, the table is checked if it's marked as crashed or if the open
count variable for the table is not 0 and you are running with count variable for the table is not 0 and you are running with
...@@ -24336,9 +24359,9 @@ If you use @code{--skip-bdb}, @strong{MySQL} will not initialize the ...@@ -24336,9 +24359,9 @@ If you use @code{--skip-bdb}, @strong{MySQL} will not initialize the
Berkeley DB library and this will save a lot of memory. Of course, Berkeley DB library and this will save a lot of memory. Of course,
you cannot use @code{BDB} tables if you are using this option. you cannot use @code{BDB} tables if you are using this option.
Normally you should start mysqld without @code{--bdb-no-recover} if you Normally you should start @code{mysqld} without @code{--bdb-no-recover} if you
intend to use BDB tables. This may, however, give you problems when you intend to use BDB tables. This may, however, give you problems when you
try to start mysqld if the BDB log files are corrupted. @xref{Starting try to start @code{mysqld} if the BDB log files are corrupted. @xref{Starting
server}. server}.
With @code{bdb_max_lock} you can specify the maximum number of locks With @code{bdb_max_lock} you can specify the maximum number of locks
...@@ -24428,7 +24451,7 @@ TABLE}. ...@@ -24428,7 +24451,7 @@ TABLE}.
@item @item
If you get full disk with a @code{BDB} table, you will get an error If you get full disk with a @code{BDB} table, you will get an error
(probably error 28) and the transaction should roll back. This is in (probably error 28) and the transaction should roll back. This is in
contrast with @code{MyISAM} and @code{ISAM} tables where mysqld will contrast with @code{MyISAM} and @code{ISAM} tables where @code{mysqld} will
wait for enough free disk before continuing. wait for enough free disk before continuing.
@end itemize @end itemize
...@@ -24610,7 +24633,7 @@ NuSphere is working on removing these limitations. ...@@ -24610,7 +24633,7 @@ NuSphere is working on removing these limitations.
@menu @menu
* InnoDB overview:: InnoDB tables overview * InnoDB overview:: InnoDB tables overview
* InnoDB start:: InnoDB startup options * InnoDB start:: InnoDB startup options
* Creating an InnoDB database:: Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. * Creating an InnoDB database:: Creating an InnoDB database.
* Using InnoDB tables:: Creating InnoDB tables * Using InnoDB tables:: Creating InnoDB tables
* Adding and removing:: Adding and removing InnoDB data and log files * Adding and removing:: Adding and removing InnoDB data and log files
* Backing up:: Backing up and recovering an InnoDB database * Backing up:: Backing up and recovering an InnoDB database
...@@ -24645,7 +24668,7 @@ cd /path/to/source/of/mysql-3.23.37 ...@@ -24645,7 +24668,7 @@ cd /path/to/source/of/mysql-3.23.37
./configure --with-innodb ./configure --with-innodb
@end example @end example
InnoDB provides @strong{MySQL} with a transaction safe table handler with InnoDB provides @strong{MySQL} with a transaction-safe table handler with
commit, rollback, and crash recovery capabilities. InnoDB does commit, rollback, and crash recovery capabilities. InnoDB does
locking on row level, and also provides an Oracle-style consistent locking on row level, and also provides an Oracle-style consistent
non-locking read in @code{SELECTS}, which increases transaction non-locking read in @code{SELECTS}, which increases transaction
...@@ -24745,6 +24768,7 @@ the paths specified here. The file sizes are specified in megabytes, ...@@ -24745,6 +24768,7 @@ the paths specified here. The file sizes are specified in megabytes,
hence the 'M' after the size specification above. Do not set a file size hence the 'M' after the size specification above. Do not set a file size
bigger than 4000M, and on most operating systems not bigger than 2000M. bigger than 4000M, and on most operating systems not bigger than 2000M.
InnoDB also understands the abbreviation 'G', 1G meaning 1024M. InnoDB also understands the abbreviation 'G', 1G meaning 1024M.
The sum of the sizes of the files must be at least 10 MB.
@item @code{innodb_mirrored_log_groups} @tab @item @code{innodb_mirrored_log_groups} @tab
Number of identical copies of log groups we Number of identical copies of log groups we
keep for the database. Currently this should be set to 1. keep for the database. Currently this should be set to 1.
...@@ -24800,7 +24824,7 @@ on Windows NT disk i/o may benefit from a larger number. ...@@ -24800,7 +24824,7 @@ on Windows NT disk i/o may benefit from a larger number.
Timeout in seconds an InnoDB transaction may wait for a lock before Timeout in seconds an InnoDB transaction may wait for a lock before
being rolled back. InnoDB automatically detects transaction deadlocks being rolled back. InnoDB automatically detects transaction deadlocks
in its own lock table and rolls back the transaction. If you use in its own lock table and rolls back the transaction. If you use
@code{LOCK TABLES} command, or other transaction safe table handlers @code{LOCK TABLES} command, or other transaction-safe table handlers
than InnoDB in the same transaction, then a deadlock may arise which than InnoDB in the same transaction, then a deadlock may arise which
InnoDB cannot notice. In cases like this the timeout is useful to InnoDB cannot notice. In cases like this the timeout is useful to
resolve the situation. resolve the situation.
...@@ -24868,10 +24892,10 @@ mysqld: ready for connections ...@@ -24868,10 +24892,10 @@ mysqld: ready for connections
@end example @end example
@menu @menu
* Error createing InnoDB:: * Error creating InnoDB::
@end menu @end menu
@node Error createing InnoDB, , Creating an InnoDB database, Creating an InnoDB database @node Error creating InnoDB, , Creating an InnoDB database, Creating an InnoDB database
@subsubsection If something goes wrong in database creation @subsubsection If something goes wrong in database creation
If something goes wrong in an InnoDB database creation, you should If something goes wrong in an InnoDB database creation, you should
...@@ -25110,14 +25134,14 @@ on the other hand cancels all modifications made by the current ...@@ -25110,14 +25134,14 @@ on the other hand cancels all modifications made by the current
transaction. transaction.
@menu @menu
* InnoDB consinsten read:: * InnoDB consistent read::
* InnoDB locking reads:: * InnoDB locking reads::
* InnoDB Next-key locking:: * InnoDB Next-key locking::
* InnoDB Locks set:: * InnoDB Locks set::
* InnoDB Deadlock detection:: * InnoDB Deadlock detection::
@end menu @end menu
@node InnoDB consinsten read, InnoDB locking reads, InnoDB transaction model, InnoDB transaction model @node InnoDB consistent read, InnoDB locking reads, InnoDB transaction model, InnoDB transaction model
@subsubsection Consistent read @subsubsection Consistent read
A consistent read means that InnoDB uses its multiversioning to A consistent read means that InnoDB uses its multiversioning to
...@@ -25142,7 +25166,7 @@ on the tables it accesses, and therefore other users are free to ...@@ -25142,7 +25166,7 @@ on the tables it accesses, and therefore other users are free to
modify those tables at the same time a consistent read is being performed modify those tables at the same time a consistent read is being performed
on the table. on the table.
@node InnoDB locking reads, InnoDB Next-key locking, InnoDB consinsten read, InnoDB transaction model @node InnoDB locking reads, InnoDB Next-key locking, InnoDB consistent read, InnoDB transaction model
@subsubsection Locking reads @subsubsection Locking reads
A consistent read is not convenient in some circumstances. A consistent read is not convenient in some circumstances.
...@@ -25200,7 +25224,7 @@ Thus it sets the same locks a searched SQL @code{UPDATE} would set ...@@ -25200,7 +25224,7 @@ Thus it sets the same locks a searched SQL @code{UPDATE} would set
on the rows. on the rows.
@node InnoDB Next-key locking, InnoDB Locks set, InnoDB locking reads, InnoDB transaction model @node InnoDB Next-key locking, InnoDB Locks set, InnoDB locking reads, InnoDB transaction model
@subsubsection Next-key locking: avoiding the 'phantom problem' @subsubsection Next-key locking: avoiding the phantom problem
In row level locking InnoDB uses an algorithm called next-key locking. In row level locking InnoDB uses an algorithm called next-key locking.
InnoDB does the row level locking so that when it searches or InnoDB does the row level locking so that when it searches or
...@@ -25497,6 +25521,39 @@ If the total length of the fields in a record is < 128 bytes, then ...@@ -25497,6 +25521,39 @@ If the total length of the fields in a record is < 128 bytes, then
the pointer is 1 byte, else 2 bytes. the pointer is 1 byte, else 2 bytes.
@end itemize @end itemize
@subsubsection How an auto-increment column works in InnoDB
After a database startup, when a user first does an insert to a
table @code{T}
where an auto-increment column has been defined, and the user does not provide
an explicit value for the column, then InnoDB executes @code{SELECT
MAX(auto-inc-column) FROM T}, and assigns that value incremented
by one to the the column and the auto-increment counter of the table.
We say that
the auto-increment counter for table @code{T} has been initialized.
InnoDB follows the same procedure in initializing the auto-increment counter
for a freshly created table.
Note that if the user specifies in an insert the value 0 to the auto-increment
column, then InnoDB treats the row like the value would not have been
specified.
After the auto-increment counter has been initialized, if a user inserts
a row where he explicitly specifies the column value, and the value is bigger
than the current counter value, then the counter is set to the specified
column value. If the user does not explicitly specify a value, then InnoDB
increments the counter by one and assigns its new value to the column.
The auto-increment mechanism, when assigning values from the counter,
bypasses locking and transaction handling. Therefore you may also get
gaps in the number sequence if you roll back transactions which have
got numbers from the counter.
The behavior of auto-increment is not defined if a user gives a negative
value to the column or if the value becomes bigger than the maximum
integer that can be stored in the specified integer type.
@node File space management, Error handling, Table and index, InnoDB @node File space management, Error handling, Table and index, InnoDB
@subsection File space management and disk i/o @subsection File space management and disk i/o
...@@ -30437,7 +30494,7 @@ In @strong{MySQL} Version 3.23.7 and above, you can insert rows into ...@@ -30437,7 +30494,7 @@ In @strong{MySQL} Version 3.23.7 and above, you can insert rows into
@code{MyISAM} tables at the same time other threads are reading from the @code{MyISAM} tables at the same time other threads are reading from the
table. Note that currently this only works if there are no holes after table. Note that currently this only works if there are no holes after
deleted rows in the table at the time the insert is made. When all holes deleted rows in the table at the time the insert is made. When all holes
has been filled with new data, concurrent inserts will automaticly be has been filled with new data, concurrent inserts will automatically be
enabled again. enabled again.
Table locking enables many threads to read from a table at the same Table locking enables many threads to read from a table at the same
...@@ -30553,7 +30610,7 @@ can clear the hostname cache with @code{FLUSH HOSTS} or @code{mysqladmin ...@@ -30553,7 +30610,7 @@ can clear the hostname cache with @code{FLUSH HOSTS} or @code{mysqladmin
flush-hosts}. flush-hosts}.
If you don't want to allow connections over @code{TCP/IP}, you can do this If you don't want to allow connections over @code{TCP/IP}, you can do this
by starting mysqld with @code{--skip-networking}. by starting @code{mysqld} with @code{--skip-networking}.
@cindex data, size @cindex data, size
@cindex reducing, data size @cindex reducing, data size
...@@ -31957,7 +32014,7 @@ the following configure options: ...@@ -31957,7 +32014,7 @@ the following configure options:
You can find the @strong{MySQL}-max binaries at You can find the @strong{MySQL}-max binaries at
@uref{http://www.mysql.com/downloads/mysql-max-3.23.html}. @uref{http://www.mysql.com/downloads/mysql-max-3.23.html}.
The windows @strong{MySQL} 3.23 binary distribution includes both the The Windows @strong{MySQL} 3.23 binary distribution includes both the
standard @strong{mysqld.exe} binary and the @code{mysqld-max.exe} binary. standard @strong{mysqld.exe} binary and the @code{mysqld-max.exe} binary.
@uref{http://www.mysql.com/downloads/mysql-3.23.html}. @uref{http://www.mysql.com/downloads/mysql-3.23.html}.
@xref{Windows installation}. @xref{Windows installation}.
...@@ -31997,7 +32054,7 @@ option. @xref{InnoDB start}. ...@@ -31997,7 +32054,7 @@ option. @xref{InnoDB start}.
To get better performance for BDB tables, you should add some configuration To get better performance for BDB tables, you should add some configuration
options for these too. @xref{BDB start}. options for these too. @xref{BDB start}.
@code{safe_mysqld} will automaticly try to start any @code{mysqld} binary @code{safe_mysqld} will automatically try to start any @code{mysqld} binary
with the @code{-max} prefix. This makes it very easy to test out a with the @code{-max} prefix. This makes it very easy to test out a
another @code{mysqld} binary in an existing installation. Just another @code{mysqld} binary in an existing installation. Just
run @code{configure} with the options you want and then install the run @code{configure} with the options you want and then install the
...@@ -32006,7 +32063,7 @@ where your old @code{mysqld} binary is. @xref{safe_mysqld}. ...@@ -32006,7 +32063,7 @@ where your old @code{mysqld} binary is. @xref{safe_mysqld}.
The @code{mysqld-max} RPM uses the above mentioned @code{safe_mysqld} The @code{mysqld-max} RPM uses the above mentioned @code{safe_mysqld}
feature. It just installs the @code{mysqld-max} executable and feature. It just installs the @code{mysqld-max} executable and
@code{safe_mysqld} will automaticly use this executable when @code{safe_mysqld} will automatically use this executable when
@code{safe_mysqld} is restarted. @code{safe_mysqld} is restarted.
The following table shows which table types our standard @strong{MySQL-Max} The following table shows which table types our standard @strong{MySQL-Max}
...@@ -32072,9 +32129,9 @@ Size of the core file @code{mysqld} should be able to create. Passed to @code{ul ...@@ -32072,9 +32129,9 @@ Size of the core file @code{mysqld} should be able to create. Passed to @code{ul
Path to @code{mysqld} Path to @code{mysqld}
@item --log=path @item --log=path
@item --mysqld=mysqld-version @item --mysqld=mysqld-version
Name of the mysqld version in the @code{ledir} directory you want to start. Name of the @code{mysqld} version in the @code{ledir} directory you want to start.
@item --mysqld-version=version @item --mysqld-version=version
Similar to @code{--mysqld=} but here you only give the suffix for mysqld. Similar to @code{--mysqld=} but here you only give the suffix for @code{mysqld}.
For example if you use @code{--mysqld-version=max}, @code{safe_mysqld} will For example if you use @code{--mysqld-version=max}, @code{safe_mysqld} will
start the @code{ledir/mysqld-max} version. If the argument to start the @code{ledir/mysqld-max} version. If the argument to
@code{--mysqld-version} is empty, @code{ledir/mysqld} will be used. @code{--mysqld-version} is empty, @code{ledir/mysqld} will be used.
...@@ -32710,7 +32767,7 @@ The current @code{mysqladmin} supports the following commands: ...@@ -32710,7 +32767,7 @@ The current @code{mysqladmin} supports the following commands:
@item flush-privileges @tab Reload grant tables (same as reload). @item flush-privileges @tab Reload grant tables (same as reload).
@item kill id,id,... @tab Kill mysql threads. @item kill id,id,... @tab Kill mysql threads.
@item password @tab New-password. Change old password to new-password. @item password @tab New-password. Change old password to new-password.
@item ping @tab Check if mysqld is alive. @item ping @tab Check if @code{mysqld} is alive.
@item processlist @tab Show list of active threads in server. @item processlist @tab Show list of active threads in server.
@item reload @tab Reload grant tables. @item reload @tab Reload grant tables.
@item refresh @tab Flush all tables and close and open logfiles. @item refresh @tab Flush all tables and close and open logfiles.
...@@ -32754,9 +32811,9 @@ The @code{mysqladmin status} command result has the following columns: ...@@ -32754,9 +32811,9 @@ The @code{mysqladmin status} command result has the following columns:
@cindex open tables @cindex open tables
@item Open tables @tab Number of tables that are open now. @item Open tables @tab Number of tables that are open now.
@cindex memory use @cindex memory use
@item Memory in use @tab Memory allocated directly by the mysqld code (only available when @strong{MySQL} is compiled with --with-debug=full). @item Memory in use @tab Memory allocated directly by the @code{mysqld} code (only available when @strong{MySQL} is compiled with --with-debug=full).
@cindex max memory used @cindex max memory used
@item Max memory used @tab Maximum memory allocated directly by the mysqld code (only available when @strong{MySQL} is compiled with --with-debug=full). @item Max memory used @tab Maximum memory allocated directly by the @code{mysqld} code (only available when @strong{MySQL} is compiled with --with-debug=full).
@end multitable @end multitable
If you do @code{myslqadmin shutdown} on a socket (in other words, on a If you do @code{myslqadmin shutdown} on a socket (in other words, on a
...@@ -33016,8 +33073,8 @@ Flush logs once all tables are locked. ...@@ -33016,8 +33073,8 @@ Flush logs once all tables are locked.
Temporary directory (instead of /tmp). Temporary directory (instead of /tmp).
@end table @end table
You can use 'perldoc mysqlhotcopy' to get a more complete documentation for You can use @code{perldoc mysqlhotcopy} to get a more complete
@code{mysqlhotcopy}. documentation for @code{mysqlhotcopy}.
@code{mysqlhotcopy} reads the groups @code{[client]} and @code{[mysqlhotcopy]} @code{mysqlhotcopy} reads the groups @code{[client]} and @code{[mysqlhotcopy]}
from the option files. from the option files.
...@@ -33742,7 +33799,7 @@ myisamchk: warning: 1 clients is using or hasn't closed the table properly ...@@ -33742,7 +33799,7 @@ myisamchk: warning: 1 clients is using or hasn't closed the table properly
@end example @end example
This means that you are trying to check a table that has been updated by This means that you are trying to check a table that has been updated by
the another program (like the mysqld server) that hasn't yet closed the another program (like the @code{mysqld} server) that hasn't yet closed
the file or that has died without closing the file properly. the file or that has died without closing the file properly.
If you @code{mysqld} is running, you must force a sync/close of all If you @code{mysqld} is running, you must force a sync/close of all
...@@ -34611,7 +34668,7 @@ Run @code{myisamchk *.MYI} or @code{myisamchk -e *.MYI} if you have ...@@ -34611,7 +34668,7 @@ Run @code{myisamchk *.MYI} or @code{myisamchk -e *.MYI} if you have
more time. Use the @code{-s} (silent) option to suppress unnecessary more time. Use the @code{-s} (silent) option to suppress unnecessary
information. information.
If the mysqld server is done you should use the --update option to tell If the @code{mysqld} server is done you should use the --update option to tell
@code{myisamchk} to mark the table as 'checked'. @code{myisamchk} to mark the table as 'checked'.
You have to repair only those tables for which @code{myisamchk} announces an You have to repair only those tables for which @code{myisamchk} announces an
...@@ -34853,12 +34910,12 @@ operating system must support dynamic loading. The @strong{MySQL} source ...@@ -34853,12 +34910,12 @@ operating system must support dynamic loading. The @strong{MySQL} source
distribution includes a file @file{sql/udf_example.cc} that defines 5 new distribution includes a file @file{sql/udf_example.cc} that defines 5 new
functions. Consult this file to see how UDF calling conventions work. functions. Consult this file to see how UDF calling conventions work.
For mysqld to be able to use UDF functions, you should configure MySQL For @code{mysqld} to be able to use UDF functions, you should configure MySQL
with @code{--with-mysqld-ldflags=-rdynamic} The reason is that to on with @code{--with-mysqld-ldflags=-rdynamic} The reason is that to on
many platforms (including Linux) you can load a dynamic library (with many platforms (including Linux) you can load a dynamic library (with
@code{dlopen()}) from a static linked program, which you would get if @code{dlopen()}) from a static linked program, which you would get if
you are using @code{--with-mysqld-ldflags=-all-static} If you want to you are using @code{--with-mysqld-ldflags=-all-static} If you want to
use an UDF that needs to access symbols from mysqld (like the use an UDF that needs to access symbols from @code{mysqld} (like the
@code{methaphone} example in @file{sql/udf_example.cc} that uses @code{methaphone} example in @file{sql/udf_example.cc} that uses
@code{default_charset_info}), you must link the program with @code{default_charset_info}), you must link the program with
@code{-rdynamic}. (see @code{man dlopen}). @code{-rdynamic}. (see @code{man dlopen}).
...@@ -35443,7 +35500,7 @@ most of the Unix ODBC managers. You can find a list at these in the ...@@ -35443,7 +35500,7 @@ most of the Unix ODBC managers. You can find a list at these in the
@strong{ODBC}-related links section on the @strong{MySQL} useful links page. @strong{ODBC}-related links section on the @strong{MySQL} useful links page.
@xref{Useful Links}. @xref{Useful Links}.
To install @strong{MyODBC} on windows, you should download the To install @strong{MyODBC} on Windows, you should download the
appropriate @strong{MyODBC} .zip file (for Windows or NT/Win2000), appropriate @strong{MyODBC} .zip file (for Windows or NT/Win2000),
unpack it with @code{WINZIP}, or some similar program, and execute the unpack it with @code{WINZIP}, or some similar program, and execute the
@code{SETUP.EXE} file. @code{SETUP.EXE} file.
...@@ -35570,18 +35627,18 @@ through the @code{InConnectionString} argument in the ...@@ -35570,18 +35627,18 @@ through the @code{InConnectionString} argument in the
@multitable @columnfractions .2 .2 .6 @multitable @columnfractions .2 .2 .6
@item @strong{Parameter} @tab @strong{Default value} @tab @strong{Comment} @item @strong{Parameter} @tab @strong{Default value} @tab @strong{Comment}
@item user @tab ODBC (on windows) @tab The username used to connect to @strong{MySQL}. @item user @tab ODBC (on Windows) @tab The username used to connect to @strong{MySQL}.
@item server @tab localhost @tab The hostname of the @strong{MySQL} server. @item server @tab localhost @tab The hostname of the @strong{MySQL} server.
@item database @tab @tab The default database @item database @tab @tab The default database
@item option @tab 0 @tab A integer by which you can specify how @strong{MyODBC} should work. See below. @item option @tab 0 @tab A integer by which you can specify how @strong{MyODBC} should work. See below.
@item port @tab 3306 @tab The TCP/IP port to use if @code{server} is not @code{localhost}. @item port @tab 3306 @tab The TCP/IP port to use if @code{server} is not @code{localhost}.
@item stmt @tab @tab A statement that will be executed when connection to @code{MySQL}. @item stmt @tab @tab A statement that will be executed when connection to @code{MySQL}.
@item password @tab @tab The password for the @code{server} @code{user} combination. @item password @tab @tab The password for the @code{server} @code{user} combination.
@item socket @tab @tab The socket or windows pipe to connect to. @item socket @tab @tab The socket or Windows pipe to connect to.
@end multitable @end multitable
The option argument is used to tell @strong{MyODBC} that the client isn't 100% The option argument is used to tell @strong{MyODBC} that the client isn't 100%
ODBC compliant. On windows, one normally sets the option flag by ODBC compliant. On Windows, one normally sets the option flag by
toggling the different options on the connection screen but one can also toggling the different options on the connection screen but one can also
set this in the opton argument. The following options are listed in the set this in the opton argument. The following options are listed in the
same order as they appear in the @strong{MyODBC} connect screen: same order as they appear in the @strong{MyODBC} connect screen:
...@@ -35601,10 +35658,10 @@ same order as they appear in the @strong{MyODBC} connect screen: ...@@ -35601,10 +35658,10 @@ same order as they appear in the @strong{MyODBC} connect screen:
@item 1024 @tab SQLDescribeCol() will return fully qualifed column names @item 1024 @tab SQLDescribeCol() will return fully qualifed column names
@item 2048 @tab Use the compressed server/client protocol @item 2048 @tab Use the compressed server/client protocol
@item 4096 @tab Tell server to ignore space after function name and before @code{'('} (needed by PowerBuilder). This will make all function names keywords! @item 4096 @tab Tell server to ignore space after function name and before @code{'('} (needed by PowerBuilder). This will make all function names keywords!
@item 8192 @tab Connect with named pipes to a mysqld server running on NT. @item 8192 @tab Connect with named pipes to a @code{mysqld} server running on NT.
@item 16384 @tab Change LONGLONG columns to INT columns (Some applications can't handle LONGLONG). @item 16384 @tab Change LONGLONG columns to INT columns (Some applications can't handle LONGLONG).
@item 32768 @tab Return 'user' as Table_qualifier and Table_owner from SQLTables (experimental) @item 32768 @tab Return 'user' as Table_qualifier and Table_owner from SQLTables (experimental)
@item 65536 @tab Read parameters from the @code{client} and @code{odbc} groups from @code{my.cnf} @item 65536 @tab Read parameters from the @code{client} and @code{odbc} groups from @file{my.cnf}
@item 131072 @tab Add some extra safety checks (should not bee needed but...) @item 131072 @tab Add some extra safety checks (should not bee needed but...)
@end multitable @end multitable
...@@ -35822,7 +35879,7 @@ For example, create a db with a table containing 2 columns of text: ...@@ -35822,7 +35879,7 @@ For example, create a db with a table containing 2 columns of text:
@itemize @bullet @itemize @bullet
@item @item
Insert rows using the mysql client command-line tool. Insert rows using the @code{mysql} client command-line tool.
@item @item
Create a DSN file using the MyODBC driver, for example, my for the db above. Create a DSN file using the MyODBC driver, for example, my for the db above.
@item @item
...@@ -36071,8 +36128,8 @@ FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' ESCAPED BY '\\' ...@@ -36071,8 +36128,8 @@ FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' ESCAPED BY '\\'
@node Borland C++, , Apache, Common programs @node Borland C++, , Apache, Common programs
@section Borland C++ @section Borland C++
You can compile the @strong{MySQL} windows source with Borland C++ 5.02. You can compile the @strong{MySQL} Windows source with Borland C++ 5.02.
(The windows source includes only projects for Microsoft VC++, for (The Windows source includes only projects for Microsoft VC++, for
Borland C++ you have to do the project files yourself). Borland C++ you have to do the project files yourself).
One known problem with Borland C++ is that it uses a different structure One known problem with Borland C++ is that it uses a different structure
...@@ -36245,7 +36302,7 @@ files. @strong{MySQL} will update the data on disk, with the ...@@ -36245,7 +36302,7 @@ files. @strong{MySQL} will update the data on disk, with the
@code{write()} system call, after every SQL statement and before the @code{write()} system call, after every SQL statement and before the
client is notified about the result. (This is not true if you are running client is notified about the result. (This is not true if you are running
with @code{delayed_key_writes}, in which case only the data is written.) with @code{delayed_key_writes}, in which case only the data is written.)
This means that the data is safe even if mysqld crashes, as the OS will This means that the data is safe even if @code{mysqld} crashes, as the OS will
ensure that the not flushed data is written to disk. You can force ensure that the not flushed data is written to disk. You can force
@strong{MySQL} to sync everything to disk after every SQL command by @strong{MySQL} to sync everything to disk after every SQL command by
starting @code{mysqld} with @code{--flush}. starting @code{mysqld} with @code{--flush}.
...@@ -36269,7 +36326,7 @@ the @code{lockd} daemon ) or if you are running ...@@ -36269,7 +36326,7 @@ the @code{lockd} daemon ) or if you are running
multiple servers with @code{--skip-locking} multiple servers with @code{--skip-locking}
@item @item
You have a crashed index/data file that contains very wrong data that You have a crashed index/data file that contains very wrong data that
got mysqld confused. got @code{mysqld} confused.
@item @item
You have found a bug in the data storage code. This isn't that likely, You have found a bug in the data storage code. This isn't that likely,
but it's at least possible. In this case you can try to change the file but it's at least possible. In this case you can try to change the file
...@@ -36514,7 +36571,7 @@ The most common reason for the @code{MySQL server has gone away} error ...@@ -36514,7 +36571,7 @@ The most common reason for the @code{MySQL server has gone away} error
is that the server timed out and closed the connection. By default, the is that the server timed out and closed the connection. By default, the
server closes the connection after 8 hours if nothing has happened. You server closes the connection after 8 hours if nothing has happened. You
can change the time limit by setting the @code{wait_timeout} variable when can change the time limit by setting the @code{wait_timeout} variable when
you start mysqld. you start @code{mysqld}.
Another common reason to receive the @code{MySQL server has gone away} error Another common reason to receive the @code{MySQL server has gone away} error
is because you have issued a ``close'' on your @strong{MySQL} connection is because you have issued a ``close'' on your @strong{MySQL} connection
...@@ -36664,7 +36721,7 @@ remote host: Connection refused}, then there is no server running on the ...@@ -36664,7 +36721,7 @@ remote host: Connection refused}, then there is no server running on the
given port. given port.
@item @item
Try connecting to the @code{mysqld} daemon on the local machine and check Try connecting to the @code{mysqld} daemon on the local machine and check
the TCP/IP port that mysqld it's configured to use (variable @code{port}) with the TCP/IP port that @code{mysqld} it's configured to use (variable @code{port}) with
@code{mysqladmin variables}. @code{mysqladmin variables}.
@item @item
Check that your @code{mysqld} server is not started with the Check that your @code{mysqld} server is not started with the
...@@ -36886,7 +36943,7 @@ Can't create/write to file '\\sqla3fe_0.ism'. ...@@ -36886,7 +36943,7 @@ Can't create/write to file '\\sqla3fe_0.ism'.
this means that @strong{MySQL} can't create a temporary file for the this means that @strong{MySQL} can't create a temporary file for the
result set in the given temporary directory. (The above error is a result set in the given temporary directory. (The above error is a
typical error message on Windows, and the Unix error message is similar.) typical error message on Windows, and the Unix error message is similar.)
The fix is to start mysqld with @code{--tmpdir=path} or to add to your option The fix is to start @code{mysqld} with @code{--tmpdir=path} or to add to your option
file: file:
@example @example
...@@ -37224,7 +37281,7 @@ can restore it with the following procedure: ...@@ -37224,7 +37281,7 @@ can restore it with the following procedure:
@enumerate @enumerate
@item @item
Take down the mysqld server by sending a @code{kill} (not @code{kill Take down the @code{mysqld} server by sending a @code{kill} (not @code{kill
-9}) to the @code{mysqld} server. The pid is stored in a @code{.pid} -9}) to the @code{mysqld} server. The pid is stored in a @code{.pid}
file, which is normally in the @strong{MySQL} database directory: file, which is normally in the @strong{MySQL} database directory:
...@@ -37238,7 +37295,7 @@ runs as to do this. ...@@ -37238,7 +37295,7 @@ runs as to do this.
@item @item
Restart @code{mysqld} with the @code{--skip-grant-tables} option. Restart @code{mysqld} with the @code{--skip-grant-tables} option.
@item @item
Connect to the mysqld server with @code{mysql -h hostname mysql} and change Connect to the @code{mysqld} server with @code{mysql -h hostname mysql} and change
the password with a @code{GRANT} command. @xref{GRANT,,@code{GRANT}}. the password with a @code{GRANT} command. @xref{GRANT,,@code{GRANT}}.
You can also do this with You can also do this with
@code{mysqladmin -h hostname -u user password 'new password'} @code{mysqladmin -h hostname -u user password 'new password'}
...@@ -38034,20 +38091,20 @@ home directory. @xref{Option files}. ...@@ -38034,20 +38091,20 @@ home directory. @xref{Option files}.
@node Log files, Clients, Common problems, Top @node Log files, Clients, Common problems, Top
@chapter The MySQL log files @chapter The MySQL log files
@strong{MySQL} has a lot of different log files which can help you find @strong{MySQL} has several different log files that can help you find
out what's going on inside @code{mysqld}: out what's going on inside @code{mysqld}:
@multitable @columnfractions .3 .7 @multitable @columnfractions .3 .7
@item The error log @tab Problems encountering starting, running or stopping mysqld. @item The error log @tab Problems encountering starting, running or stopping @code{mysqld}.
@item The isam log @tab Logs all changes to the ISAM tables. Used only for debugging the isam code. @item The isam log @tab Logs all changes to the ISAM tables. Used only for debugging the isam code.
@item The query log @tab Established connections and executed queries. @item The query log @tab Established connections and executed queries.
@item The update log @tab Depricated: Stores all statements that changes data @item The update log @tab Deprecated: Stores all statements that changes data
@item The binary log @tab Stores all statements that changes something. Used also for replication @item The binary log @tab Stores all statements that changes something. Used also for replication
@item The slow log @tab Stores all queries that took more than @code{long_query_time} to execute or didn't use indexes. @item The slow log @tab Stores all queries that took more than @code{long_query_time} to execute or didn't use indexes.
@end multitable @end multitable
All logs can be found in the @code{mysqld} database directory. You can All logs can be found in the @code{mysqld} data directory. You can
tell force mysqld to switch to reopen the log files (or in some cases force @code{mysqld} to reopen the log files (or in some cases
switch to a new log) by executing @code{FLUSH LOGS}. @xref{FLUSH}. switch to a new log) by executing @code{FLUSH LOGS}. @xref{FLUSH}.
@cindex error log @cindex error log
...@@ -38065,19 +38122,19 @@ switch to a new log) by executing @code{FLUSH LOGS}. @xref{FLUSH}. ...@@ -38065,19 +38122,19 @@ switch to a new log) by executing @code{FLUSH LOGS}. @xref{FLUSH}.
@code{mysqld} writes all errors to the stderr, which the @code{mysqld} writes all errors to the stderr, which the
@code{safe_mysqld} script redirects to a file called @code{safe_mysqld} script redirects to a file called
@code{'hostname'.err}. (On windows @code{mysqld} writes this directly @code{'hostname'.err}. (On Windows, @code{mysqld} writes this directly
to @file{mysql.err}). to @file{mysql.err}).
This contains information on when mysqld was started and stopped and This contains information indicating when @code{mysqld} was started and
also any critical errors found when running. If @code{mysqld} dies stopped and also any critical errors found when running. If @code{mysqld}
unexpectedly and @code{safe_mysqld} needs to restart @code{mysqld}, dies unexpectedly and @code{safe_mysqld} needs to restart @code{mysqld},
@code{safe_mysqld} will write a @code{restarted mysqld} row in this @code{safe_mysqld} will write a @code{restarted mysqld} row in this
file. This log also holds a warning if @code{mysqld} notices a table file. This log also holds a warning if @code{mysqld} notices a table
that needs to be automatically checked or repaired. that needs to be automatically checked or repaired.
On some operating systems, the error log will contain a stack trace On some operating systems, the error log will contain a stack trace
for where mysqld died. This can be used to find out where mysqld died. for where @code{mysqld} died. This can be used to find out where
@xref{Using stack trace}. @code{mysqld} died. @xref{Using stack trace}.
@cindex query log @cindex query log
@cindex files, query log @cindex files, query log
...@@ -38086,9 +38143,9 @@ for where mysqld died. This can be used to find out where mysqld died. ...@@ -38086,9 +38143,9 @@ for where mysqld died. This can be used to find out where mysqld died.
If you want to know what happens within @code{mysqld}, you should start If you want to know what happens within @code{mysqld}, you should start
it with @code{--log[=file]}. This will log all connections and queries it with @code{--log[=file]}. This will log all connections and queries
to the log file (by default named 'hostname.log'). This log can to the log file (by default named @file{'hostname'.log}). This log can
be very useful when you suspect an error in a client and want to know be very useful when you suspect an error in a client and want to know
exactly what @code{mysqld} thought the client send to it. exactly what @code{mysqld} thought the client sent to it.
By default, the @code{mysql.server} script starts the @strong{MySQL} By default, the @code{mysql.server} script starts the @strong{MySQL}
server with the @code{-l} option. If you need better performance when server with the @code{-l} option. If you need better performance when
...@@ -38098,7 +38155,7 @@ remove the @code{-l} option from @code{mysql.server} or change it to ...@@ -38098,7 +38155,7 @@ remove the @code{-l} option from @code{mysql.server} or change it to
The entries in this log are written as @code{mysqld} receives the questions. The entries in this log are written as @code{mysqld} receives the questions.
This may be different than the order in which the statements are executed. This may be different than the order in which the statements are executed.
This is in contrast to the update log and the binary log which is written This is in contrast to the update log and the binary log which are written
after the query is executed, but before any locks are released. after the query is executed, but before any locks are released.
@cindex update log @cindex update log
...@@ -38694,7 +38751,7 @@ Retrieves a complete result set to the client. ...@@ -38694,7 +38751,7 @@ Retrieves a complete result set to the client.
Returns the current thread ID. Returns the current thread ID.
@item @strong{mysql_thread_save()} @tab @item @strong{mysql_thread_save()} @tab
Returns 1 if the clients are compiled as threadsafe. Returns 1 if the clients are compiled as thread-safe.
@item @strong{mysql_use_result()} @tab @item @strong{mysql_use_result()} @tab
Initiates a row-by-row result set retrieval. Initiates a row-by-row result set retrieval.
...@@ -41051,7 +41108,7 @@ the socket handling should be thread safe. ...@@ -41051,7 +41108,7 @@ the socket handling should be thread safe.
In the older binaries we distribute on our Web site, the client In the older binaries we distribute on our Web site, the client
libraries are not normally compiled with the thread-safe option (the libraries are not normally compiled with the thread-safe option (the
windows binaries are by default compiled to be thread safe). Windows binaries are by default compiled to be thread safe).
Newer binary distributions should have both a normal and a Newer binary distributions should have both a normal and a
thread-safe client library. thread-safe client library.
...@@ -42248,7 +42305,7 @@ Normally, @code{PostgreSQL} is a magnitude slower than @strong{MySQL}. ...@@ -42248,7 +42305,7 @@ Normally, @code{PostgreSQL} is a magnitude slower than @strong{MySQL}.
transaction-safe tables and that their transactions system is not as transaction-safe tables and that their transactions system is not as
sophisticated as Berkeley DB's. In @strong{MySQL} you can decide per sophisticated as Berkeley DB's. In @strong{MySQL} you can decide per
table if you want the table to be fast or take the speed penalty of table if you want the table to be fast or take the speed penalty of
making it transaction safe. making it transaction-safe.
The most important things that @code{PostgreSQL} supports that @strong{MySQL} The most important things that @code{PostgreSQL} supports that @strong{MySQL}
doesn't yet support: doesn't yet support:
...@@ -42486,9 +42543,9 @@ pass the test suite ! ...@@ -42486,9 +42543,9 @@ pass the test suite !
If you get an error, like @code{Result length mismatch} or @code{Result If you get an error, like @code{Result length mismatch} or @code{Result
content mismatch} it means that the output of the test didn't match content mismatch} it means that the output of the test didn't match
exactly the expected output. This could be a bug in @strong{MySQL} or exactly the expected output. This could be a bug in @strong{MySQL} or
that your mysqld version produces slight different results under some that your @code{mysqld} version produces slightly different results under some
circumstances. In this case you should compare the @code{.test} circumstances. In this case, you should compare the @file{.test}
and @code{.reject} file in the @code{mysql-test/r} sub directory to and @file{.reject} file in the @file{mysql-test/r} sub directory to
see if this is something to worry about. see if this is something to worry about.
@item @item
...@@ -42575,7 +42632,7 @@ variables to modify the behavior of @strong{MySQL}. @xref{Option files}. ...@@ -42575,7 +42632,7 @@ variables to modify the behavior of @strong{MySQL}. @xref{Option files}.
@item @code{MYSQL_DEBUG} @tab Debug-trace options when debugging. @item @code{MYSQL_DEBUG} @tab Debug-trace options when debugging.
@item @code{MYSQL_HISTFILE} @tab The path to the @code{mysql} history file. @item @code{MYSQL_HISTFILE} @tab The path to the @code{mysql} history file.
@item @code{MYSQL_HOST} @tab Default host name used by the @code{mysql} command-line prompt. @item @code{MYSQL_HOST} @tab Default host name used by the @code{mysql} command-line prompt.
@item @code{MYSQL_PWD} @tab The default password when connecting to mysqld. Note that use of this is insecure! @item @code{MYSQL_PWD} @tab The default password when connecting to @code{mysqld}. Note that use of this is insecure!
@item @code{MYSQL_TCP_PORT} @tab The default TCP/IP port. @item @code{MYSQL_TCP_PORT} @tab The default TCP/IP port.
@item @code{MYSQL_UNIX_PORT} @tab The default socket; used for connections to @code{localhost}. @item @code{MYSQL_UNIX_PORT} @tab The default socket; used for connections to @code{localhost}.
@item @code{PATH} @tab Used by the shell to finds the @strong{MySQL} programs. @item @code{PATH} @tab Used by the shell to finds the @strong{MySQL} programs.
...@@ -42863,6 +42920,8 @@ Ecommerce site that is selling computers. ...@@ -42863,6 +42920,8 @@ Ecommerce site that is selling computers.
@item @uref{http://www.berkeleyconsultants.com, Berkeley Consultants Group} @item @uref{http://www.berkeleyconsultants.com, Berkeley Consultants Group}
@item @uref{http://www.jammconsulting.com/, JAMM Consulting Inc.}
@end itemize @end itemize
@appendixsec Programming @appendixsec Programming
...@@ -43311,7 +43370,7 @@ You can always find the latest version ...@@ -43311,7 +43370,7 @@ You can always find the latest version
@uref{http://www.trash.net/~ffischer/admin/index.html, here}. @uref{http://www.trash.net/~ffischer/admin/index.html, here}.
@item @uref{http://www.mysql.com/Downloads/Win32/MySQL-Maker-1.0.zip,MySQL-Maker 1.0}. @item @uref{http://www.mysql.com/Downloads/Win32/MySQL-Maker-1.0.zip,MySQL-Maker 1.0}.
Shareware @strong{MySQL} client for windows. It's WYSIWYG tool which allows Shareware @strong{MySQL} client for Windows. It's WYSIWYG tool which allows
you to create, change and delete databases and tables. you to create, change and delete databases and tables.
You can change field - structure and add, change and delete data in You can change field - structure and add, change and delete data in
these tables directly without ODBC-driver. these tables directly without ODBC-driver.
...@@ -43422,7 +43481,7 @@ newest version from @uref{http://civeng.com/sqldemo/, the home site}. ...@@ -43422,7 +43481,7 @@ newest version from @uref{http://civeng.com/sqldemo/, the home site}.
@item @uref{http://www.mysql.com/Downloads/Contrib/myadmin-0.4.tar.gz, myadmin-0.4.tar.gz}. @item @uref{http://www.mysql.com/Downloads/Contrib/myadmin-0.4.tar.gz, myadmin-0.4.tar.gz}.
@item @uref{http://myadmin.cheapnet.net/, MyAdmin home page} @item @uref{http://myadmin.cheapnet.net/, MyAdmin home page}
A Web-based mysql administrator by Mike Machado. A Web-based @strong{MySQL} administrator by Mike Machado.
@item @uref{http://www.mysql.com/Downloads/Contrib/phpMyAdmin_2.0.1.tar.gz,phpMyAdmin_2.0.1.tar.gz} @item @uref{http://www.mysql.com/Downloads/Contrib/phpMyAdmin_2.0.1.tar.gz,phpMyAdmin_2.0.1.tar.gz}
A set of PHP3-scripts to adminstrate @strong{MySQL} over the WWW. A set of PHP3-scripts to adminstrate @strong{MySQL} over the WWW.
...@@ -43658,6 +43717,8 @@ bit different (that is - fields in different order, etc.). ...@@ -43658,6 +43717,8 @@ bit different (that is - fields in different order, etc.).
By Steve Shreeve. By Steve Shreeve.
@item @uref{http://www.mysql.com/Downloads/Contrib/oracledump, oracledump} @item @uref{http://www.mysql.com/Downloads/Contrib/oracledump, oracledump}
Perl program to convert Oracle databases to @strong{MySQL}. By Johan Andersson. Perl program to convert Oracle databases to @strong{MySQL}. By Johan Andersson.
@item @uref{http://www.mysql.com/Downloads/Contrib/excel2mysql, excel2mysql}
Perl program to import Excel spreadsheets into a @strong{MySQL} database. By Stephen Hurd @email{shurd@@sk.sympatico.ca}
@end itemize @end itemize
@appendixsec Using MySQL with Other Products @appendixsec Using MySQL with Other Products
...@@ -44352,10 +44413,10 @@ releases of 3.23 with small fixes for this part of the code. As long as ...@@ -44352,10 +44413,10 @@ releases of 3.23 with small fixes for this part of the code. As long as
you don't use these features, you should be quite safe with you don't use these features, you should be quite safe with
@strong{MySQL} 3.23! @strong{MySQL} 3.23!
Note that the above doesn't mean that replication or Berkeley DB doesn't Note that the above doesn't mean that replication or Berkeley DB don't
work; We have done a lot of testing of all code, including replication work; We have done a lot of testing of all code, including replication
and BDB without finding any problems. It only means that not as many and BDB without finding any problems. It only means that not as many
users uses this code as the rest of the code and because of this we are users use this code as the rest of the code and because of this we are
not yet 100% confident in this code. not yet 100% confident in this code.
@menu @menu
...@@ -44406,6 +44467,8 @@ not yet 100% confident in this code. ...@@ -44406,6 +44467,8 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.39 @appendixsubsec Changes in release 3.23.39
@itemize @bullet @itemize @bullet
@item @item
Extended argument length in option files from 256 to 512 chars.
@item
Fixed problem with shutdown when @code{INSERT DELAYED} was waiting for Fixed problem with shutdown when @code{INSERT DELAYED} was waiting for
a @code{LOCK TABLE}. a @code{LOCK TABLE}.
@item @item
...@@ -44434,8 +44497,8 @@ Added option @code{--skip-stack-trace} to @code{mysqld}. ...@@ -44434,8 +44497,8 @@ Added option @code{--skip-stack-trace} to @code{mysqld}.
@item @item
Added option @code{CONCURRENT} to @code{LOAD DATA}. Added option @code{CONCURRENT} to @code{LOAD DATA}.
@item @item
Better error message when slave @code{max_allowed_packet} is to low to Better error message when slave @code{max_allowed_packet} is too low to
read a very long log event from the master read a very long log event from the master.
@item @item
Fixed bug when too many rows where removed when using Fixed bug when too many rows where removed when using
@code{SELECT DISTINCT ... HAVING}. @code{SELECT DISTINCT ... HAVING}.
...@@ -44746,12 +44809,13 @@ Fixed creation of @code{MERGE} tables on Windows. ...@@ -44746,12 +44809,13 @@ Fixed creation of @code{MERGE} tables on Windows.
@item @item
Portability fixes for OpenBSD and OS2. Portability fixes for OpenBSD and OS2.
@item @item
Added --temp-pool option to mysqld. Using this option will cause most Added @code{--temp-pool} option to @code{mysqld}. Using this option
temporary files created to use a small set of names, rather than a unique will cause most temporary files created to use a small set of names,
name for each new file. This is to work around a problem in the Linux rather than a unique name for each new file. This is to work around a
kernel dealing with creating a bunch of new files with different names. problem in the Linux kernel dealing with creating a bunch of new files
With the old behavior, Linux seems to "leak" memory, as it's being allocated with different names. With the old behavior, Linux seems to "leak"
to the directory entry cache instead of the disk cache. memory, as it's being allocated to the directory entry cache instead of
the disk cache.
@end itemize @end itemize
@node News-3.23.32, News-3.23.31, News-3.23.33, News-3.23.x @node News-3.23.32, News-3.23.31, News-3.23.33, News-3.23.x
...@@ -44785,7 +44849,7 @@ Added @code{--with-version-suffix} to @code{configure}. ...@@ -44785,7 +44849,7 @@ Added @code{--with-version-suffix} to @code{configure}.
@item @item
Fixed coredump when client aborted connection without @code{mysql_close()}. Fixed coredump when client aborted connection without @code{mysql_close()}.
@item @item
Fixed a bug in @code{RESTORE TABLE} when trying to restore from a non-existant Fixed a bug in @code{RESTORE TABLE} when trying to restore from a non-existent
directory. directory.
@item @item
Fixed a bug which caused a core dump on the slave when replicating Fixed a bug which caused a core dump on the slave when replicating
...@@ -45138,7 +45202,7 @@ Added @code{PURGE MASTER LOGS TO}. ...@@ -45138,7 +45202,7 @@ Added @code{PURGE MASTER LOGS TO}.
@item @item
Added @code{SHOW MASTER LOGS}. Added @code{SHOW MASTER LOGS}.
@item @item
Added @code{--safemalloc-mem-limit} option to mysqld to simulate memory Added @code{--safemalloc-mem-limit} option to @code{mysqld} to simulate memory
shortage when compiled @code{--with-debug=full}. shortage when compiled @code{--with-debug=full}.
@item @item
Fixed several coredumps in out-of-memory conditions. Fixed several coredumps in out-of-memory conditions.
...@@ -45295,7 +45359,7 @@ The slave now logs when it connects to the master. ...@@ -45295,7 +45359,7 @@ The slave now logs when it connects to the master.
Fixed a core dump bug when doing @code{FLUSH MASTER} if you didn't specify Fixed a core dump bug when doing @code{FLUSH MASTER} if you didn't specify
a filename argument to @code{--log-bin}. a filename argument to @code{--log-bin}.
@item @item
Added missing @file{ha_berkeley.x} files to the @strong{MySQL} windows Added missing @file{ha_berkeley.x} files to the @strong{MySQL} Windows
@item @item
Fixed some mutex bugs in the log code that could cause thread blocks if new Fixed some mutex bugs in the log code that could cause thread blocks if new
log files couldn't be created. log files couldn't be created.
...@@ -45838,13 +45902,13 @@ Added @code{CHECK TABLE} command. ...@@ -45838,13 +45902,13 @@ Added @code{CHECK TABLE} command.
Added changes for MyISAM in 3.23.12 that didn't get into the source Added changes for MyISAM in 3.23.12 that didn't get into the source
distribution because of CVS problems. distribution because of CVS problems.
@item @item
Fixed bug so that mysqladmin shutdown will wait for the local server to close Fixed bug so that @code{mysqladmin shutdown} will wait for the local server
down. to close down.
@item @item
Fixed a possible endless loop when calculating timestamp. Fixed a possible endless loop when calculating timestamp.
@item @item
Added print_defaults to the .rpm files. Removed mysqlbug from the client Added @code{print_defaults} to the @file{.rpm} files. Removed @code{mysqlbug}
rpm file. from the client @file{.rpm} file.
@end itemize @end itemize
@node News-3.23.12, News-3.23.11, News-3.23.13, News-3.23.x @node News-3.23.12, News-3.23.11, News-3.23.13, News-3.23.x
...@@ -46082,7 +46146,7 @@ FROM pos)}, @code{SUBSTRING_INDEX(str,delim,count)}, @code{RTRIM(str)}, ...@@ -46082,7 +46146,7 @@ FROM pos)}, @code{SUBSTRING_INDEX(str,delim,count)}, @code{RTRIM(str)},
@code{INSERT(str,pos,len,newstr)}, @code{LCASE(str)}, @code{LOWER(str)}, @code{INSERT(str,pos,len,newstr)}, @code{LCASE(str)}, @code{LOWER(str)},
@code{UCASE(str)} and @code{UPPER(str)}; Patch by Wei He. @code{UCASE(str)} and @code{UPPER(str)}; Patch by Wei He.
@item @item
Fix core dump when releasing a lock from a non-existant table. Fix core dump when releasing a lock from a non-existent table.
@item @item
Remove locks on tables before starting to remove duplicates. Remove locks on tables before starting to remove duplicates.
@item @item
...@@ -46113,7 +46177,7 @@ users to force table names to lowercase. ...@@ -46113,7 +46177,7 @@ users to force table names to lowercase.
@item @item
Added @code{SELECT ... INTO DUMPFILE}. Added @code{SELECT ... INTO DUMPFILE}.
@item @item
Added mysqld option @code{--ansi} to make some functions @code{ANSI SQL} Added @code{mysqld} option @code{--ansi} to make some functions @code{ANSI SQL}
compatible. compatible.
@item @item
Temporary tables now starts with @code{#sql}. Temporary tables now starts with @code{#sql}.
...@@ -46590,7 +46654,7 @@ compile all relevant files for 3.22.33 :( ...@@ -46590,7 +46654,7 @@ compile all relevant files for 3.22.33 :(
@appendixsubsec Changes in release 3.22.33 @appendixsubsec Changes in release 3.22.33
@itemize @bullet @itemize @bullet
@item @item
Fixed problems in windows when locking tables with @code{LOCK TABLE} Fixed problems in Windows when locking tables with @code{LOCK TABLE}
@item @item
Quicker kill of @code{SELECT DISTINCT} queries. Quicker kill of @code{SELECT DISTINCT} queries.
@end itemize @end itemize
...@@ -48662,7 +48726,7 @@ specification is automatically removed. ...@@ -48662,7 +48726,7 @@ specification is automatically removed.
New function @code{ASCII()}. New function @code{ASCII()}.
@item @item
Removed function @code{BETWEEN(a,b,c)}. Use the standard ANSI Removed function @code{BETWEEN(a,b,c)}. Use the standard ANSI
synax instead: @code{expr BETWEEN expr AND expr}. syntax instead: @code{expr BETWEEN expr AND expr}.
@item @item
@strong{MySQL} no longer has to use an extra temporary table when sorting @strong{MySQL} no longer has to use an extra temporary table when sorting
on functions or @code{SUM()} functions. on functions or @code{SUM()} functions.
...@@ -49538,13 +49602,13 @@ Because @strong{MySQL} allows you to work with table types that don't ...@@ -49538,13 +49602,13 @@ Because @strong{MySQL} allows you to work with table types that don't
support transactions, and thus can't @code{rollback} data, some things support transactions, and thus can't @code{rollback} data, some things
behave a little differently in @strong{MySQL} than in other SQL servers. behave a little differently in @strong{MySQL} than in other SQL servers.
This is just to ensure that @strong{MySQL} never need to do a rollback This is just to ensure that @strong{MySQL} never need to do a rollback
for a SQL command. This may be a little akward at times as column for a SQL command. This may be a little awkward at times as column
values must be checked in the application, but this will actually give values must be checked in the application, but this will actually give
you a nice speed increase as it allows @strong{MySQL} to do some you a nice speed increase as it allows @strong{MySQL} to do some
optimizations that otherwise would be very hard to do. optimizations that otherwise would be very hard to do.
If you set a column to a wrong value, @strong{MySQL} will, instead of doing If you set a column to an incorrect value, @strong{MySQL} will, instead of
a rollback, store the @code{best possible value} in the column: doing a rollback, store the @code{best possible value} in the column:
@itemize @bullet @itemize @bullet
@item @item
...@@ -49742,13 +49806,13 @@ Fail safe replication. ...@@ -49742,13 +49806,13 @@ Fail safe replication.
Subqueries. Subqueries.
@code{select id from t where grp in (select grp from g where u > 100)} @code{select id from t where grp in (select grp from g where u > 100)}
@item @item
Derieved tables. Derived tables.
@example @example
select a.col1, b.col2 from (select max(col1) as col1 from root_table ) a, select a.col1, b.col2 from (select max(col1) as col1 from root_table ) a,
other_table b where a.col1=b.col1 other_table b where a.col1=b.col1
@end example @end example
This could be done by automaticly create temporary tables for the This could be done by automatically creating temporary tables for the
derived tables for the duration of the query. derived tables for the duration of the query.
@item @item
Add @code{PREPARE} of statements and sending of parameters to @code{mysqld}. Add @code{PREPARE} of statements and sending of parameters to @code{mysqld}.
...@@ -49962,7 +50026,7 @@ Allow update of variables in @code{UPDATE} statements. For example: ...@@ -49962,7 +50026,7 @@ Allow update of variables in @code{UPDATE} statements. For example:
@code{myisamchk}, @code{REPAIR} and @code{OPTIMIZE TABLE} should be able @code{myisamchk}, @code{REPAIR} and @code{OPTIMIZE TABLE} should be able
to handle cases where the data and/or index files are symbolic links. to handle cases where the data and/or index files are symbolic links.
@item @item
Add simulation of @code{pread()}/@code{pwrite()} on windows to enable Add simulation of @code{pread()}/@code{pwrite()} on Windows to enable
concurrent inserts. concurrent inserts.
@item @item
A logfile analyzer that could parsed out information about which tables A logfile analyzer that could parsed out information about which tables
...@@ -50175,7 +50239,7 @@ will ensure that your thread installation has even a remote chance to work! ...@@ -50175,7 +50239,7 @@ will ensure that your thread installation has even a remote chance to work!
@appendixsec Debugging a MySQL server @appendixsec Debugging a MySQL server
If you are using some functionality that is very new in @strong{MySQL}, If you are using some functionality that is very new in @strong{MySQL},
you can try to run mysqld with the @code{--skip-new} (which will disable all you can try to run @code{mysqld} with the @code{--skip-new} (which will disable all
new, potentially unsafe functionality) or with @code{--safe-mode} which new, potentially unsafe functionality) or with @code{--safe-mode} which
disables a lot of optimization that may cause problems. disables a lot of optimization that may cause problems.
@xref{Crashing}. @xref{Crashing}.
...@@ -50262,7 +50326,7 @@ send mail to @email{mysql@@lists.mysql.com} and ask for help. Please use the ...@@ -50262,7 +50326,7 @@ send mail to @email{mysql@@lists.mysql.com} and ask for help. Please use the
@code{mysqlbug} script for all bug reports or questions regarding the @code{mysqlbug} script for all bug reports or questions regarding the
@strong{MySQL} version you are using! @strong{MySQL} version you are using!
In the windows @strong{MySQL} distribution @code{mysqld.exe} is by In the Windows @strong{MySQL} distribution, @code{mysqld.exe} is by
default compiled with support for trace files. default compiled with support for trace files.
@node Making trace files, Using gdb on mysqld, Compiling for debugging, Debugging server @node Making trace files, Using gdb on mysqld, Compiling for debugging, Debugging server
...@@ -50277,7 +50341,7 @@ You can check this by executing @code{mysqld -V}. If the version number ...@@ -50277,7 +50341,7 @@ You can check this by executing @code{mysqld -V}. If the version number
ends with @code{-debug}, it's compiled with support for trace files. ends with @code{-debug}, it's compiled with support for trace files.
Start the @code{mysqld} server with a trace log in @file{/tmp/mysqld.trace} Start the @code{mysqld} server with a trace log in @file{/tmp/mysqld.trace}
(or @file{C:\mysqld.trace} on windows): (or @file{C:\mysqld.trace} on Windows):
@code{mysqld --debug} @code{mysqld --debug}
...@@ -50323,7 +50387,7 @@ old threads. You can avoid this problem by starting @code{mysqld} with ...@@ -50323,7 +50387,7 @@ old threads. You can avoid this problem by starting @code{mysqld} with
using @code{-O thread_cache_size=5'} will help a lot! using @code{-O thread_cache_size=5'} will help a lot!
If you want to get a core dump on Linux if @code{mysqld} dies with a If you want to get a core dump on Linux if @code{mysqld} dies with a
SIGSEGV signal, you can start mysqld with the @code{--core-file} option. SIGSEGV signal, you can start @code{mysqld} with the @code{--core-file} option.
This core file can be used to make a backtrace that may help you This core file can be used to make a backtrace that may help you
find out why @code{mysqld} died: find out why @code{mysqld} died:
...@@ -50391,10 +50455,7 @@ On some operating systems, the error log will contain a stack trace if ...@@ -50391,10 +50455,7 @@ On some operating systems, the error log will contain a stack trace if
@code{mysqld} dies unexpectedly. You can use this to find out where (and @code{mysqld} dies unexpectedly. You can use this to find out where (and
maybe why) @code{mysqld} died. @xref{Error log}. To get a stack trace, maybe why) @code{mysqld} died. @xref{Error log}. To get a stack trace,
you should NOT compile @code{mysqld} with the @code{-fomit-frame-pointer} you should NOT compile @code{mysqld} with the @code{-fomit-frame-pointer}
option to gcc. On Linux-x86 you can use option to gcc. @xref{Compiling for debugging}.
@code{-fomit-frame-pointer -ffixed-ebp} to get both speed and a reasonable
accurate stack trace.
@xref{Compiling for debugging}.
If the error file contains something like the following: If the error file contains something like the following:
...@@ -50422,7 +50483,7 @@ stack range sanity check, ok, backtrace follows ...@@ -50422,7 +50483,7 @@ stack range sanity check, ok, backtrace follows
0x80c1686 0x80c1686
@end example @end example
you can find where mysqld died by doing the following: you can find where @code{mysqld} died by doing the following:
@enumerate @enumerate
@item @item
...@@ -50473,7 +50534,7 @@ query from the @code{mysql} command line tools. If this works, you ...@@ -50473,7 +50534,7 @@ query from the @code{mysql} command line tools. If this works, you
should also test all complicated queries that didn't complete. should also test all complicated queries that didn't complete.
You can also try the command @code{EXPLAIN} on all @code{SELECT} You can also try the command @code{EXPLAIN} on all @code{SELECT}
statements that takes a long time to ensure that mysqld are using statements that takes a long time to ensure that @code{mysqld} is using
indexes properly. @xref{EXPLAIN, , @code{EXPLAIN}}. indexes properly. @xref{EXPLAIN, , @code{EXPLAIN}}.
You can find the queries that take a long time to execute by starting You can find the queries that take a long time to execute by starting
...@@ -50607,7 +50668,7 @@ One uses the debug package by invoking the program with the ...@@ -50607,7 +50668,7 @@ One uses the debug package by invoking the program with the
Most @strong{MySQL} programs has a default debug string that will be Most @strong{MySQL} programs has a default debug string that will be
used if you don't specify an option to @code{--debug}. The default used if you don't specify an option to @code{--debug}. The default
trace file is usually @code{/tmp/programname.trace} on Unix and trace file is usually @code{/tmp/programname.trace} on Unix and
@code{\programname.trace} on windows. @code{\programname.trace} on Windows.
The debug control string is a sequence of colon separated fields The debug control string is a sequence of colon separated fields
as follows: as follows:
...@@ -50671,12 +50732,12 @@ tables one can freely mix @code{INSERT} and @code{SELECT} without locks ...@@ -50671,12 +50732,12 @@ tables one can freely mix @code{INSERT} and @code{SELECT} without locks
(@code{Versioning}). (@code{Versioning}).
Starting in version 3.23.33, you can analyze the table lock contention Starting in version 3.23.33, you can analyze the table lock contention
on your system by checkining @code{Table_locks_waited} and on your system by checking @code{Table_locks_waited} and
@code{Table_locks_immediate} environemt variables. @code{Table_locks_immediate} environment variables.
Some database users claim that @strong{MySQL} cannot support near the Some database users claim that @strong{MySQL} cannot support near the
number of concurrent users because it lacks row-level locking. This is number of concurrent users because it lacks row-level locking. This
a may be true for some specific applications, but is' not generally may be true for some specific applications, but is not generally
true. As always this depends totally on what the application does and what true. As always this depends totally on what the application does and what
is the access/update pattern of the data. is the access/update pattern of the data.
configure.in
View file @ 54e36baf
...@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. ...@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(sql/mysqld.cc) AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line! # The Docs Makefile.am parses this line!
AM_INIT_AUTOMAKE(mysql, 3.23.38) AM_INIT_AUTOMAKE(mysql, 3.23.39)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
...@@ -751,8 +751,8 @@ case $SYSTEM_TYPE in ...@@ -751,8 +751,8 @@ case $SYSTEM_TYPE in
;; ;;
*hpux10.20*) *hpux10.20*)
echo "Enabling snprintf workaround for hpux 10.20" echo "Enabling snprintf workaround for hpux 10.20"
CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF" CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ"
CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ"
;; ;;
*hpux11.*) *hpux11.*)
echo "Enabling pread/pwrite workaround for hpux 11" echo "Enabling pread/pwrite workaround for hpux 11"
...@@ -806,8 +806,8 @@ case $SYSTEM_TYPE in ...@@ -806,8 +806,8 @@ case $SYSTEM_TYPE in
;; ;;
*aix4.3*) *aix4.3*)
echo "Adding defines for AIX" echo "Adding defines for AIX"
CFLAGS="$CFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS" CFLAGS="$CFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ"
CXXFLAGS="$CXXFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS" CXXFLAGS="$CXXFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ"
;; ;;
dnl Is this the right match for DEC OSF on alpha? dnl Is this the right match for DEC OSF on alpha?
*dec-osf*) *dec-osf*)
......
innobase/dict/dict0dict.c
View file @ 54e36baf
...@@ -235,6 +235,71 @@ dict_table_get_index_noninline( ...@@ -235,6 +235,71 @@ dict_table_get_index_noninline(
return(dict_table_get_index(table, name)); return(dict_table_get_index(table, name));
} }
/************************************************************************
Initializes the autoinc counter. It is not an error to initialize already
initialized counter. */
void
dict_table_autoinc_initialize(
/*==========================*/
dict_table_t* table, /* in: table */
ib_longlong value) /* in: value which was assigned to a row */
{
mutex_enter(&(table->autoinc_mutex));
table->autoinc_inited = TRUE;
table->autoinc = value;
mutex_exit(&(table->autoinc_mutex));
}
/************************************************************************
Gets the next autoinc value, 0 if not yet initialized. */
ib_longlong
dict_table_autoinc_get(
/*===================*/
/* out: value for a new row, or 0 */
dict_table_t* table) /* in: table */
{
ib_longlong value;
mutex_enter(&(table->autoinc_mutex));
if (!table->autoinc_inited) {
value = 0;
} else {
table->autoinc = table->autoinc + 1;
value = table->autoinc;
}
mutex_exit(&(table->autoinc_mutex));
return(value);
}
/************************************************************************
Updates the autoinc counter if the value supplied is bigger than the
current value. If not inited, does nothing. */
void
dict_table_autoinc_update(
/*======================*/
dict_table_t* table, /* in: table */
ib_longlong value) /* in: value which was assigned to a row */
{
mutex_enter(&(table->autoinc_mutex));
if (table->autoinc_inited) {
if (value > table->autoinc) {
table->autoinc = value;
}
}
mutex_exit(&(table->autoinc_mutex));
}
/************************************************************************ /************************************************************************
Looks for column n in an index. */ Looks for column n in an index. */
...@@ -568,6 +633,8 @@ dict_table_remove_from_cache( ...@@ -568,6 +633,8 @@ dict_table_remove_from_cache(
/* Remove table from LRU list of tables */ /* Remove table from LRU list of tables */
UT_LIST_REMOVE(table_LRU, dict_sys->table_LRU, table); UT_LIST_REMOVE(table_LRU, dict_sys->table_LRU, table);
mutex_free(&(table->autoinc_mutex));
size = mem_heap_get_size(table->heap); size = mem_heap_get_size(table->heap);
ut_ad(dict_sys->size >= size); ut_ad(dict_sys->size >= size);
......
innobase/dict/dict0mem.c
View file @ 54e36baf
...@@ -71,6 +71,11 @@ dict_mem_table_create( ...@@ -71,6 +71,11 @@ dict_mem_table_create(
table->stat_modif_counter = 0; table->stat_modif_counter = 0;
mutex_create(&(table->autoinc_mutex));
mutex_set_level(&(table->autoinc_mutex), SYNC_DICT_AUTOINC_MUTEX);
table->autoinc_inited = FALSE;
table->magic_n = DICT_TABLE_MAGIC_N; table->magic_n = DICT_TABLE_MAGIC_N;
return(table); return(table);
......
innobase/ibuf/ibuf0ibuf.c
View file @ 54e36baf
...@@ -1002,24 +1002,40 @@ ibuf_rec_get_volume( ...@@ -1002,24 +1002,40 @@ ibuf_rec_get_volume(
/*================*/ /*================*/
/* out: size of index record in bytes + an upper /* out: size of index record in bytes + an upper
limit of the space taken in the page directory */ limit of the space taken in the page directory */
rec_t* rec) /* in: ibuf record */ rec_t* ibuf_rec)/* in: ibuf record */
{ {
dtype_t dtype;
ulint data_size = 0;
ulint n_fields; ulint n_fields;
byte* field; byte* types;
byte* data;
ulint len; ulint len;
ulint data_size; ulint i;
ut_ad(ibuf_inside()); ut_ad(ibuf_inside());
ut_ad(rec_get_n_fields(rec) > 2); ut_ad(rec_get_n_fields(rec) > 2);
n_fields = rec_get_n_fields(ibuf_rec) - 2;
n_fields = rec_get_n_fields(rec) - 2; types = rec_get_nth_field(ibuf_rec, 1, &len);
field = rec_get_nth_field(rec, 2, &len); ut_ad(len == n_fields * DATA_ORDER_NULL_TYPE_BUF_SIZE);
data_size = rec_get_data_size(rec) - (field - rec); for (i = 0; i < n_fields; i++) {
data = rec_get_nth_field(ibuf_rec, i + 2, &len);
dtype_read_for_order_and_null_size(&dtype,
types + i * DATA_ORDER_NULL_TYPE_BUF_SIZE);
if (len == UNIV_SQL_NULL) {
data_size += dtype_get_sql_null_size(&dtype);
} else {
data_size += len;
}
}
return(data_size + rec_get_converted_extra_size(data_size, n_fields) return(data_size + rec_get_converted_extra_size(data_size, n_fields)
+ page_dir_calc_reserved_space(1)); + page_dir_calc_reserved_space(1));
} }
/************************************************************************* /*************************************************************************
......
innobase/include/dict0dict.h
View file @ 54e36baf
...@@ -88,6 +88,32 @@ ulint ...@@ -88,6 +88,32 @@ ulint
dict_col_get_clust_pos( dict_col_get_clust_pos(
/*===================*/ /*===================*/
dict_col_t* col); dict_col_t* col);
/************************************************************************
Initializes the autoinc counter. It is not an error to initialize already
initialized counter. */
void
dict_table_autoinc_initialize(
/*==========================*/
dict_table_t* table, /* in: table */
ib_longlong value); /* in: value which was assigned to a row */
/************************************************************************
Gets the next autoinc value, 0 if not yet initialized. */
ib_longlong
dict_table_autoinc_get(
/*===================*/
/* out: value for a new row, or 0 */
dict_table_t* table); /* in: table */
/************************************************************************
Updates the autoinc counter if the value supplied is bigger than the
current value. If not inited, does nothing. */
void
dict_table_autoinc_update(
/*======================*/
dict_table_t* table, /* in: table */
ib_longlong value); /* in: value which was assigned to a row */
/************************************************************************** /**************************************************************************
Adds a table object to the dictionary cache. */ Adds a table object to the dictionary cache. */
......
innobase/include/dict0mem.h
View file @ 54e36baf
...@@ -302,6 +302,16 @@ struct dict_table_struct{ ...@@ -302,6 +302,16 @@ struct dict_table_struct{
for MySQL SHOW TABLE STATUS; this counter for MySQL SHOW TABLE STATUS; this counter
is not protected by any latch, because this is not protected by any latch, because this
is only used for heuristics */ is only used for heuristics */
/*----------------------*/
mutex_t autoinc_mutex;
/* mutex protecting the autoincrement
counter */
ibool autoinc_inited;
/* TRUE if the autoinc counter has been
inited; MySQL gets the init value by executing
SELECT MAX(auto inc column) */
ib_longlong autoinc;/* autoinc counter value already given to
a row */
ulint magic_n;/* magic number */ ulint magic_n;/* magic number */
}; };
#define DICT_TABLE_MAGIC_N 76333786 #define DICT_TABLE_MAGIC_N 76333786
......
innobase/include/os0file.h
View file @ 54e36baf
...@@ -13,12 +13,10 @@ Created 10/21/1995 Heikki Tuuri ...@@ -13,12 +13,10 @@ Created 10/21/1995 Heikki Tuuri
#ifdef __WIN__ #ifdef __WIN__
#if (defined(__NT__) || defined(__WIN2000__)) /* We define always WIN_ASYNC_IO, and check at run-time whether
the OS actually supports it: Win 95 does not, NT does. */
#define WIN_ASYNC_IO #define WIN_ASYNC_IO
#endif
#define UNIV_NON_BUFFERED_IO #define UNIV_NON_BUFFERED_IO
#else #else
...@@ -100,7 +98,17 @@ log. */ ...@@ -100,7 +98,17 @@ log. */
requests in a batch, and only after that requests in a batch, and only after that
wake the i/o-handler thread; this has wake the i/o-handler thread; this has
effect only in simulated aio */ effect only in simulated aio */
#define OS_WIN31 1
#define OS_WIN95 2
#define OS_WINNT 3
/***************************************************************************
Gets the operating system version. Currently works only on Windows. */
ulint
os_get_os_version(void);
/*===================*/
/* out: OS_WIN95, OS_WIN31, OS_WINNT (2000 == NT) */
/******************************************************************** /********************************************************************
Opens an existing file or creates a new. */ Opens an existing file or creates a new. */
......
innobase/include/sync0sync.h
View file @ 54e36baf
...@@ -372,6 +372,7 @@ Memory pool mutex */ ...@@ -372,6 +372,7 @@ Memory pool mutex */
latching order checking */ latching order checking */
#define SYNC_LEVEL_NONE 2000 /* default: level not defined */ #define SYNC_LEVEL_NONE 2000 /* default: level not defined */
#define SYNC_DICT 1000 #define SYNC_DICT 1000
#define SYNC_DICT_AUTOINC_MUTEX 999
#define SYNC_PURGE_IS_RUNNING 997 #define SYNC_PURGE_IS_RUNNING 997
#define SYNC_DICT_HEADER 995 #define SYNC_DICT_HEADER 995
#define SYNC_IBUF_HEADER 914 #define SYNC_IBUF_HEADER 914
......
innobase/include/univ.i
View file @ 54e36baf
...@@ -155,6 +155,12 @@ typedef unsigned long int ulint; ...@@ -155,6 +155,12 @@ typedef unsigned long int ulint;
typedef long int lint; typedef long int lint;
#ifdef __WIN__
typedef __int64 ib_longlong;
#else
typedef longlong ib_longlong;
#endif
/* The following type should be at least a 64-bit floating point number */ /* The following type should be at least a 64-bit floating point number */
typedef double utfloat; typedef double utfloat;
......
innobase/log/log0log.c
View file @ 54e36baf
...@@ -327,7 +327,8 @@ log_pad_current_log_block(void) ...@@ -327,7 +327,8 @@ log_pad_current_log_block(void)
ulint i; ulint i;
dulint lsn; dulint lsn;
log_reserve_and_open(OS_FILE_LOG_BLOCK_SIZE); /* We retrieve lsn only because otherwise gcc crashed on HP-UX */
lsn = log_reserve_and_open(OS_FILE_LOG_BLOCK_SIZE);
pad_length = OS_FILE_LOG_BLOCK_SIZE pad_length = OS_FILE_LOG_BLOCK_SIZE
- (log_sys->buf_free % OS_FILE_LOG_BLOCK_SIZE) - (log_sys->buf_free % OS_FILE_LOG_BLOCK_SIZE)
......
innobase/os/os0file.c
View file @ 54e36baf
...@@ -103,6 +103,38 @@ os_aio_array_t* os_aio_sync_array = NULL; ...@@ -103,6 +103,38 @@ os_aio_array_t* os_aio_sync_array = NULL;
ulint os_aio_n_segments = ULINT_UNDEFINED; ulint os_aio_n_segments = ULINT_UNDEFINED;
/***************************************************************************
Gets the operating system version. Currently works only on Windows. */
ulint
os_get_os_version(void)
/*===================*/
/* out: OS_WIN95, OS_WIN31, OS_WINNT (2000 == NT) */
{
#ifdef __WIN__
OSVERSIONINFO os_info;
os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
ut_a(GetVersionEx(&os_info));
if (os_info.dwPlatformId == VER_PLATFORM_WIN32s) {
return(OS_WIN31);
} else if (os_info.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
return(OS_WIN95);
} else if (os_info.dwPlatformId == VER_PLATFORM_WIN32_NT) {
return(OS_WINNT);
} else {
ut_error;
return(0);
}
#else
ut_error;
return(0);
#endif
}
/*************************************************************************** /***************************************************************************
Retrieves the last error number if an error occurs in a file io function. Retrieves the last error number if an error occurs in a file io function.
The number should be retrieved before any other OS calls (because they may The number should be retrieved before any other OS calls (because they may
...@@ -438,13 +470,13 @@ os_file_set_size( ...@@ -438,13 +470,13 @@ os_file_set_size(
byte* buf; byte* buf;
try_again: try_again:
/* We use a very big 16 MB buffer in writing because Linux is /* We use a very big 8 MB buffer in writing because Linux may be
extremely slow in fdatasync on 1 MB writes */ extremely slow in fdatasync on 1 MB writes */
buf = ut_malloc(UNIV_PAGE_SIZE * 1024); buf = ut_malloc(UNIV_PAGE_SIZE * 512);
/* Write buffer full of zeros */ /* Write buffer full of zeros */
for (i = 0; i < UNIV_PAGE_SIZE * 1024; i++) { for (i = 0; i < UNIV_PAGE_SIZE * 512; i++) {
buf[i] = '\0'; buf[i] = '\0';
} }
...@@ -456,10 +488,10 @@ os_file_set_size( ...@@ -456,10 +488,10 @@ os_file_set_size(
UT_NOT_USED(size_high); UT_NOT_USED(size_high);
#endif #endif
while (offset < low) { while (offset < low) {
if (low - offset < UNIV_PAGE_SIZE * 1024) { if (low - offset < UNIV_PAGE_SIZE * 512) {
n_bytes = low - offset; n_bytes = low - offset;
} else { } else {
n_bytes = UNIV_PAGE_SIZE * 1024; n_bytes = UNIV_PAGE_SIZE * 512;
} }
ret = os_file_write(name, file, buf, offset, 0, n_bytes); ret = os_file_write(name, file, buf, offset, 0, n_bytes);
...@@ -475,8 +507,6 @@ os_file_set_size( ...@@ -475,8 +507,6 @@ os_file_set_size(
ret = os_file_flush(file); ret = os_file_flush(file);
fsync(file);
if (ret) { if (ret) {
return(TRUE); return(TRUE);
} }
......
innobase/srv/srv0start.c
View file @ 54e36baf
...@@ -549,11 +549,19 @@ innobase_start_or_create_for_mysql(void) ...@@ -549,11 +549,19 @@ innobase_start_or_create_for_mysql(void)
srv_n_file_io_threads = 4; srv_n_file_io_threads = 4;
#endif #endif
#ifdef WIN_ASYNC_IO #ifdef __WIN__
/* On NT always use aio */ if (os_get_os_version() == OS_WIN95
os_aio_use_native_aio = TRUE; || os_get_os_version() == OS_WIN31) {
#endif /* On Win 95, 98, ME, and Win32 subsystem for Windows 3.1 use
simulated aio */
os_aio_use_native_aio = FALSE;
srv_n_file_io_threads = 4;
} else {
/* On NT and Win 2000 always use aio */
os_aio_use_native_aio = TRUE;
}
#endif
if (!os_aio_use_native_aio) { if (!os_aio_use_native_aio) {
os_aio_init(4 * SRV_N_PENDING_IOS_PER_THREAD os_aio_init(4 * SRV_N_PENDING_IOS_PER_THREAD
* srv_n_file_io_threads, * srv_n_file_io_threads,
...@@ -600,6 +608,19 @@ innobase_start_or_create_for_mysql(void) ...@@ -600,6 +608,19 @@ innobase_start_or_create_for_mysql(void)
return(DB_ERROR); return(DB_ERROR);
} }
sum_of_new_sizes = 0;
for (i = 0; i < srv_n_data_files; i++) {
sum_of_new_sizes += srv_data_file_sizes[i];
}
if (sum_of_new_sizes < 640) {
fprintf(stderr,
"InnoDB: Error: tablespace size must be at least 10 MB\n");
return(DB_ERROR);
}
err = open_or_create_data_files(&create_new_db, err = open_or_create_data_files(&create_new_db,
&min_flushed_lsn, &min_arch_log_no, &min_flushed_lsn, &min_arch_log_no,
&max_flushed_lsn, &max_arch_log_no, &max_flushed_lsn, &max_arch_log_no,
......
innobase/sync/sync0sync.c
View file @ 54e36baf
...@@ -1001,6 +1001,8 @@ sync_thread_add_level( ...@@ -1001,6 +1001,8 @@ sync_thread_add_level(
&& !sync_thread_levels_contain(array, SYNC_IBUF_MUTEX) && !sync_thread_levels_contain(array, SYNC_IBUF_MUTEX)
&& !sync_thread_levels_contain(array, && !sync_thread_levels_contain(array,
SYNC_IBUF_PESS_INSERT_MUTEX)); SYNC_IBUF_PESS_INSERT_MUTEX));
} else if (level == SYNC_DICT_AUTOINC_MUTEX) {
ut_a(sync_thread_levels_g(array, SYNC_DICT_AUTOINC_MUTEX));
} else if (level == SYNC_DICT_HEADER) { } else if (level == SYNC_DICT_HEADER) {
ut_a(sync_thread_levels_g(array, SYNC_DICT_HEADER)); ut_a(sync_thread_levels_g(array, SYNC_DICT_HEADER));
} else if (level == SYNC_PURGE_IS_RUNNING) { } else if (level == SYNC_PURGE_IS_RUNNING) {
......
mysql-test/t/merge.test
View file @ 54e36baf
...@@ -109,3 +109,4 @@ insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6); ...@@ -109,3 +109,4 @@ insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6);
insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6); insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6);
flush tables; flush tables;
select * from t3 where a=1 order by b limit 2; select * from t3 where a=1 order by b limit 2;
drop table t1,t2,t3;
mysys/default.c
View file @ 54e36baf
...@@ -222,7 +222,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, ...@@ -222,7 +222,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
const char *dir, const char *config_file, const char *dir, const char *config_file,
const char *ext, TYPELIB *group) const char *ext, TYPELIB *group)
{ {
char name[FN_REFLEN+10],buff[257],*ptr,*end,*value,*tmp; char name[FN_REFLEN+10],buff[FN_REFLEN+1],*ptr,*end,*value,*tmp;
FILE *fp; FILE *fp;
uint line=0; uint line=0;
my_bool read_values=0,found_group=0; my_bool read_values=0,found_group=0;
......
mysys/mf_keycache.c
View file @ 54e36baf
...@@ -381,7 +381,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) ...@@ -381,7 +381,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error)
reg1 SEC_LINK *next,**start; reg1 SEC_LINK *next,**start;
#if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)
DBUG_EXECUTE("check_keycache",test_key_cache("start of find_key_block",0);); DBUG_EXECUTE("check_keycache2",test_key_cache("start of find_key_block",0););
#endif #endif
*error=0; *error=0;
...@@ -459,7 +459,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) ...@@ -459,7 +459,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error)
} }
_my_used_last=next; _my_used_last=next;
#if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)
DBUG_EXECUTE("check_keycache",test_key_cache("end of find_key_block",0);); DBUG_EXECUTE("check_keycache2",test_key_cache("end of find_key_block",0););
#endif #endif
return next; return next;
} /* find_key_block */ } /* find_key_block */
......
sql/ha_innobase.cc
View file @ 54e36baf
...@@ -1242,7 +1242,8 @@ ha_innobase::write_row( ...@@ -1242,7 +1242,8 @@ ha_innobase::write_row(
{ {
row_prebuilt_t* prebuilt = (row_prebuilt_t*)innobase_prebuilt; row_prebuilt_t* prebuilt = (row_prebuilt_t*)innobase_prebuilt;
int error; int error;
longlong auto_inc;
DBUG_ENTER("ha_innobase::write_row"); DBUG_ENTER("ha_innobase::write_row");
statistic_increment(ha_write_count, &LOCK_status); statistic_increment(ha_write_count, &LOCK_status);
...@@ -1261,10 +1262,43 @@ ha_innobase::write_row( ...@@ -1261,10 +1262,43 @@ ha_innobase::write_row(
make sure all columns are fetched in the select done by make sure all columns are fetched in the select done by
update_auto_increment */ update_auto_increment */
prebuilt->in_update_remember_pos = FALSE; /* Fetch the value the user possibly has set in the
autoincrement field */
auto_inc = table->next_number_field->val_int();
if (auto_inc != 0) {
/* This call will calculate the max of the
current value and the value supplied by the user, if
the auto_inc counter is already initialized
for the table */
dict_table_autoinc_update(prebuilt->table, auto_inc);
} else {
auto_inc = dict_table_autoinc_get(prebuilt->table);
/* If auto_inc is now != 0 the autoinc counter
was already initialized for the table: we can give
the new value for MySQL to place in the field */
if (auto_inc != 0) {
user_thd->next_insert_id = auto_inc;
}
}
prebuilt->in_update_remember_pos = FALSE;
update_auto_increment(); update_auto_increment();
if (auto_inc == 0) {
/* The autoinc counter for our table was not yet
initialized, initialize it now */
auto_inc = table->next_number_field->val_int();
dict_table_autoinc_initialize(prebuilt->table,
auto_inc);
}
/* We have to set sql_stat_start to TRUE because /* We have to set sql_stat_start to TRUE because
update_auto_increment has called a select, and update_auto_increment has called a select, and
has reset that flag; row_insert_for_mysql has to has reset that flag; row_insert_for_mysql has to
......
sql/mysqld.cc
View file @ 54e36baf
...@@ -429,7 +429,7 @@ static void close_connections(void) ...@@ -429,7 +429,7 @@ static void close_connections(void)
if (error != 0 && !count++) if (error != 0 && !count++)
sql_print_error("Got error %d from pthread_cond_timedwait",error); sql_print_error("Got error %d from pthread_cond_timedwait",error);
#endif #endif
#if defined(AIX_3_2) || defined(HAVE_DEC_3_2_THREADS) #if defined(HAVE_DEC_3_2_THREADS) || defined(SIGNALS_DONT_BREAK_READ)
if (ip_sock != INVALID_SOCKET) if (ip_sock != INVALID_SOCKET)
{ {
DBUG_PRINT("error",("closing TCP/IP and socket files")); DBUG_PRINT("error",("closing TCP/IP and socket files"));
...@@ -544,9 +544,9 @@ static void close_connections(void) ...@@ -544,9 +544,9 @@ static void close_connections(void)
(void) pthread_mutex_unlock(&LOCK_thread_count); (void) pthread_mutex_unlock(&LOCK_thread_count);
mysql_log.close(1); mysql_log.close(1);
mysql_slow_log.close(1);
mysql_update_log.close(1); mysql_update_log.close(1);
mysql_bin_log.close(1); mysql_bin_log.close(1);
my_free(charsets_list, MYF(0));
DBUG_PRINT("quit",("close_connections thread")); DBUG_PRINT("quit",("close_connections thread"));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -680,6 +680,7 @@ void clean_up(bool print_message) ...@@ -680,6 +680,7 @@ void clean_up(bool print_message)
end_raid(); end_raid();
#endif #endif
free_defaults(defaults_argv); free_defaults(defaults_argv);
my_free(charsets_list, MYF(MY_ALLOW_ZERO_PTR));
my_free(mysql_tmpdir,MYF(0)); my_free(mysql_tmpdir,MYF(0));
x_free(opt_bin_logname); x_free(opt_bin_logname);
bitmap_free(&temp_pool); bitmap_free(&temp_pool);
...@@ -2487,9 +2488,7 @@ static struct option long_options[] = { ...@@ -2487,9 +2488,7 @@ static struct option long_options[] = {
{"chroot", required_argument, 0, 'r'}, {"chroot", required_argument, 0, 'r'},
{"character-sets-dir", required_argument, 0, (int) OPT_CHARSETS_DIR}, {"character-sets-dir", required_argument, 0, (int) OPT_CHARSETS_DIR},
{"datadir", required_argument, 0, 'h'}, {"datadir", required_argument, 0, 'h'},
#ifndef DBUG_OFF
{"debug", optional_argument, 0, '#'}, {"debug", optional_argument, 0, '#'},
#endif
{"default-character-set", required_argument, 0, 'C'}, {"default-character-set", required_argument, 0, 'C'},
{"default-table-type", required_argument, 0, (int) OPT_TABLE_TYPE}, {"default-table-type", required_argument, 0, (int) OPT_TABLE_TYPE},
{"delay-key-write-for-all-tables", {"delay-key-write-for-all-tables",
...@@ -2544,10 +2543,8 @@ static struct option long_options[] = { ...@@ -2544,10 +2543,8 @@ static struct option long_options[] = {
(int) OPT_DISCONNECT_SLAVE_EVENT_COUNT}, (int) OPT_DISCONNECT_SLAVE_EVENT_COUNT},
{"abort-slave-event-count", required_argument, 0, {"abort-slave-event-count", required_argument, 0,
(int) OPT_ABORT_SLAVE_EVENT_COUNT}, (int) OPT_ABORT_SLAVE_EVENT_COUNT},
#if !defined(DBUG_OFF) && defined(SAFEMALLOC)
{"safemalloc-mem-limit", required_argument, 0, (int) {"safemalloc-mem-limit", required_argument, 0, (int)
OPT_SAFEMALLOC_MEM_LIMIT}, OPT_SAFEMALLOC_MEM_LIMIT},
#endif
{"new", no_argument, 0, 'n'}, {"new", no_argument, 0, 'n'},
{"old-protocol", no_argument, 0, 'o'}, {"old-protocol", no_argument, 0, 'o'},
#ifdef ONE_THREAD #ifdef ONE_THREAD
...@@ -3165,12 +3162,12 @@ static void get_options(int argc,char **argv) ...@@ -3165,12 +3162,12 @@ static void get_options(int argc,char **argv)
long_options, &option_index)) != EOF) long_options, &option_index)) != EOF)
{ {
switch(c) { switch(c) {
#ifndef DBUG_OFF
case '#': case '#':
#ifndef DBUG_OFF
DBUG_PUSH(optarg ? optarg : default_dbug_option); DBUG_PUSH(optarg ? optarg : default_dbug_option);
#endif
opt_endinfo=1; /* unireg: memory allocation */ opt_endinfo=1; /* unireg: memory allocation */
break; break;
#endif
case 'a': case 'a':
opt_ansi_mode=1; opt_ansi_mode=1;
thd_startup_options|=OPTION_ANSI_MODE; thd_startup_options|=OPTION_ANSI_MODE;
...@@ -3205,11 +3202,11 @@ static void get_options(int argc,char **argv) ...@@ -3205,11 +3202,11 @@ static void get_options(int argc,char **argv)
case 'P': case 'P':
mysql_port= (unsigned int) atoi(optarg); mysql_port= (unsigned int) atoi(optarg);
break; break;
#if !defined(DBUG_OFF) && defined(SAFEMALLOC)
case OPT_SAFEMALLOC_MEM_LIMIT: case OPT_SAFEMALLOC_MEM_LIMIT:
#if !defined(DBUG_OFF) && defined(SAFEMALLOC)
safemalloc_mem_limit = atoi(optarg); safemalloc_mem_limit = atoi(optarg);
break;
#endif #endif
break;
case OPT_SOCKET: case OPT_SOCKET:
mysql_unix_port= optarg; mysql_unix_port= optarg;
break; break;
......
sql/violite.c
View file @ 54e36baf
...@@ -179,7 +179,7 @@ int vio_read(Vio * vio, gptr buf, int size) ...@@ -179,7 +179,7 @@ int vio_read(Vio * vio, gptr buf, int size)
#ifndef DBUG_OFF #ifndef DBUG_OFF
if (r < 0) if (r < 0)
{ {
DBUG_PRINT("error", ("Got error %d during read",errno)); DBUG_PRINT("vio_error", ("Got error %d during read",errno));
} }
#endif /* DBUG_OFF */ #endif /* DBUG_OFF */
DBUG_PRINT("exit", ("%d", r)); DBUG_PRINT("exit", ("%d", r));
...@@ -207,7 +207,7 @@ int vio_write(Vio * vio, const gptr buf, int size) ...@@ -207,7 +207,7 @@ int vio_write(Vio * vio, const gptr buf, int size)
#ifndef DBUG_OFF #ifndef DBUG_OFF
if (r < 0) if (r < 0)
{ {
DBUG_PRINT("error", ("Got error on write: %d",errno)); DBUG_PRINT("vio_error", ("Got error on write: %d",errno));
} }
#endif /* DBUG_OFF */ #endif /* DBUG_OFF */
DBUG_PRINT("exit", ("%d", r)); DBUG_PRINT("exit", ("%d", r));
...@@ -346,7 +346,7 @@ int vio_close(Vio * vio) ...@@ -346,7 +346,7 @@ int vio_close(Vio * vio)
} }
if (r) if (r)
{ {
DBUG_PRINT("error", ("close() failed, error: %d",errno)); DBUG_PRINT("vio_error", ("close() failed, error: %d",errno));
/* FIXME: error handling (not critical for MySQL) */ /* FIXME: error handling (not critical for MySQL) */
} }
vio->type= VIO_CLOSED; vio->type= VIO_CLOSED;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7