Added STDCALL to mysql_sever and mysql_thread variables

Merged error messages with 3.23.44
Fixed bug with DATA DIRECTORY on windows

Docs/internals.texi

@@ -183,23 +183,27 @@ and then we read the rows in the sorted order into a row buffer
 We are using @uref{http://www.bitkeeper.com/, BitKeeper} for source management.
 
 @item
-You should use the @strong{MySQL} 3.23 or 4.0 source for all developments.
+You should use the @strong{MySQL} 4.0 source for all developments.
 
 @item
 If you have any questions about the @strong{MySQL} source, you can post these
-to @email{developers@@mysql.com} and we will answer them.
-Note that we will shortly change the name of this list to
-@email{internals@@mysql.com}, to more accurately reflect what should be
-posted to this list.
+to @email{dev-public@@mysql.com} and we will answer them.  Please
+remember to not use this internal email list in public!
 
 @item
-Try to write code in a lot of black boxes that can be reused or at
-least have a clean interface.
+Try to write code in a lot of black boxes that can be reused or use at
+least a clean, easy to change interface.
 
 @item
 Reuse code;  There is already a lot of algorithms in MySQL for list handling,
 queues, dynamic and hashed arrays, sorting, etc. that can be reused.
 
+@item
+Use the @code{my_*} functions like @code{my_read()}/@code{my_write()}/
+@code{my_malloc()} that you can find in the @code{mysys} library instead 
+of the direct system calls;  This will make your code easier to debug and 
+more portable.
+
 @item
 Try to always write optimized code, so that you don't have to
 go back and rewrite it a couple of months later.  It's better to
@@ -222,7 +226,11 @@ Do not check the same pointer for @code{NULL} more than once.
 
 @item
 Use long function and variable names in English; This makes your code
-easier to read.  Use the 'varible_name' style instead of 'VariableName'.
+easier to read. 
+
+@item
+Use my_var as opposed to myVar or MyVar (@samp{_} rather than dancing SHIFT
+to seperate words in identifiers).
 
 @item
 Think assembly - make it easier for the compiler to optimize your code.
@@ -232,14 +240,8 @@ Comment your code when you do something that someone else may think
 is not ''trivial''.
 
 @item
-Use the @code{my_*} functions like @code{my_read()}/@code{my_write()}/
-@code{my_malloc()} that you can find in the @code{mysys} library instead 
-of the direct system calls;  This will make your code easier to debug and 
-more portable.
-
-@item
-Use @code{libstring} functions instead of standard libc string functions
-whenever possible.
+Use @code{libstring} functions (in the strings directory)
+instead of standard libc string functions whenever possible.
 
 @item
 Avoid using @code{malloc()} (its REAL slow);  For memory allocations 
@@ -253,10 +255,6 @@ it.  This way we can easily provide you with feedback and also
 easily discuss it thoroughly if some other developer thinks there is better
 way to do the same thing!
 
-@item
-Use my_var as opposed to myVar or MyVar (@samp{_} rather than dancing SHIFT
-to seperate words in identifiers).
-
 @item
 Class names start with a capital letter.
 

Docs/manual.texi

@@ -9592,8 +9592,8 @@ version 4.0;
 @item
 The old C API functions @code{mysql_drop_db}, @code{mysql_create_db} and
 @code{mysql_connect} are not supported anymore, unless one compiles
-MySQL with @code{USE_OLD_FUNCTIONS}.   Instead of doing this, one should
-change the client to use the new 4.0 API.
+MySQL with @code{CFLAGS=-DUSE_OLD_FUNCTIONS}.  Instead of doing this,
+one should change the client to use the new 4.0 API.
 @item
 In the @code{MYSQL_FIELD} structure, @code{length} and @code{max_length} has
 changed from @code{unsigned int} to @code{unsigned long}. This should not
@@ -9616,6 +9616,10 @@ Format of @code{SHOW OPEN TABLE} has changed.
 @item
 Multithreaded clients should use @code{mysql_thread_init()} and
 @code{mysql_thread_end()}. @xref{Threaded clients}.
+@item
+If you want to recompile the perl DBD-MySQL module, you must get
+Msql-Mysql-modules version 1.2218 or newer, because the older DBD modules
+used the deprecated @code{drop_db()} call.
 @end itemize
 
 @node Upgrading-from-3.22, Upgrading-from-3.21, Upgrading-from-3.23, Upgrade
@@ -9660,6 +9664,10 @@ option @code{--no-named-commands (-g)}. This option can be disabled with
 some cases, for example in SQL scripts that use named commands without a
 semicolon!  Long format commands still work from the first line.
 
+@item
+Date functions that work on part of dates (like @code{MONTH()}) will now
+return 0 for @code{0000-00-00} dates. (MySQL 3.22 returned @code{NULL}).
+
 @item
 If you are using the @code{german} character sort order, you must repair
 all your tables with @code{isamchk -r}, as we have made some changes in
@@ -10368,6 +10376,8 @@ You can avoid using @file{libg++.a} by running @code{configure} like this:
 shell> CXX=gcc ./configure
 @end example
 
+If you are running gcc 3.0 and above, you can't use the above trick with
+CXX=gcc, but you have to install libstd++.
 
 @node Linux-SPARC, Linux-Alpha, Linux-x86, Linux
 @subsubsection Linux SPARC Notes
@@ -10950,6 +10960,10 @@ Because Windows doesn't allow you to drop files that are open, you first
 must flush all @code{MERGE} tables (with @code{FLUSH TABLES}) or drop the
 @code{MERGE} table before dropping the table.  We will fix this at the same 
 time we introduce @code{VIEW}s.
+@item
+@code{DATA DIRECTORY} and @code{INDEX DIRECTORY} directives in
+@code{CREATE TABLE} is ignored on windows, because windows doesn't support
+symbolic links.
 @end table
 
 Here are some open issues for anyone who might want to help us with the Windows
@@ -11184,7 +11198,7 @@ When using the @code{--with-libwrap} configure option, you must also
 include the libraries that @file{libwrap.a} needs:
 
 @example
---with-libwrap="/opt/NUtcpwrapper-7.6/lib/libwrap.a -lnsl -lsocket
+--with-libwrap="/opt/NUtcpwrapper-7.6/ -lnsl -lsocket
 @end example
 
 If you have problems with configure trying to link with @code{-lz} and
@@ -35648,15 +35662,6 @@ If you use @code{ALTER TABLE} on a @code{MyISAM} table, all non-unique
 indexes are created in a separate batch (like in @code{REPAIR}).
 This should make @code{ALTER TABLE} much faster when you have many indexes.
 
-@item
-Since @strong{MySQL 4.0} this can be activated explicitly.
-@code{ALTER TABLE ... DISABLE KEYS} makes MySQL to stop updating
-non-unique indexes for @code{MyISAM} table.
-@code{ALTER TABLE ... ENABLE KEYS} then should be used to recreate missing
-indexes. As MySQL does it with special algorithm which is much
-faster then inserting keys one by one, disabling keys could give a
-considerable speedup on bulk inserts.
-
 @item
 @findex mysql_info()
 With the C API function @code{mysql_info()}, you can find out how many
@@ -39091,7 +39096,14 @@ they roll back the corresponding SQL statement.
 
 @itemize @bullet
 
-@item @code{SHOW TABLE STATUS} does not give accurate statistics
+@item
+@strong{WARNING:} Do @strong{NOT} convert MySQL system tables from
+MyISAM TO InnoDB tables!  This is not supported; If you do this MySQL
+will not restart until you restore the old system tables from a backup
+or re-generate them with the mysql_install_db script.
+
+@item
+@code{SHOW TABLE STATUS} does not give accurate statistics
 on InnoDB tables, except for the physical size reserved by the table.
 The row count is only a rough estimate used in SQL optimization.
 
@@ -47349,7 +47361,7 @@ chapter or for the proper operation of the programs listed herein.
 Perl @code{Data-Dumper} module.  Useful with @code{DBI}/@code{DBD} support for
 older Perl installations.
 
-@item @uref{http://www.mysql.com/Downloads/Contrib/DBI-1.15.tar.gz, DBI-1.15.tar.gz}
+@item @uref{http://www.mysql.com/Downloads/Contrib/DBI-1.18.tar.gz, DBI-1.18.tar.gz}
 Perl @code{DBI} module.
 
 @item @uref{http://www.mysql.com/Downloads/Contrib/KAMXbase1.2.tar.gz,KAMXbase1.2.tar.gz}
@@ -47358,7 +47370,7 @@ module written by Pratap Pereira @email{pereira@@ee.eng.ohio-state.edu},
 extended by Kevin A. McGrail @email{kmcgrail@@digital1.peregrinehw.com}.
 This converter can handle MEMO fields.
 
-@item @uref{http://www.mysql.com/Downloads/Contrib/Msql-Mysql-modules-1.2216.tar.gz, Msql-Mysql-modules-1.2216.tar.gz}
+@item @uref{http://www.mysql.com/Downloads/Contrib/Msql-Mysql-modules-1.2218.tar.gz, Msql-Mysql-modules-1.2218.tar.gz}
 Perl @code{DBD} module to access mSQL and MySQL databases.
 
 @item @uref{http://www.mysql.com/Downloads/Contrib/Data-ShowTable-3.3.tar.gz,  Data-ShowTable-3.3.tar.gz}
@@ -47440,9 +47452,6 @@ A C++ database independent library that supports MySQL.
 @cindex Delphi
 @item Delphi
 @itemize @bullet
-@item @uref{http://www.mysql.com/Downloads/Contrib/delphi-interface.gz, delphi-interface.gz}
-Delphi interface to @code{libmysql.dll}, by Blestan Tabakov,
-@email{root@@tdg.bis.bg}.
 
 @item @uref{http://www.mysql.com/Downloads/Contrib/DelphiMySQL2.zip, DelphiMySQL2.zip}
 Delphi interface to @code{libmysql.dll}, by @email{bsilva@@umesd.k12.or.us}.
@@ -48656,6 +48665,8 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
 
 @itemize @bullet
 @item
+Ignore @code{DATA DIRECTORY} and @code{INDEX DIRECTORY} directives on windows.
+@item
 Added boolean fulltext search code. It should be considered early alpha.
 @item
 Extended @code{MODIFY} and @code{CHANGE} in @code{ALTER TABLE} to accept

acinclude.m4

@@ -652,7 +652,7 @@ if test -r /proc/cpuinfo ; then
   cpu_vendor=`$cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
 fi 
 if test "$cpu_vendor" = "AuthenticAMD"; then
-    if test $cpu_family>=6; then
+    if test $cpu_family -ge 6; then
       cpu_set="athlon pentiumpro k5 pentium i486 i386";
     elif test $cpu_family=5; then
       cpu_set="k5 pentium i486 i386";
@@ -662,7 +662,7 @@ if test "$cpu_vendor" = "AuthenticAMD"; then
       cpu_set="i386"
     fi
 elif test "$cpu_vendor" = "GenuineIntel"; then
-    if test $cpu_family>=6; then
+    if test $cpu_family -ge 6; then
       cpu_set="pentiumpro pentium i486 i386";
     elif test $cpu_family=5; then
       cpu_set="pentium i486 i386";

configure.in

@@ -1769,7 +1769,7 @@ then
 fi
 AC_SUBST(tools_dirs)
 
-MYSQL_CHECK_CPU
+#MYSQL_CHECK_CPU
 MYSQL_CHECK_MYSQLFS
 MYSQL_CHECK_VIO
 MYSQL_CHECK_OPENSSL

include/mysql.h

@@ -253,15 +253,15 @@ typedef struct st_mysql_manager
 /* Set up and bring down the server; to ensure that applications will
  * work when linked against either the standard client library or the
  * embedded server library, these functions should be called. */
-int mysql_server_init(int argc, char **argv, char **groups);
-void mysql_server_end(void);
+int STDCALL mysql_server_init(int argc, char **argv, char **groups);
+void STDCALL mysql_server_end(void);
 
 /* Set up and bring down a thread; these function should be called
  * for each thread in an application which opens at least one MySQL
  * connection.  All uses of the connection(s) should be between these
  * function calls. */
-my_bool mysql_thread_init(void);
-void mysql_thread_end(void);
+my_bool STDCALL mysql_thread_init(void);
+void STDCALL mysql_thread_end(void);
 
 /* Functions to get information from the MYSQL and MYSQL_RES structures */
 /* Should definitely be used if one uses shared libraries */
@@ -414,8 +414,8 @@ MYSQL *		STDCALL mysql_connect(MYSQL *mysql, const char *host,
 int		STDCALL mysql_create_db(MYSQL *mysql, const char *DB);
 int		STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
 #define	 mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
-#define HAVE_MYSQL_REAL_CONNECT
 #endif
+#define HAVE_MYSQL_REAL_CONNECT
 
 /*
   The following functions are mainly exported because of mysqlbinlog;

include/mysqld_error.h

@@ -214,12 +214,16 @@
 #define ER_NO_PERMISSION_TO_CREATE_USER 1211
 #define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212
 #define ER_LOCK_DEADLOCK 1213
-#define ER_CONNECT_TO_MASTER 1214
-#define ER_QUERY_ON_MASTER 1215
-#define ER_ERROR_WHEN_EXECUTING_COMMAND 1216
-#define ER_WRONG_USAGE 1217
-#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1218
-#define ER_CANT_UPDATE_WITH_READLOCK 1219
-#define ER_MIXING_NOT_ALLOWED 1220
-#define ER_DUP_ARGUMENT 1221
-#define ER_ERROR_MESSAGES 222
+#define ER_TABLE_CANT_HANDLE_FULLTEXT 1214
+#define ER_CANNOT_ADD_FOREIGN 1215
+#define ER_NO_REFERENCED_ROW 1216
+#define ER_ROW_IS_REFERENCED 1217
+#define ER_CONNECT_TO_MASTER 1218
+#define ER_QUERY_ON_MASTER 1219
+#define ER_ERROR_WHEN_EXECUTING_COMMAND 1220
+#define ER_WRONG_USAGE 1221
+#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1222
+#define ER_CANT_UPDATE_WITH_READLOCK 1223
+#define ER_MIXING_NOT_ALLOWED 1224
+#define ER_DUP_ARGUMENT 1225
+#define ER_ERROR_MESSAGES 226

libmysql/libmysql.c

@@ -91,17 +91,17 @@ static sig_handler pipe_sig_handler(int sig);
 static ulong mysql_sub_escape_string(CHARSET_INFO *charset_info, char *to,
 				     const char *from, ulong length);
 
-int mysql_server_init(int argc __attribute__((unused)),
-		      char **argv __attribute__((unused)),
-		      char **groups __attribute__((unused)))
+int STDCALL mysql_server_init(int argc __attribute__((unused)),
+			      char **argv __attribute__((unused)),
+			      char **groups __attribute__((unused)))
 {
   return 0;
 }
 
-void mysql_server_end()
+void STDCALL mysql_server_end()
 {}
 
-my_bool mysql_thread_init()
+my_bool STDCALL mysql_thread_init()
 {
 #ifdef THREAD
     return my_thread_init();
@@ -110,7 +110,7 @@ my_bool mysql_thread_init()
 #endif
 }
 
-void mysql_thread_end()
+void STDCALL mysql_thread_end()
 {
 #ifdef THREAD
     my_thread_end();

libmysqld/lib_sql.cc

@@ -296,7 +296,7 @@ extern "C"
 
 static my_bool inited, org_my_init_done;
 
-int mysql_server_init(int argc, char **argv, char **groups)
+int STDCALL mysql_server_init(int argc, char **argv, char **groups)
 {
   char glob_hostname[FN_REFLEN];
 
@@ -561,7 +561,7 @@ int mysql_server_init(int argc, char **argv, char **groups)
 }
 
 
-void mysql_server_end()
+void STDCALL mysql_server_end()
 {
   clean_up(0);
 #ifdef THREAD
@@ -571,7 +571,7 @@ void mysql_server_end()
 #endif
 }
 
-my_bool mysql_thread_init()
+my_bool STDCALL mysql_thread_init()
 {
 #ifdef THREAD
   return my_thread_init();
@@ -580,7 +580,7 @@ my_bool mysql_thread_init()
 #endif
 }
 
-void mysql_thread_end()
+void STDCALL mysql_thread_end()
 {
 #ifdef THREAD
   my_thread_end();

sql-bench/test-select.sh

@@ -141,7 +141,7 @@ if ($limits->{'group_functions'})
   $loop_time=new Benchmark;
   for ($tests=0 ; $tests < $opt_loop_count ; $tests++)
   {
-    fetch_all_rows($dbh,"select sum(idn+$tests),sum(rev_idn-$tests) from bench1");
+    fetch_all_rows($dbh,"select sum(idn+100),sum(rev_idn-100) from bench1");
   }
   $end_time=new Benchmark;
   print "Time for select_query_cache ($opt_loop_count): " .

sql/share/czech/errmsg.txt

@@ -224,6 +224,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/danish/errmsg.txt

@@ -218,6 +218,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/dutch/errmsg.txt

@@ -221,6 +221,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/english/errmsg.txt

@@ -215,6 +215,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/estonian/errmsg.txt

@@ -219,6 +219,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/french/errmsg.txt

@@ -215,6 +215,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/german/errmsg.txt

@@ -218,6 +218,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/greek/errmsg.txt

@@ -215,6 +215,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/hungarian/errmsg.txt

@@ -217,6 +217,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/italian/errmsg.txt

@@ -215,6 +215,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/japanese/errmsg.txt

@@ -217,6 +217,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/korean/errmsg.txt

@@ -215,6 +215,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/norwegian-ny/errmsg.txt

@@ -217,6 +217,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/norwegian/errmsg.txt

@@ -217,6 +217,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/polish/errmsg.txt

@@ -219,6 +219,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/portuguese/errmsg.txt

@@ -215,6 +215,10 @@
 "Não é permitido a %-.32s@%-.64s criar novos usuários",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/romanian/errmsg.txt

@@ -219,6 +219,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/russian/errmsg.txt

@@ -207,22 +207,26 @@
 "   slave,       CHANGE MASTER TO",
 "    master info,  persmissions   master.info",
 "    SLAVE,   ",
-"User %-.64s has already more than 'max_user_connections' active connections",
-"You may only use constant expressions with SET",
-"Lock wait timeout exceeded",
-"The total number of locks exceeds the lock table size",
-"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
-"DROP DATABASE not allowed while thread is holding global read lock",
-"CREATE DATABASE not allowed while thread is holding global read lock",
-"Wrong arguments to %s",
-"%-.32s@%-.64s is not allowed to create new users",
-"Incorrect table definition; All MERGE tables must be in the same database",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Error connecting to master: %-.128s",
-"Error running query on master: %-.128s",
-"Error when executing command %s: %-.128s",
-"Wrong usage of %s and %s",
-"The used SELECT statements have a different number of columns",
-"Can't execute the query because you have a conflicting read lock",
-"Mixing of transactional and non-transactional tables is disabled",
-"Option '%s' used twice in statement",
+"  %-.64s    'max_user_connections'  ",
+"   -   SET",
+"  ",
+"      ",
+"        READ UNCOMMITTED ",
+"DROP DATABASE      ",
+"CREATE DATABASE      ",
+"   %s",
+"%-.32s@%-.64s      ",
+"  ;  MERGE-      ",
+" deadlock    ;   ",
+"      FULLTEXT ",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
+"   master: %-.128s",
+"    master: %-.128s",
+"   %s: %-.128s",
+"  %s  %s",
+" SELECT-    ",
+"   -   ",
+"  transactional  non-transactional  ",
+" '%s'  ",

sql/share/slovak/errmsg.txt

@@ -223,6 +223,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/spanish/errmsg.txt

@@ -216,6 +216,10 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error de coneccion a master: %-128s",
 "Error executando el query en master: %-128%",
 "Error de %s: %-128%",

sql/share/swedish/errmsg.txt

@@ -215,6 +215,10 @@
 "%-.32s@%-.64s har inte rättighet att skapa nya användare",
 "Felaktig tabell definition: Alla tabeller i en MERGE tabell måste vara i samma databas",
 "Fick 'DEADLOCK' vid låsförsök av block/rad; Försök att starta om transaktionen",
+"Tabelltypen har inte hantering av FULLTEXT index",
+"Kan inte lägga till 'FOREIGN KEY constraint'",
+"FOREIGN KEY konflikt:  Kan inte skriva barn",
+"FOREIGN KEY konflikt:  Kan inte radera fader",
 "Fick fel vid anslutning till master: %-.128s",
 "Fick fel vid utförande av command på mastern: %-.128s",
 "Fick fel vid utförande av %s: %-.128s",

sql/share/ukrainian/errmsg.txt

@@ -220,6 +220,10 @@
 " %-.32s@%-.64s     ަ",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/sql_parse.cc

@@ -1294,6 +1294,9 @@ mysql_execute_command(void)
       res=0;
       break;
     }
+#ifndef HAVE_READLINK
+    lex->create_info.data_file_name=lex->create_info.index_file_name=0;
+#else
     /* Fix names if symlinked tables */
     if (append_file_to_dir(&lex->create_info.data_file_name, tables->name) ||
 	append_file_to_dir(&lex->create_info.index_file_name, tables->name))
@@ -1301,6 +1304,7 @@ mysql_execute_command(void)
       res=-1;
       break;
     }
+#endif
     if (select_lex->item_list.elements)		// With select
     {
       select_result *result;

sql/sql_select.cc

@@ -3213,7 +3213,7 @@ remove_eq_conds(COND *cond,Item::cond_result *cond_value)
     }
   }
   *cond_value=Item::COND_OK;
-  return cond;				/* Point at next and level */
+  return cond;					// Point at next and level
 }
 
 /*