merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

5 files changed, 83 insertions, 61 deletions

diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index 2e3a878cd73..e4c39b0c548 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -1,18 +1,3 @@
-# Copyright (C) 2007 MySQL AB
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
 #
 # This file contains compiler warnings that can
 # be ignored for various reasons.
@@ -82,7 +67,6 @@ vi\.c : unused parameter
 common\.c : unused parameter
 term\.c : .*
 
-
 #
 # Ignore some warnings in libevent, which is not maintained by us.
 #
@@ -161,6 +145,7 @@ table_xt\.cc : variable.*might be clobbered by.*longjmp
 
 #
 # Yassl
+#
 include/runtime.hpp: .*pure_error.*
 .*/extra/yassl/.*taocrypt/.*: comparison with string literal
 .*/extra/yassl/taocrypt/src/blowfish\.cpp: array subscript is above array bounds
@@ -174,6 +159,12 @@ mySTL/algorithm\.hpp: is used uninitialized in this function
 .*/dbug/.*(groff|<standard input>) : .*
 
 #
+# Warnings on OpenSolaris
+#
+.*/my_config\.h : _FILE_OFFSET_BITS
+/usr/include/sys/feature_tests.h : this is the location of the previous definition
+
+#
 # Unexplanable (?) stuff
 #
 listener.cc : .*conversion from 'SOCKET' to 'int'.*
@@ -198,3 +189,10 @@ ctype-simple\.c : .*unary minus operator applied to unsigned type, result still
 regexec\.c : passing argument 3 of.*matcher.* discards qualifiers from pointer target type
 libmysql\.c: passing argument 2 of .*memcpy.* discards qualifiers from pointer target type : 3000-4000
 storage/xtradb/dict/dict0dict\.c : passing argument 1 of .*strcpy.* discards qualifiers from pointer target type : 2500-3500
+
+#
+# Strange things from autoconf that is probably safe to ignore
+#
+
+configure.in : warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
+configure.in : config/ac-macros/character_sets.m4.*prefer named diversions
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
index 378a1df67aa..896b139273b 100644
--- a/support-files/my-huge.cnf.sh
+++ b/support-files/my-huge.cnf.sh
@@ -1,13 +1,15 @@
-# Example MySQL config file for very large systems.
+# Example MariaDB config file for very large systems.
 #
 # This is for a large system with memory of 1G-2G where the system runs mainly
-# MySQL.
+# MariaDB.
 #
-# MySQL programs look for option files in a set of
+# MariaDB programs look for option files in a set of
 # locations which depend on the deployment platform.
 # You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
+# locations. For information about these locations, do:
+# 'my_print_defaults --help' and see what is printed under
+# Default options are read from the following files in the given order:
+# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
@@ -38,6 +40,9 @@ query_cache_size = 32M
 # Try number of CPU's*2 for thread_concurrency
 thread_concurrency = 8
 
+# Point the following paths to a dedicated disk
+#tmpdir		= /tmp/
+
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
 # All interaction with mysqld must be made via Unix sockets or named pipes.
@@ -116,7 +121,7 @@ server-id	= 1
 # Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@
 #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
-#innodb_log_group_home_dir = @localstatedir@
+o#innodb_log_group_home_dir = @localstatedir@
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 384M
diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
index f39ed58c190..d934b23cf0d 100644
--- a/support-files/my-innodb-heavy-4G.cnf.sh
+++ b/support-files/my-innodb-heavy-4G.cnf.sh
@@ -4,15 +4,17 @@
 #END CONFIG INFO
 
 #
-# This is a MySQL example config file for systems with 4GB of memory
-# running mostly MySQL using InnoDB only tables and performing complex
+# This is a MariaDB example config file for systems with 4GB of memory
+# running mostly MariaDB using InnoDB only tables and performing complex
 # queries with few connections.
 # 
-# MySQL programs look for option files in a set of
+# MariaDB programs look for option files in a set of
 # locations which depend on the deployment platform.
 # You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
+# locations. For information about these locations, do:
+# 'my_print_defaults --help' and see what is printed under
+# Default options are read from the following files in the given order:
+# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
@@ -23,11 +25,11 @@
 #
 
 #
-# The following options will be read by MySQL client applications.
-# Note that only client applications shipped by MySQL are guaranteed
-# to read this section. If you want your own MySQL client program to
+# The following options will be read by MariaDB client applications.
+# Note that only client applications shipped by MariaDB are guaranteed
+# to read this section. If you want your own MariaDB client program to
 # honor these values, you need to specify it as an option during the
-# MySQL client library initialization.
+# MariaDB client library initialization.
 #
 [client]
 #password	= [your_password]
@@ -37,7 +39,7 @@ socket		= @MYSQL_UNIX_ADDR@
 # *** Application-specific options follow here ***
 
 #
-# The MySQL server
+# The MariaDB server
 #
 [mysqld]
 
@@ -46,7 +48,7 @@ port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
 
 # back_log is the number of connections the operating system can keep in
-# the listen queue, before the MySQL connection manager thread has
+# the listen queue, before the MariaDB connection manager thread has
 # processed them. If you have a very high connection rate and experience
 # "connection refused" errors, you might need to increase this value.
 # Check your OS documentation for the maximum value of this parameter.
@@ -62,14 +64,14 @@ back_log = 50
 # (via the "enable-named-pipe" option) will render mysqld useless!
 #skip-networking
 
-# The maximum amount of concurrent sessions the MySQL server will
+# The maximum amount of concurrent sessions the MariaDB server will
 # allow. One of these connections will be reserved for a user with
 # SUPER privileges to allow the administrator to login even if the
 # connection limit has been reached.
 max_connections = 100
 
 # Maximum amount of errors allowed per host. If this limit is reached,
-# the host will be blocked from connecting to the MySQL server until
+# the host will be blocked from connecting to the MariaDB server until
 # "FLUSH HOSTS" has been run or the server was restarted. Invalid
 # passwords and other errors during the connect phase result in
 # increasing this value. See the "Aborted_connects" status variable for
@@ -171,7 +173,7 @@ query_cache_limit = 2M
 ft_min_word_len = 4
 
 # If your system supports the memlock() function call, you might want to
-# enable this option while running MySQL to keep it locked in memory and
+# enable this option while running MariaDB to keep it locked in memory and
 # to avoid potential swapping out in case of high memory pressure. Good
 # for performance.
 #memlock
@@ -181,7 +183,7 @@ ft_min_word_len = 4
 default-storage-engine = MYISAM
 
 # Thread stack size to use. This amount of memory is always reserved at
-# connection time. MySQL itself usually needs no more than 64K of
+# connection time. MariaDB itself usually needs no more than 64K of
 # memory, while if you use your own stack hungry UDF functions or your
 # OS requires more stack for some operations, you might need to set this
 # to a higher value.
@@ -216,7 +218,7 @@ binlog_format=mixed
 #log
 
 # Print warnings to the error log file.  If you have any problem with
-# MySQL you should enable logging of warnings and examine the error log
+# MariaDB you should enable logging of warnings and examine the error log
 # for possible explanations. 
 #log_warnings
 
@@ -229,17 +231,24 @@ slow_query_log
 
 # All queries taking more than this amount of time (in seconds) will be
 # trated as slow. Do not use "1" as a value here, as this will result in
-# even very fast queries being logged from time to time (as MySQL
+# even very fast queries being logged from time to time (as MariaDB
 # currently measures time with second accuracy only).
 long_query_time = 2
 
+# The directory used by MySQL for storing temporary files. For example,
+# it is used to perform disk based large sorts, as well as for internal
+# and explicit temporary tables. It might be good to put it on a
+# swapfs/tmpfs filesystem, if you do not create very large temporary
+# files. Alternatively you can put it on dedicated disk. You can
+# specify multiple paths here by separating them by ";" - they will then
+# be used in a round-robin fashion.
+#tmpdir = /tmp
 
 # ***  Replication related settings 
 
-
 # Unique server identification number between 1 and 2^32-1. This value
 # is required for both master and slave hosts. It defaults to 1 if
-# "master-host" is not set, but will MySQL will not function as a master
+# "master-host" is not set, but will MariaDB will not function as a master
 # if it is omitted.
 server-id = 1
 
@@ -320,13 +329,13 @@ key_buffer_size = 32M
 # This buffer is allocated when a bulk insert is detected.
 bulk_insert_buffer_size = 64M
 
-# This buffer is allocated when MySQL needs to rebuild the index in
+# This buffer is allocated when MariaDB needs to rebuild the index in
 # REPAIR, OPTIMIZE, ALTER table statements as well as in LOAD DATA INFILE
 # into an empty table. It is allocated per thread so be careful with
 # large settings.
 myisam_sort_buffer_size = 128M
 
-# The maximum size of the temporary file MySQL is allowed to use while
+# The maximum size of the temporary file MariaDB is allowed to use while
 # recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
 # If the file-size would be bigger than this, the index will be created
 # through the key cache (which is slower).
@@ -342,7 +351,7 @@ myisam_recover
 
 # *** INNODB Specific options ***
 
-# Use this option if you have a MySQL server with InnoDB support enabled
+# Use this option if you have a MariaDB server with InnoDB support enabled
 # but you do not plan to use it. This will save memory and disk space
 # and speed up some things.
 #skip-innodb
@@ -373,7 +382,7 @@ innodb_buffer_pool_size = 2G
 innodb_data_file_path = ibdata1:10M:autoextend
 
 # Set this option if you would like the InnoDB tablespace files to be
-# stored in another location. By default this is the MySQL datadir.
+# stored in another location. By default this is the MariaDB datadir.
 #innodb_data_home_dir = <directory>
 
 # Number of IO threads to use for async IO operations. This value is
@@ -424,7 +433,7 @@ innodb_log_file_size = 256M
 # enough.
 innodb_log_files_in_group = 3
 
-# Location of the InnoDB log files. Default is the MySQL datadir. You
+# Location of the InnoDB log files. Default is the MariaDB datadir. You
 # may wish to point it to a dedicated hard drive or a RAID1 volume for
 # improved performance
 #innodb_log_group_home_dir
diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
index 79d43407cda..6f8dab0b0e2 100644
--- a/support-files/my-large.cnf.sh
+++ b/support-files/my-large.cnf.sh
@@ -1,19 +1,21 @@
-# Example MySQL config file for large systems.
+# Example MariaDB config file for large systems.
 #
 # This is for a large system with memory = 512M where the system runs mainly
-# MySQL.
+# MariaDB.
 #
-# MySQL programs look for option files in a set of
+# MariaDB programs look for option files in a set of
 # locations which depend on the deployment platform.
 # You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
+# locations. For information about these locations, do:
+# 'my_print_defaults --help' and see what is printed under
+# Default options are read from the following files in the given order:
+# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
 # with the "--help" option.
 
-# The following options will be passed to all MySQL clients
+# The following options will be passed to all MariaDB clients
 [client]
 #password	= your_password
 port		= @MYSQL_TCP_PORT@
@@ -21,7 +23,7 @@ socket		= @MYSQL_UNIX_ADDR@
 
 # Here follows entries for some specific programs
 
-# The MySQL server
+# The MariaDB server
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
@@ -38,6 +40,9 @@ query_cache_size= 16M
 # Try number of CPU's*2 for thread_concurrency
 thread_concurrency = 8
 
+# Point the following paths to different dedicated disks
+#tmpdir		= /tmp/
+
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
 # All interaction with mysqld must be made via Unix sockets or named pipes.
diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
index 4ec245e88b9..19ab8dfb151 100644
--- a/support-files/my-medium.cnf.sh
+++ b/support-files/my-medium.cnf.sh
@@ -1,20 +1,22 @@
-# Example MySQL config file for medium systems.
+# Example MariaDB config file for medium systems.
 #
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
+# This is for a system with little memory (32M - 64M) where MariaDB plays
+# an important part, or systems up to 128M where MariaDB is used together with
 # other programs (such as a web server)
 #
-# MySQL programs look for option files in a set of
+# MariaDB programs look for option files in a set of
 # locations which depend on the deployment platform.
 # You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
+# locations. For information about these locations, do:
+# 'my_print_defaults --help' and see what is printed under
+# Default options are read from the following files in the given order:
+# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
 # with the "--help" option.
 
-# The following options will be passed to all MySQL clients
+# The following options will be passed to all MariaDB clients
 [client]
 #password	= your_password
 port		= @MYSQL_TCP_PORT@
@@ -22,7 +24,7 @@ socket		= @MYSQL_UNIX_ADDR@
 
 # Here follows entries for some specific programs
 
-# The MySQL server
+# The MariaDB server
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
@@ -36,6 +38,9 @@ read_buffer_size = 256K
 read_rnd_buffer_size = 512K
 myisam_sort_buffer_size = 8M
 
+# Point the following paths to different dedicated disks
+#tmpdir		= /tmp/
+
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
 # All interaction with mysqld must be made via Unix sockets or named pipes.