RENAME TABLE table_name TO new_table_name ; Faster Alloc

Small bug fixes myisammrg/myrg_rfirst.c: Change mode to -rw-rw-r-- myisammrg/myrg_rlast.c: Change mode to -rw-rw-r-- myisammrg/myrg_rnext.c: Change mode to -rw-rw-r-- myisammrg/myrg_rprev.c: Change mode to -rw-rw-r-- Docs/manual.texi: Update of RENAME configure.in: Portability fix include/global.h: Fix for ODBC and Intel Ia64 include/mysqld_error.h: RENAME TABLE myisam/myisamchk.c: Faster --fast myisammrg/myrg_queue.c: Bug fix myisammrg/myrg_rkey.c: Portability fix sql-bench/test-insert.sh: Fix for duplicate key test sql/ChangeLog: Changelog sql/Makefile.am: RENAME TABLE sql/item_sum.cc: Fix for COUNT(DISTINCT) sql/lock.cc: RENAME TABLE sql/share/czech/errmsg.sys: RENAME TABLE sql/share/czech/errmsg.txt: RENAME TABLE sql/share/danish/errmsg.sys: RENAME TABLE sql/share/danish/errmsg.txt: RENAME TABLE sql/share/dutch/errmsg.sys: RENAME TABLE sql/share/dutch/errmsg.txt: RENAME TABLE sql/share/english/errmsg.sys: RENAME TABLE sql/share/english/errmsg.txt: RENAME TABLE sql/share/estonia/errmsg.sys: RENAME TABLE sql/share/estonia/errmsg.txt: RENAME TABLE sql/share/french/errmsg.sys: RENAME TABLE sql/share/french/errmsg.txt: RENAME TABLE sql/share/german/errmsg.sys: RENAME TABLE sql/share/german/errmsg.txt: RENAME TABLE sql/share/greek/errmsg.sys: RENAME TABLE sql/share/greek/errmsg.txt: RENAME TABLE sql/share/hungarian/errmsg.sys: RENAME TABLE sql/share/hungarian/errmsg.txt: RENAME TABLE sql/share/italian/errmsg.sys: RENAME TABLE sql/share/italian/errmsg.txt: RENAME TABLE sql/share/japanese/errmsg.sys: RENAME TABLE sql/share/japanese/errmsg.txt: RENAME TABLE sql/share/korean/errmsg.sys: RENAME TABLE sql/share/korean/errmsg.txt: RENAME TABLE sql/share/norwegian-ny/errmsg.txt: RENAME TABLE sql/share/norwegian/errmsg.txt: RENAME TABLE sql/share/polish/errmsg.sys: RENAME TABLE sql/share/polish/errmsg.txt: RENAME TABLE sql/share/portuguese/errmsg.sys: RENAME TABLE sql/share/portuguese/errmsg.txt: RENAME TABLE sql/share/romania/errmsg.sys: RENAME TABLE sql/share/romania/errmsg.txt: RENAME TABLE sql/share/romanian/errmsg.txt: ***MISSING WEAVE*** sql/share/russian/errmsg.sys: RENAME TABLE sql/share/russian/errmsg.txt: RENAME TABLE sql/share/slovak/errmsg.sys: RENAME TABLE sql/share/slovak/errmsg.txt: RENAME TABLE sql/share/spanish/errmsg.sys: RENAME TABLE sql/share/spanish/errmsg.txt: RENAME TABLE sql/share/swedish/errmsg.OLD: RENAME TABLE sql/share/swedish/errmsg.sys: RENAME TABLE sql/share/swedish/errmsg.txt: RENAME TABLE sql/slave.cc: Faster alloc sql/sql_base.cc: RENAME TABLE sql/sql_class.cc: Faster alloc sql/sql_class.h: Faster alloc sql/sql_insert.cc: Fix bug in INSERT ... SELECT to BDB table sql/sql_lex.h: RENAME TABLE sql/sql_select.cc: Faster alloc sql/sql_show.cc: Faster alloc sql/sql_table.cc: RENAME TABLE sql/sql_yacc.yy: RENAME TABLE sql/thr_malloc.cc: Faster alloc sql/unireg.h: RENAME TABLE strings/ctype-sjis.c: Portability fix
author: unknown <monty@donna.mysql.com> 2000-08-21 03:00:52 +0300
committer: unknown <monty@donna.mysql.com> 2000-08-21 03:00:52 +0300
commit: 55c5016f92383fdf7cd14de4ef3ec5afbb89fd5a (patch)
tree: f46edbbf41f400440bde25519820b29885305b1b
parent: 259c7ea0f84f25d82ec7b818e5b770f0bc7917d3 (diff)
download: mariadb-git-55c5016f92383fdf7cd14de4ef3ec5afbb89fd5a.tar.gz
66 files changed, 544 insertions, 280 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 13df8e1eda4..c25b25b38be 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -275,7 +275,7 @@ Is there anything special to do when upgrading/downgrading MySQL?
 How standards-compatible is MySQL?
 
 * Extensions to ANSI::          @strong{MySQL} extensions to ANSI SQL92
-* Ansi mode::                   Running @strong{MySQL} in ANSI mode
+* Ansi mode::                   Runnning @strong{MySQL} in ANSI mode
 * Differences from ANSI::       @strong{MySQL} differences compared to ANSI SQL92
 * Missing functions::           Functionality missing from @strong{MySQL}
 * Standards::                   What standards does @strong{MySQL} follow?
@@ -323,6 +323,7 @@ MySQL language reference
 * DROP DATABASE::               @code{DROP DATABASE} syntax
 * CREATE TABLE::                @code{CREATE TABLE} syntax
 * ALTER TABLE::                 @code{ALTER TABLE} syntax
+* RENAME TABLE::                
 * DROP TABLE::                  @code{DROP TABLE} syntax
 * OPTIMIZE TABLE::              @code{OPTIMIZE TABLE} syntax
 * CHECK TABLE::                 @code{CHECK TABLE} syntax
@@ -608,7 +609,7 @@ Using @code{MySQL} with some common programs
 
 Problems and common errors
 
-* What is crashing::            How to determine what is causing problems
+* What is crashing::            How to determinate what is causing problems
 * Crashing::                    What to do if @strong{MySQL} keeps crashing
 * Link errors::                 Problems when linking with the @strong{MySQL} client library
 * Common errors::               Some common errors when using @strong{MySQL}
@@ -647,7 +648,7 @@ Some common errors when using MySQL
 
 Solving some common problems with MySQL
 
-* Log Replication::             Database replication with update log
+* Log Replication::             Database replication with  update log
 * Backup::                      Database backups
 * Update log::                  The update log
 * Multiple servers::            Running multiple @strong{MySQL} servers on the same machine
@@ -720,7 +721,7 @@ C API function descriptions
 * mysql_store_result::          @code{mysql_store_result()}
 * mysql_thread_id::             @code{mysql_thread_id()}
 * mysql_use_result::            @code{mysql_use_result()}
-* NULL mysql_store_result::     Why is it that after @code{mysql_query()} returns success, @code{mysql_store_result()} sometimes returns @code{NULL}?
+* NULL mysql_store_result::     Why is it that after @code{mysql_query()} returns success, @code{mysql_store_result()} sometimes returns @code{NULL?}
 * Query results::               What results can I get from a query?
 * Getting unique ID::           How can I get the unique ID for the last inserted row?
 * C API linking problems::      Problems linking with the C API
@@ -1826,7 +1827,7 @@ Apart from the following links, you can find and download a lot of
 @strong{MySQL} programs, tools and APIs from the
 @uref{http://www.mysql.com/Contrib/, Contrib directory}.
 
-@subheading Tutorials and manuals
+@subheading Tutorials and Manuals
 @itemize @bullet
 
 @c just forwards to the devshed link below.. (jcole)
@@ -2026,6 +2027,11 @@ reviewing.
 @item
 @uref{http://www.omnis-software.com/products/studio/studio.html, OMNIS}
 OMNIS Studio is a rapid application development (RAD) tool.
+@item
+@uref{http://www.webplus.com, talentsoft Web+ 4.6}
+Web+ is a powerful and comprehensive development language for use in
+creating web-based client/server applications without writing complicated,
+low-level and time-consuming CGI programs.
 @end itemize
 
 @subheading Database design tools with MySQL support
@@ -8959,6 +8965,7 @@ comparisons to be done according to the ASCII order used on the
 @strong{MySQL} maps each database to a directory under the @strong{MySQL}
 data directory, and tables within a database to filenames in the database
 directory.
+
 This has two implications:
 
 @itemize @minus
@@ -9015,11 +9022,12 @@ Use of @code{TEMPORARY} or @code{IF NOT EXISTS} with @code{CREATE TABLE}.
 Use of @code{COUNT(DISTINCT list)} where 'list' is more than one element.
 
 @item
-Use of @code{CHANGE col_name}, @code{DROP col_name} or @code{DROP INDEX}
-in an @code{ALTER TABLE} statement. @xref{ALTER TABLE, , @code{ALTER TABLE}}.
+Use of @code{CHANGE col_name}, @code{DROP col_name} or @code{DROP
+INDEX}, @code{IGNORE} or @code{RENAME} in an @code{ALTER TABLE}
+statement. @xref{ALTER TABLE, , @code{ALTER TABLE}}.
 
 @item
-Use of @code{IGNORE} in an @code{ALTER TABLE} statement.
+Use of @code{RENAME TABLE}. @xref{RENAME TABLE, , @code{RENAME TABLE}}.
 
 @item
 Use of multiple @code{ADD}, @code{ALTER}, @code{DROP} or @code{CHANGE}
@@ -11636,6 +11644,7 @@ to restart @code{mysqld} with @code{--skip-grant-tables} to be able to run
 * DROP DATABASE::               @code{DROP DATABASE} syntax
 * CREATE TABLE::                @code{CREATE TABLE} syntax
 * ALTER TABLE::                 @code{ALTER TABLE} syntax
+* RENAME TABLE::                
 * DROP TABLE::                  @code{DROP TABLE} syntax
 * OPTIMIZE TABLE::              @code{OPTIMIZE TABLE} syntax
 * CHECK TABLE::                 @code{CHECK TABLE} syntax
@@ -15973,15 +15982,16 @@ mysql> select COUNT(*) from student;
 @findex COUNT(DISTINCT)
 @findex DISTINCT
 @item COUNT(DISTINCT expr,[expr...])
-Returns a count of the number of different values.
+Returns a count of the number of different not @code{NULL} values.
 
 @example
 mysql> select COUNT(DISTINCT results) from student;
 @end example
 
-In @strong{MySQL} you can get the number of distinct expressions combinations
-by giving a list of expressions.  In ANSI SQL you would have to do a
-concatenation of all expressions inside @code{CODE(DISTINCT ..)}.
+In @strong{MySQL} you can get the number of distinct expressions
+combinations that doesn't contain NULL by giving a list of expressions.
+In ANSI SQL you would have to do a concatenation of all expressions
+inside @code{CODE(DISTINCT ..)}.
 
 @findex AVG()
 @item AVG(expr)
@@ -16547,7 +16557,7 @@ Certain other column type changes may occur if you compress a table
 using @code{myisampack}. @xref{Compressed format}.
 
 @findex ALTER TABLE
-@node ALTER TABLE, DROP TABLE, CREATE TABLE, Reference
+@node ALTER TABLE, RENAME TABLE, CREATE TABLE, Reference
 @section @code{ALTER TABLE} syntax
 
 @example
@@ -16565,7 +16575,7 @@ alter_specification:
   or    DROP [COLUMN] col_name
   or    DROP PRIMARY KEY
   or    DROP INDEX index_name
-  or    RENAME [AS] new_tbl_name
+  or    RENAME [TO] new_tbl_name
   or    table_options
 @end example
 
@@ -16621,9 +16631,10 @@ INDEX} are @strong{MySQL} extensions to ANSI SQL92.
 The optional word @code{COLUMN} is a pure noise word and can be omitted.
 
 @item
-If you use @code{ALTER TABLE tbl_name RENAME AS new_name} without any other
+If you use @code{ALTER TABLE tbl_name RENAME TO new_name} without any other
 options, @strong{MySQL} simply renames the files that correspond to the table
 @code{tbl_name}.  There is no need to create the temporary table.
+@xref{RENAME TABLE,, @code{RENAME TABLE}}.
 
 @item
 @code{create_definition} clauses use the same syntax for @code{ADD} and
@@ -16775,8 +16786,47 @@ sequence number be executing @code{SET INSERT_ID=#} before
 
 See also @xref{ALTER TABLE problems, , @code{ALTER TABLE} problems}.
 
+@findex RENAME TABLE
+@node RENAME TABLE, DROP TABLE, ALTER TABLE, Reference
+@section @code{RENAME TABLE} syntax
+
+@example
+RENAME TABLE tbl_name as new_table_name[, tbl_name2 as new_table_name2,...]
+@end example
+
+The rename is done atomic, which means that if no other thread can
+access any of the tables while the rename is running. This makes it
+possible to replace a table with an empty one:
+
+@example
+CREATE TABLE new_table (...);
+RENAME TABLE old_table TO backup_table, new_table as old_table;
+@end example
+
+The rename is done from left to right, which means that if you want to
+swap two tables names, you have to do:
+
+@example
+RENAME TABLE old_table TO backup_table, new_table as old_table, backup_table as old_table;
+@end example
+
+Is long as two databases are on the same disk you can also do a rename
+from a database to another:
+
+@example
+RENAME TABLE current_database.table_name TO other_database.table_name;
+@end example
+
+When you execute @code{RENAME}, you can't have any locked tables or active
+transactions.  You must also have the @code{ALTER TABLE} privilege on both
+the old and the new table.
+
+If @strong{MySQL} encounters any errors in a multiple table rename, it
+will do a reverse rename for all renamed tables to get everything back
+to the original state.
+
 @findex DROP TABLE
-@node DROP TABLE, OPTIMIZE TABLE, ALTER TABLE, Reference
+@node DROP TABLE, OPTIMIZE TABLE, RENAME TABLE, Reference
 @section @code{DROP TABLE} syntax
 
 @example
@@ -19172,9 +19222,8 @@ may be a column name or a string containing the SQL @samp{%} and @samp{_}
 wildcard characters.
 
 If the column types are different than you expect them to be based on a
-@code{CREATE TABLE} statement, note that @strong{MySQL} sometimes changes column
-types.
-@xref{Silent column changes}.
+@code{CREATE TABLE} statement, note that @strong{MySQL} sometimes
+changes column types.  @xref{Silent column changes}.
 
 @cindex Oracle compatibility
 @cindex Compatibility, with Oracle
@@ -35350,6 +35399,10 @@ and will soon be declared beta, gamma and release.
 @appendixsubsec Changes in release 3.23.23
 @itemize @bullet
 @item
+Added atomic @code{RENAME} command.
+@item
+Don't count entries with @code{NULL} in @code{COUNT(DISTINCT ..)}.
+@item
 Changed @code{ALTER TABLE}, @code{LOAD DATA INFILE} on empty tables and
 @code{INSERT ... SELECT...} on empty tables to create non-unique indexs
 in a separate batch with sorting. This will make the above calls much
@@ -35372,7 +35425,9 @@ that don't have the @code{pthread_rwlock_rdlock} code.
 When deleting rows with a non-unique key in a HEAP table, all rows weren't 
 always deleted.
 @item
-Fixed that BDB tables work on part keys.
+Fixed that @code{SELECT} on part keys works with BDB tables.
+@item
+Fixed that @code{INSERT INTO bdb_table  ... SELECT} works with BDB tables.
 @item
 Check table now updates key statistics for the table.
 @item
@@ -35382,11 +35437,18 @@ will not be marked to be analyzed until they are updated in any way with
 3.23.23 or newer.  For older tables, you have to do @code{CHECK TABLE}
 to update the key distribution.
 @item
+Fixed some minor privilege problems with @code{CHECK}, @code{ANALYZE},
+@code{REPAIR} and @code{SHOW CREATE} commands.
+@item
 Added @code{CHANGE MASTER TO} command
 @item
 Added @code{FAST}, @code{QUICK} @code{EXTENDED} check types to
 @code{CHECK TABLES}.
 @item
+Changed @code{myisamchk} so that @code{--fast} and
+@code{--check-changed-tables} are also honored with @code{--sort-index} and
+@code{--analyze}.
+@item
 Fixed fatal bug in @code{LOAD TABLE FROM MASTER} that did not lock the table during index re-build
 @item
 @code{LOAD DATA INFILE} broke replication if the database was excluded from replication 
@@ -38130,7 +38192,7 @@ Added new commands @code{CREATE DATABASE db_name} and @code{DROP
 DATABASE db_name}.
 @item
 Added @code{RENAME} option to @code{ALTER TABLE}: @code{ALTER TABLE name
-RENAME AS new_name}.
+RENAME TO new_name}.
 @item
 @code{make_binary_distribution} now includes @file{libgcc.a} in
 @file{libmysqlclient.a}. This should make linking work for people who don't
@@ -39474,7 +39536,7 @@ Fail safe replication.
 @item
 Optimize, test and document transactions safe tables
 @item
-@code{RENAME table as table, table as table [,...]}
+@code{RENAME table to table, table to table [,...]}
 @item
 Allow users to change startup options.
 @item
@@ -39656,6 +39718,13 @@ A logfile analyzer that could parsed out information about which tables
 are hit most often, how often multi-table joins are executed, etc.  It
 should help users identify areas or table design that could be optimized
 to execute much more efficient queries.
+@item
+Add @code{SUM(DISTINCT)}
+@item
+Add @code{ANY()},@code{EVERY()} and @code{SOME()} group functions. In
+ANSI SQL these only works on boolean columns, but we can extend these to
+work on any columns/expressions by applying: value == 0 -> FALSE and
+value <> 0 -> TRUE.
 @end itemize
 
 @node TODO sometime, TODO unplanned, TODO future, TODO
diff --git a/configure.in b/configure.in
index bf661b56f35..88496f601f8 100644
--- a/configure.in
+++ b/configure.in
@@ -1709,10 +1709,10 @@ CHARSET_COMP_CS_INIT="$CHARSET_COMP_CS_INIT
   {
     0,          /* end-of-list marker */
     NullS,
-    \"\",
-    \"\",
-    \"\",
-    \"\",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
     0,
     NULL,
     NULL,
diff --git a/include/global.h b/include/global.h
index c56b1f83dc3..d7cd0ff9881 100644
--- a/include/global.h
+++ b/include/global.h
@@ -113,6 +113,12 @@
 #define HAVE_ATOMIC_SUB
 #endif
 
+/* In Linux-ia64 including atomic.h will give us an error */
+#if defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__ia64__)
+#undef HAVE_ATOMIC_ADD
+#undef HAVE_ATOMIC_SUB
+#endif
+
 #if defined(_lint) && !defined(lint)
 #define lint
 #endif
@@ -207,6 +213,7 @@
 #endif
 
 /* Define void to stop lint from generating "null effekt" comments */
+#ifndef DONT_DEFINE_VOID
 #ifdef _lint
 int	__void__;
 #define VOID(X)		(__void__ = (int) (X))
@@ -214,6 +221,7 @@ int	__void__;
 #undef VOID
 #define VOID(X)		(X)
 #endif
+#endif /* DONT_DEFINE_VOID */
 
 #if defined(_lint) || defined(FORCE_INIT_OF_VARS)
 #define LINT_INIT(var)	var=0			/* No uninitialize-warning */
@@ -515,6 +523,8 @@ typedef long		my_ptrdiff_t;
 #define NEAR				/* Who needs segments ? */
 #define FAR				/* On a good machine */
 #define HUGE_PTR
+#endif
+#ifndef STDCALL
 #define STDCALL
 #endif
 
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 9d3e879f4f5..d815e61f3b5 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -192,4 +192,5 @@
 #define ER_MASTER_NET_READ 1189
 #define ER_MASTER_NET_WRITE 1190
 #define ER_FT_MATCHING_KEY_NOT_FOUND 1191
-#define ER_ERROR_MESSAGES 192
+#define ER_LOCK_OR_ACTIVE_TRANSACTION 1192
+#define ER_ERROR_MESSAGES 193
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index abfb580b501..5740dcf76f5 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -190,7 +190,7 @@ static struct option long_options[] =
 
 static void print_version(void)
 {
-  printf("%s  Ver 1.29 for %s at %s\n",my_progname,SYSTEM_TYPE,
+  printf("%s  Ver 1.30 for %s at %s\n",my_progname,SYSTEM_TYPE,
 	 MACHINE_TYPE);
 }
 
@@ -295,7 +295,7 @@ static void get_options(register int *argc,register char ***argv)
   set_all_changeable_vars(changeable_vars);
   if (isatty(fileno(stdout)))
     check_param.testflag|=T_WRITE_LOOP;
-  while ((c=getopt_long(*argc,*argv,"acCdeif?lqrmosSTuUvVw#:b:D:k:O:R:A::t:",
+  while ((c=getopt_long(*argc,*argv,"acCdeifF?lqrmosSTuUvVw#:b:D:k:O:R:A::t:",
 			long_options, &option_index)) != EOF)
   {
     switch(c) {
@@ -520,22 +520,42 @@ static int myisamchk(MI_CHECK *param, my_string filename)
     We are using --fast and the table is closed properly
     We are using --check-only-changed-tables and the table hasn't changed
   */
-  if (((param->testflag & T_CHECK_ONLY_CHANGED) &&
-      (share->state.changed & (STATE_CHANGED | STATE_CRASHED |
-			       STATE_CRASHED_ON_REPAIR))) ||
-      (param->testflag & T_FAST) && share->state.open_count == 0)
+  if (param->testflag & (T_FAST | T_CHECK_ONLY_CHANGED))
   {
-    if (!(param->testflag & T_SILENT) || param->testflag & T_INFO)
-      printf("MyISAM file: %s is already checked\n",filename);
-    if (mi_close(info))
+    my_bool need_to_check= mi_is_crashed(info) || share->state.open_count != 0;
+
+    if ((param->testflag & (T_REP_BY_SORT | T_REP | T_SORT_RECORDS)) &&
+	((share->state.changed & (STATE_CHANGED | STATE_CRASHED |
+				  STATE_CRASHED_ON_REPAIR) ||
+	  !(param->testflag & T_CHECK_ONLY_CHANGED))))
+      need_to_check=1;
+
+    if ((param->testflag & T_STATISTICS) &&
+	(share->state.changed & STATE_NOT_ANALYZED))
+      need_to_check=1;
+    if ((param->testflag & T_SORT_INDEX) &&
+	(share->state.changed & STATE_NOT_SORTED_PAGES))
+      need_to_check=1;
+    if ((param->testflag & T_REP_BY_SORT) &&
+	(share->state.changed & STATE_NOT_OPTIMIZED_KEYS))
+      need_to_check=1;
+    if ((param->testflag & T_CHECK_ONLY_CHANGED) &&
+	(share->state.changed & (STATE_CHANGED | STATE_CRASHED |
+				 STATE_CRASHED_ON_REPAIR)))
+      need_to_check=1;
+    if (!need_to_check)
     {
-      mi_check_print_error(param,"%d when closing MyISAM-table '%s'",
-			   my_errno,filename);
-      DBUG_RETURN(1);
+      if (!(param->testflag & T_SILENT) || param->testflag & T_INFO)
+	printf("MyISAM file: %s is already checked\n",filename);
+      if (mi_close(info))
+      {
+	mi_check_print_error(param,"%d when closing MyISAM-table '%s'",
+			     my_errno,filename);
+	DBUG_RETURN(1);
+      }
+      DBUG_RETURN(0);
     }
-    DBUG_RETURN(0);
   }
-
   if ((param->testflag & (T_REP_BY_SORT | T_REP | T_STATISTICS |
 			  T_SORT_RECORDS | T_SORT_INDEX)) &&
       (((param->testflag & T_UNPACK) &&
diff --git a/myisammrg/myrg_queue.c b/myisammrg/myrg_queue.c
index 47ccdce1554..4917cbf7cf8 100644
--- a/myisammrg/myrg_queue.c
+++ b/myisammrg/myrg_queue.c
@@ -48,5 +48,6 @@ int _myrg_init_queue(MYRG_INFO *info,int inx,enum ha_rkey_function search_flag)
                      info->open_tables->table->s->keyinfo[inx].seg))
       return my_errno;
   }
+  return 0;
 }
 
diff --git a/myisammrg/myrg_rkey.c b/myisammrg/myrg_rkey.c
index 2f4cfb60068..84d0d46d9f2 100644
--- a/myisammrg/myrg_rkey.c
+++ b/myisammrg/myrg_rkey.c
@@ -25,6 +25,9 @@
                                                                    SerG
 */
 
+int _mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
+	     enum ha_rkey_function search_flag, bool raw_key);
+
 int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key,
             uint key_len, enum ha_rkey_function search_flag)
 {
diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh
index cdefcaf414f..b38d132d356 100755
--- a/sql-bench/test-insert.sh
+++ b/sql-bench/test-insert.sh
@@ -224,7 +224,7 @@ if ($limits->{'unique_index'})
     $tmpvar^= ((($tmpvar + 63) + $i)*3 % $opt_loop_count);
     $tmp=$tmpvar % ($total_rows);
     $tmpquery = "$query ($tmp,1,2,'D')";
-    if ($dbh->do($tmpquery))
+    if (!$dbh->do($tmpquery))
     {
       die "Didn't get an error when inserting duplicate record $tmp\n";
     }
diff --git a/sql/ChangeLog b/sql/ChangeLog
index 65a5bca0bf9..0ede1c5ff47 100644
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-20  Michael Widenius  <monty@mysql.com>
+
+* Added memory as inline functions to THD to get them a bit faster
+* Don't count entries with NULL in COUNT(DISTINCT ..)
+
 2000-08-08  Michael Widenius  <monty@mysql.com>
 
 * Changed ALTER TABLE and LOAD DATA INFILE to create non unique, small keys
diff --git a/sql/Makefile.am b/sql/Makefile.am
index df9236c7e5a..51a9c1e09fc 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -66,7 +66,7 @@ mysqld_SOURCES =	sql_lex.cc \
 		   	records.cc filesort.cc handler.cc \
 		        ha_isam.cc ha_isammrg.cc ha_heap.cc \
 			ha_myisam.cc ha_myisammrg.cc ha_berkeley.cc \
-			sql_db.cc sql_table.cc sql_crypt.cc \
+			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
 			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
 			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
 			slave.cc \
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 408e5d941ae..1c236e19bda 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -839,6 +839,10 @@ bool Item_sum_count_distinct::add()
   copy_fields(tmp_table_param);
   copy_funcs(tmp_table_param->funcs);
 
+  for (Field **field=table->field ; *field ; field++)
+    if ((*field)->is_real_null(0))
+      return 0;					// Don't count NULL
+
   if ((error=table->file->write_row(table->record[0])))
   {
     if (error != HA_ERR_FOUND_DUPP_KEY &&
diff --git a/sql/lock.cc b/sql/lock.cc
index b65ae5ddc3e..be942c2ec78 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -384,3 +384,87 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count,
   }
   return sql_lock;
 }
+
+/*****************************************************************************
+**  Lock table based on the name.
+**  This is used when we need total access to a closed, not open table
+*****************************************************************************/
+
+/*
+  Put a not open table with an old refresh version in the table cache.
+  This will force any other threads that uses the table to release it
+  as soon as possible.
+  One must have a lock on LOCK_open !
+  Return values:
+   < 0 error
+   == 0 table locked
+   > 0  table locked, but someone is using it
+*/
+
+
+int lock_table_name(THD *thd, TABLE_LIST *table_list)
+{
+  TABLE *table;
+  char  key[MAX_DBKEY_LENGTH];
+  uint  key_length;
+  key_length=(uint) (strmov(strmov(key,table_list->db)+1,table_list->name)-key)+
+    1;
+
+  /* Only insert the table if we haven't insert it already */
+  for (table=(TABLE*) hash_search(&open_cache,(byte*) key,key_length) ;
+       table ;
+       table = (TABLE*) hash_next(&open_cache,(byte*) key,key_length))
+    if (table->in_use == thd)
+      return 0;
+
+  /* Create a table entry with the right key and with an old refresh version */
+  if (!(table= (TABLE*) thd->calloc(sizeof(*table)+key_length)))
+    return -1;
+  memcpy((table->table_cache_key= (char*) (table+1)), key, key_length);
+  table->key_length=key_length;
+  table->in_use=thd;
+  table_list->table=table;
+
+  if (hash_insert(&open_cache, (byte*) table))
+    return -1;
+  if (remove_table_from_cache(thd, table_list->db, table_list->name))
+    return 1;					// Table is in use
+  return 0;
+}
+
+void unlock_table_name(THD *thd, TABLE_LIST *table_list)
+{
+  if (table_list->table)
+    hash_delete(&open_cache, (gptr) table_list->table);
+}
+
+static bool locked_named_table(THD *thd, TABLE_LIST *table_list)
+{
+  for ( ; table_list ; table_list=table_list->next)
+  {
+    if (table_list->table && table_is_used(table_list->table))
+      return 1;
+  }
+  return 0;					// All tables are locked
+}
+
+
+bool wait_for_locked_table_names(THD *thd, TABLE_LIST *table_list)
+{
+  bool result=0;
+
+  while (locked_named_table(thd,table_list))
+  {
+    if (thd->killed)
+    {
+      result=1;
+      break;
+    }
+    wait_for_refresh(thd);
+  }
+  pthread_mutex_lock(&thd->mysys_var->mutex);
+  thd->mysys_var->current_mutex=0;
+  thd->mysys_var->current_cond=0;
+  pthread_mutex_unlock(&thd->mysys_var->mutex);
+  return result;
+}
diff --git a/sql/share/czech/errmsg.sys b/sql/share/czech/errmsg.sys
index e509b71a857..2c20765abd3 100644
--- a/sql/share/czech/errmsg.sys
+++ b/sql/share/czech/errmsg.sys
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 7403c915bac..a3ddfefcb71 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -1,13 +1,13 @@
 /* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
    This file is public domain and comes with NO WARRANTY of any kind */
 
-/* Modifikoval Petr �najdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01 
+/* Modifikoval Petr -B�najdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01 -A
       ISO LATIN-8852-2
    Upravil Jan Pazdziora, adelton@fi.muni.cz
       Tue Nov 18 17:53:55 MET 1997 verze 0.02
-   Roz���eno podle 3.21.15c Jan Pazdziora, adelton@fi.muni.cz
+   Roz-B���eno podle 3.21.15c Jan Pazdziora, adelton@fi.muni.cz-A
       Tue Dec  2 19:08:54 MET 1997 verze 0.03
-   Roz���eno podle 3.21.29 Jan Pazdziora, adelton@fi.muni.cz
+   Roz-B���eno podle 3.21.29 Jan Pazdziora, adelton@fi.muni.cz-A
       Thu May  7 17:40:49 MET DST 1998 verze 0.04
    Podle verze 3.22.20 upravil Jan Pazdziora, adelton@fi.muni.cz
       Thu Apr  1 20:49:57 CEST 1999
@@ -19,191 +19,192 @@
 "isamchk",
 "NE",
 "ANO",
-"Nemohu vytvo�it soubor '%-.64s' (chybov� k�d: %d)",
-"Nemohu vytvo�it tabulku '%-.64s' (chybov� k�d: %d)",
-"Nemohu vytvo�it datab�zi '%-.64s', chyba %d",
-"Nemohu vytvo�it datab�zi '%-.64s', datab�ze ji� existuje",
-"Nemohu zru�it datab�zi '%-.64s', datab�ze neexistuje",
-"Chyba p�i ru�en� datab�ze (nemohu vymazat '%-.64s', chyba %d)",
-"Chyba p�i ru�en� datab�ze (nemohu vymazat adres�� '%-.64s', chyba %d)",
-"Chyba p�i v�mazu '%-.64s' (chybov� k�d: %d)",
-"Nemohu ��st z�znam v syst�mov� tabulce",
-"Nemohu z�skat stav '%-.64s' (chybov� k�d: %d)",
-"Chyba p�i zji��ov�n� pracovn� adres�� (chybov� k�d: %d)",
-"Nemohu uzamknout soubor (chybov� k�d: %d)",
-"Nemohu otev��t soubor '%-.64s' (chybov� k�d: %d)",
-"Nemohu naj�t soubor '%-.64s' (chybov� k�d: %d)",
-"Nemohu ��st adres�� '%-.64s' (chybov� k�d: %d)",
-"Nemohu zm�nit adres�� na '%-.64s' (chybov� k�d: %d)",
-"Z�znam byl zm�n�n od posledn�ho �ten� v tabulce '%-.64s'",
-"Disk je pln� (%s), �ek�m na uvoln�n� n�jak�ho m�sta ...",
-"Nemohu zapsat, zdvojen� kl�� v tabulce '%-.64s'",
-"Chyba p�i zav�r�n� '%-.64s' (chybov� k�d: %d)",
-"Chyba p�i �ten� souboru '%-.64s' (chybov� k�d: %d)",
-"Chyba p�i p�ejmenov�n� '%-.64s' na '%-.64s' (chybov� k�d: %d)",
-"Chyba p�i z�pisu do souboru '%-.64s' (chybov� k�d: %d)",
-"'%-.64s' je zam�en proti zm�n�m",
-"T��d�n� p�eru�eno",
+"Nemohu vytvo-B�it soubor '%-.64s' (chybov� k�d: %d)",-A
+"Nemohu vytvo-B�it tabulku '%-.64s' (chybov� k�d: %d)",-A
+"Nemohu vytvo-B�it datab�zi '%-.64s', chyba %d",-A
+"Nemohu vytvo-B�it datab�zi '%-.64s', datab�ze ji� existuje",-A
+"Nemohu zru-B�it datab�zi '%-.64s', datab�ze neexistuje",-A
+"Chyba p-B�i ru�en� datab�ze (nemohu vymazat '%-.64s', chyba %d)",-A
+"Chyba p-B�i ru�en� datab�ze (nemohu vymazat adres�� '%-.64s', chyba %d)",-A
+"Chyba p-B�i v�mazu '%-.64s' (chybov� k�d: %d)",-A
+"Nemohu -B��st z�znam v syst�mov� tabulce",-A
+"Nemohu z-B�skat stav '%-.64s' (chybov� k�d: %d)",-A
+"Chyba p-B�i zji��ov�n� pracovn� adres�� (chybov� k�d: %d)",-A
+"Nemohu uzamknout soubor (chybov-B� k�d: %d)",-A
+"Nemohu otev-B��t soubor '%-.64s' (chybov� k�d: %d)",-A
+"Nemohu naj-B�t soubor '%-.64s' (chybov� k�d: %d)",-A
+"Nemohu -B��st adres�� '%-.64s' (chybov� k�d: %d)",-A
+"Nemohu zm-B�nit adres�� na '%-.64s' (chybov� k�d: %d)",-A
+"Z-B�znam byl zm�n�n od posledn�ho �ten� v tabulce '%-.64s'",-A
+"Disk je pln-B� (%s), �ek�m na uvoln�n� n�jak�ho m�sta ...",-A
+"Nemohu zapsat, zdvojen-B� kl�� v tabulce '%-.64s'",-A
+"Chyba p-B�i zav�r�n� '%-.64s' (chybov� k�d: %d)",-A
+"Chyba p-B�i �ten� souboru '%-.64s' (chybov� k�d: %d)",-A
+"Chyba p-B�i p�ejmenov�n� '%-.64s' na '%-.64s' (chybov� k�d: %d)",-A
+"Chyba p-B�i z�pisu do souboru '%-.64s' (chybov� k�d: %d)",-A
+"'%-.64s' je zam-B�en proti zm�n�m",-A
+"T-B��d�n� p�eru�eno",-A
 "Pohled '%-.64s' pro '%-.64s' neexistuje",
-"Obsluha tabulky vr�tila chybu %d",
-"Obsluha tabulky '%-.64s' nem� tento parametr",
-"Nemohu naj�t z�znam v '%-.64s'",
-"Nespr�vn� informace v souboru '%-.64s'",
-"Nespr�vn� kl�� pro tabulku '%-.64s'. Pokuste se ho opravit",
-"Star� kl��ov� soubor pro '%-.64s'. Opravte ho.",
-"'%-.64s' je jen pro �ten�",
-"M�lo pam�ti. P�estartujte daemona a zkuste znovu (je pot�eba %d byt�)",
-"M�lo pam�ti pro t��d�n�. Zvy�te velikost t��d�c�ho bufferu",
-"Neo�ek�van� konec souboru p�i �ten� '%-.64s' (chybov� k�d: %d)",
-"P��li� mnoho spojen�",
-"M�lo prostoru/pam�ti pro thread",
-"Nemohu zjistit jm�no stroje pro Va�i adresu",
-"Chyba p�i ustavov�n� spojen�",
-"P��stup pro u�ivatele '%-.32s@%-.64s' k datab�zi '%-.64s' nen� povolen",
-"P��stup pro u�ivatele '%-.32s@%-.64s' (s heslem %s)",
-"Nebyla vybr�na ��dn� datab�ze",
-"Nezn�m� p��kaz",
-"Sloupec '%-.64s' nem��e b�t null",
-"Nezn�m� datab�ze '%-.64s'",
-"Tabulka '%-.64s' ji� existuje",
-"Nezn�m� tabulka '%-.64s'",
-"Sloupec '%-.64s' v %s nen� zcela jasn�",
-"Prob�h� ukon�ov�n� pr�ce serveru",
-"Nezn�m� sloupec '%-.64s' v %s",
-"Pou�it� '%-.64s' nebylo v group by",
-"Nemohu pou��t group na '%-.64s'",
-"P��kaz obsahuje z�rove� funkci sum a sloupce",
-"Po�et sloupc� neodpov�d� zadan� hodnot�",
-"Jm�no identifik�toru '%-.64s' je p��li� dlouh�",
-"Zdvojen� jm�no sloupce '%-.64s'",
-"Zdvojen� jm�no kl��e '%-.64s'",
-"Zvojen� kl�� '%-.64s' (��slo kl��e %d)",
-"Chybn� specifikace sloupce '%-.64s'",
-"%s bl�zko '%-.64s' na ��dku %d",
-"V�sledek dotazu je pr�zdn�",
-"Nejednozna�n� tabulka/alias: '%-.64s'",
-"Chybn� defaultn� hodnota pro '%-.64s'",
-"Definov�no v�ce prim�rn�ch kl���",
-"Zad�no p��li� mnoho kl���, je povoleno nejv�ce %d kl���",
-"Zad�no p��li� mnoho ��st kl���, je povoleno nejv�ce %d ��st�",
-"Zadan� kl�� byl p��li� dlouh�, nejv�t�� d�lka kl��e je %d",
-"Kl��ov� sloupec '%-.64s' v tabulce neexistuje",
-"Blob sloupec '%-.64s' nem��e b�t pou�it jako kl��",
-"P��li� velk� d�lka sloupce '%-.64s' (nejv�ce %d). Pou�ijte BLOB",
-"M��ete m�t pouze jedno AUTO pole a to mus� b�t definov�no jako kl��",
-"%s: p�ipraven na spojen�\n",
-"%s: norm�ln� ukon�en�\n",
-"%s: p�ijat signal %d, kon��m\n",
-"%s: ukon�en� pr�ce hotovo\n",
-"%s: n�siln� uzav�en� threadu %ld u�ivatele '%-.64s'\n",
-"Nemohu vytvo�it IP socket",
-"Tabulka '%-.64s' nem� index odpov�daj�c� CREATE INDEX. Vytvo�te tabulku znovu",
-"Argument separ�toru polo�ek nebyl o�ek�v�n. P�e�t�te si manu�l",
-"Nen� mo�n� pou��t pevn� rowlength s BLOBem. Pou�ijte 'fields terminated by'.",
-"Soubor '%-.64s' mus� b�t v adres��i datab�ze nebo �iteln� pro v�echny",
-"Soubor '%-.64s' ji� existuje",
-"Z�znam�: %ld  Vymaz�no: %ld  P�esko�eno: %ld  Varov�n�: %ld",
-"Z�znam�: %ld  Zdvojen�ch: %ld",
-"Chybn� pod��st kl��e -- nen� to �et�zec nebo je del�� ne� d�lka ��sti kl��e",
-"Nen� mo�n� vymazat v�echny polo�ky s ALTER TABLE. Pou�ijte DROP TABLE",
-"Nemohu zru�it '%-.64s' (prov�st DROP). Zkontrolujte, zda neexistuj� z�znamy/kl��e",
-"Z�znam�: %ld  Zdvojen�ch: %ld  Varov�n�: %ld",
-"INSERT TABLE '%-.64s' nen� dovoleno v seznamu tabulek FROM",
-"Nezn�m� identifikace threadu: %lu",
-"Nejste vlastn�kem threadu %lu",
-"Nejsou pou�ity ��dn� tabulky",
-"P��li� mnoho �et�zc� pro sloupec %s a SET",
-"Nemohu vytvo�it jednozna�n� jm�no logovac�ho souboru %s.(1-999)\n",
-"Tabulka '%-.64s' byla zam�ena s READ a nem��e b�t zm�n�na",
-"Tabulka '%-.64s' nebyla zam�ena s LOCK TABLES",
-"Blob polo�ka '%-.64s' nem��e m�t defaultn� hodnotu",
-"Nep��pustn� jm�no datab�ze '%-.64s'",
-"Nep��pustn� jm�no tabulky '%-.64s'",
-"Zadan� SELECT by proch�zel p��li� mnoho z�znam� a trval velmi dlouho. Zkontrolujte tvar WHERE a je-li SELECT v po��dku, pou�ijte SET OPTION SQL_BIG_SELECTS=1",
-"Nezn�m� chyba",
-"Nezn�m� procedura %s",
-"Chybn� po�et parametr� procedury %s",
-"Chybn� parametry procedury %s",
-"Nezn�m� tabulka '%-.64s' v %s",
-"Polo�ka '%-.64s' je zad�na dvakr�t",
-"Nespr�vn� pou�it� funkce group",
-"Tabulka '%-.64s' pou��v� roz���en�, kter� v t�to verzi MySQL nen�",
-"Tabulka mus� m�t alespo� jeden sloupec",
-"Tabulka '%-.64s' je pln�",
-"Nezn�m� znakov� sada: '%-.64s'",
-"P��li� mnoho tabulek, MySQL jich m��e m�t v joinu jen %d",
-"P��li� mnoho polo�ek",
-"��dek je p��li� velk�. Maxim�ln� velikost ��dku, nepo��taje polo�ky blob, je %d. Mus�te zm�nit n�kter� polo�ky na blob",
-"P�ete�en� z�sobn�ku threadu: pou�ito %ld z %ld. Pou�ijte 'mysqld -O thread_stack=#' k zad�n� v�t��ho z�sobn�ku",
-"V OUTER JOIN byl nalezen k���ov� odkaz. Prov��te ON podm�nky",
-"Sloupec '%-.32s' je pou�it s UNIQUE nebo INDEX, ale nen� definov�n jako NOT NULL",
-"Nemohu na��st funkci '%-.64s'",
+"Obsluha tabulky vr-B�tila chybu %d",-A
+"Obsluha tabulky '%-.64s' nem-B� tento parametr",-A
+"Nemohu naj-B�t z�znam v '%-.64s'",-A
+"Nespr-B�vn� informace v souboru '%-.64s'",-A
+"Nespr-B�vn� kl�� pro tabulku '%-.64s'. Pokuste se ho opravit",-A
+"Star-B� kl��ov� soubor pro '%-.64s'. Opravte ho.",-A
+"'%-.64s' je jen pro -B�ten�",-A
+"M-B�lo pam�ti. P�estartujte daemona a zkuste znovu (je pot�eba %d byt�)",-A
+"M-B�lo pam�ti pro t��d�n�. Zvy�te velikost t��d�c�ho bufferu",-A
+"Neo-B�ek�van� konec souboru p�i �ten� '%-.64s' (chybov� k�d: %d)",-A
+"P-B��li� mnoho spojen�",-A
+"M-B�lo prostoru/pam�ti pro thread",-A
+"Nemohu zjistit jm-B�no stroje pro Va�i adresu",-A
+"Chyba p-B�i ustavov�n� spojen�",-A
+"P-B��stup pro u�ivatele '%-.32s@%-.64s' k datab�zi '%-.64s' nen� povolen",-A
+"P-B��stup pro u�ivatele '%-.32s@%-.64s' (s heslem %s)",-A
+"Nebyla vybr-B�na ��dn� datab�ze",-A
+"Nezn-B�m� p��kaz",-A
+"Sloupec '%-.64s' nem-B��e b�t null",-A
+"Nezn-B�m� datab�ze '%-.64s'",-A
+"Tabulka '%-.64s' ji-B� existuje",-A
+"Nezn-B�m� tabulka '%-.64s'",-A
+"Sloupec '%-.64s' v %s nen-B� zcela jasn�",-A
+"Prob-B�h� ukon�ov�n� pr�ce serveru",-A
+"Nezn-B�m� sloupec '%-.64s' v %s",-A
+"Pou-B�it� '%-.64s' nebylo v group by",-A
+"Nemohu pou-B��t group na '%-.64s'",-A
+"P-B��kaz obsahuje z�rove� funkci sum a sloupce",-A
+"Po-B�et sloupc� neodpov�d� zadan� hodnot�",-A
+"Jm-B�no identifik�toru '%-.64s' je p��li� dlouh�",-A
+"Zdvojen-B� jm�no sloupce '%-.64s'",-A
+"Zdvojen-B� jm�no kl��e '%-.64s'",-A
+"Zvojen-B� kl�� '%-.64s' (��slo kl��e %d)",-A
+"Chybn-B� specifikace sloupce '%-.64s'",-A
+"%s bl-B�zko '%-.64s' na ��dku %d",-A
+"V-B�sledek dotazu je pr�zdn�",-A
+"Nejednozna-B�n� tabulka/alias: '%-.64s'",-A
+"Chybn-B� defaultn� hodnota pro '%-.64s'",-A
+"Definov-B�no v�ce prim�rn�ch kl���",-A
+"Zad-B�no p��li� mnoho kl���, je povoleno nejv�ce %d kl���",-A
+"Zad-B�no p��li� mnoho ��st kl���, je povoleno nejv�ce %d ��st�",-A
+"Zadan-B� kl�� byl p��li� dlouh�, nejv�t�� d�lka kl��e je %d",-A
+"Kl-B��ov� sloupec '%-.64s' v tabulce neexistuje",-A
+"Blob sloupec '%-.64s' nem-B��e b�t pou�it jako kl��",-A
+"P-B��li� velk� d�lka sloupce '%-.64s' (nejv�ce %d). Pou�ijte BLOB",-A
+"M-B��ete m�t pouze jedno AUTO pole a to mus� b�t definov�no jako kl��",-A
+"%s: p-B�ipraven na spojen�\n",-A
+"%s: norm-B�ln� ukon�en�\n",-A
+"%s: p-B�ijat signal %d, kon��m\n",-A
+"%s: ukon-B�en� pr�ce hotovo\n",-A
+"%s: n-B�siln� uzav�en� threadu %ld u�ivatele '%-.64s'\n",-A
+"Nemohu vytvo-B�it IP socket",-A
+"Tabulka '%-.64s' nem-B� index odpov�daj�c� CREATE INDEX. Vytvo�te tabulku znovu",-A
+"Argument separ-B�toru polo�ek nebyl o�ek�v�n. P�e�t�te si manu�l",-A
+"Nen-B� mo�n� pou��t pevn� rowlength s BLOBem. Pou�ijte 'fields terminated by'.",-A
+"Soubor '%-.64s' mus-B� b�t v adres��i datab�ze nebo �iteln� pro v�echny",-A
+"Soubor '%-.64s' ji-B� existuje",-A
+"Z-B�znam�: %ld  Vymaz�no: %ld  P�esko�eno: %ld  Varov�n�: %ld",-A
+"Z-B�znam�: %ld  Zdvojen�ch: %ld",-A
+"Chybn-B� pod��st kl��e -- nen� to �et�zec nebo je del�� ne� d�lka ��sti kl��e",-A
+"Nen-B� mo�n� vymazat v�echny polo�ky s ALTER TABLE. Pou�ijte DROP TABLE",-A
+"Nemohu zru-B�it '%-.64s' (prov�st DROP). Zkontrolujte, zda neexistuj� z�znamy/kl��e",-A
+"Z-B�znam�: %ld  Zdvojen�ch: %ld  Varov�n�: %ld",-A
+"INSERT TABLE '%-.64s' nen-B� dovoleno v seznamu tabulek FROM",-A
+"Nezn-B�m� identifikace threadu: %lu",-A
+"Nejste vlastn-B�kem threadu %lu",-A
+"Nejsou pou-B�ity ��dn� tabulky",-A
+"P-B��li� mnoho �et�zc� pro sloupec %s a SET",-A
+"Nemohu vytvo-B�it jednozna�n� jm�no logovac�ho souboru %s.(1-999)\n",-A
+"Tabulka '%-.64s' byla zam-B�ena s READ a nem��e b�t zm�n�na",-A
+"Tabulka '%-.64s' nebyla zam-B�ena s LOCK TABLES",-A
+"Blob polo-B�ka '%-.64s' nem��e m�t defaultn� hodnotu",-A
+"Nep-B��pustn� jm�no datab�ze '%-.64s'",-A
+"Nep-B��pustn� jm�no tabulky '%-.64s'",-A
+"Zadan-B� SELECT by proch�zel p��li� mnoho z�znam� a trval velmi dlouho. Zkontrolujte tvar WHERE a je-li SELECT v po��dku, pou�ijte SET OPTION SQL_BIG_SELECTS=1",-A
+"Nezn-B�m� chyba",-A
+"Nezn-B�m� procedura %s",-A
+"Chybn-B� po�et parametr� procedury %s",-A
+"Chybn-B� parametry procedury %s",-A
+"Nezn-B�m� tabulka '%-.64s' v %s",-A
+"Polo-B�ka '%-.64s' je zad�na dvakr�t",-A
+"Nespr-B�vn� pou�it� funkce group",-A
+"Tabulka '%-.64s' pou-B��v� roz���en�, kter� v t�to verzi MySQL nen�",-A
+"Tabulka mus-B� m�t alespo� jeden sloupec",-A
+"Tabulka '%-.64s' je pln-B�",-A
+"Nezn-B�m� znakov� sada: '%-.64s'",-A
+"P-B��li� mnoho tabulek, MySQL jich m��e m�t v joinu jen %d",-A
+"P-B��li� mnoho polo�ek",-A
+"-B��dek je p��li� velk�. Maxim�ln� velikost ��dku, nepo��taje polo�ky blob, je %d. Mus�te zm�nit n�kter� polo�ky na blob",-A
+"P-B�ete�en� z�sobn�ku threadu: pou�ito %ld z %ld. Pou�ijte 'mysqld -O thread_stack=#' k zad�n� v�t��ho z�sobn�ku",-A
+"V OUTER JOIN byl nalezen k-B���ov� odkaz. Prov��te ON podm�nky",-A
+"Sloupec '%-.32s' je pou-B�it s UNIQUE nebo INDEX, ale nen� definov�n jako NOT NULL",-A
+"Nemohu na-B��st funkci '%-.64s'",-A
 "Nemohu inicializovat funkci '%-.64s'; %-.80s",
-"Pro sd�lenou knihovnu nejsou povoleny cesty",
-"Funkce '%-.64s' ji� existuje",
-"Nemohu otev��t sd�lenou knihovnu '%-.64s' (errno: %d %s)",
-"Nemohu naj�t funkci '%-.64s' v knihovn�'",
-"Funkce '%-.64s' nen� definov�na",
-"Stroj '%-.64s' je zablokov�n kv�li mnoha chyb�m p�i p�ipojov�n�. Odblokujete pou�it�m 'mysqladmin flush-hosts'",
-"Stroj '%-.64s' nem� povoleno se k tomuto MySQL serveru p�ipojit",
-"Pou��v�te MySQL jako anonymn� u�ivatel a anonymn� u�ivatel� nemaj� povoleno m�nit hesla",
-"Na zm�nu hesel ostatn�m mus�te m�t pr�vo prov�st update tabulek v datab�zi mysql",
-"V tabulce user nen� ��dn� odpov�daj�c� ��dek",
-"Nalezen�ch ��dk�: %ld  Zm�n�no: %ld  Varov�n�: %ld",
-"Nemohu vytvo�it nov� thread (errno %d). Pokud je je�t� n�jak� voln� pam�, pod�vejte se do manu�lu na ��st o chyb�ch specifick�ch pro jednotliv� opera�n� syst�my",
-"Po�et sloupc� neodpov�d� po�tu hodnot na ��dku %ld",
-"Nemohu znovuotev��t tabulku: '%-.64s',
-"Neplatn� u�it� hodnoty NULL",
-"Regul�rn� v�raz vr�til chybu '%-.64s'",
-"Pokud nen� ��dn� GROUP BY klauzule, nen� dovoleno sou�asn� pou�it� GROUP polo�ek (MIN(),MAX(),COUNT()...) s ne GROUP polo�kami",
-"Neexistuje odpov�daj�c� grant pro u�ivatele '%-.32s' na stroji '%-.64s'",
-"%-.16s p��kaz nep��stupn� pro u�ivatele: '%-.32s@%-.64s' pro tabulku '%-.64s'",
-"%-.16s p��kaz nep��stupn� pro u�ivatele: '%-.32s@%-.64s' pro sloupec '%-.64s' v tabulce '%-.64s'",
-"Neplatn� p��kaz GRANT/REVOKE. Pros�m, p�e�t�te si v manu�lu, jak� privilegia je mo�n� pou��t.",
-"Argument p��kazu GRANT u�ivatel nebo stroj je p��li� dlouh�",
+"Pro sd-B�lenou knihovnu nejsou povoleny cesty",-A
+"Funkce '%-.64s' ji-B� existuje",-A
+"Nemohu otev-B��t sd�lenou knihovnu '%-.64s' (errno: %d %s)",-A
+"Nemohu naj-B�t funkci '%-.64s' v knihovn�'",-A
+"Funkce '%-.64s' nen-B� definov�na",-A
+"Stroj '%-.64s' je zablokov-B�n kv�li mnoha chyb�m p�i p�ipojov�n�. Odblokujete pou�it�m 'mysqladmin flush-hosts'",-A
+"Stroj '%-.64s' nem-B� povoleno se k tomuto MySQL serveru p�ipojit",-A
+"Pou-B��v�te MySQL jako anonymn� u�ivatel a anonymn� u�ivatel� nemaj� povoleno m�nit hesla",-A
+"Na zm-B�nu hesel ostatn�m mus�te m�t pr�vo prov�st update tabulek v datab�zi mysql",-A
+"V tabulce user nen-B� ��dn� odpov�daj�c� ��dek",-A
+"Nalezen-B�ch ��dk�: %ld  Zm�n�no: %ld  Varov�n�: %ld",-A
+"Nemohu vytvo-B�it nov� thread (errno %d). Pokud je je�t� n�jak� voln� pam�, pod�vejte se do manu�lu na ��st o chyb�ch specifick�ch pro jednotliv� opera�n� syst�my",-A
+"Po-B�et sloupc� neodpov�d� po�tu hodnot na ��dku %ld",-A
+"Nemohu znovuotev-B��t tabulku: '%-.64s',-A
+"Neplatn-B� u�it� hodnoty NULL",-A
+"Regul-B�rn� v�raz vr�til chybu '%-.64s'",-A
+"Pokud nen-B� ��dn� GROUP BY klauzule, nen� dovoleno sou�asn� pou�it� GROUP polo�ek (MIN(),MAX(),COUNT()...) s ne GROUP polo�kami",-A
+"Neexistuje odpov-B�daj�c� grant pro u�ivatele '%-.32s' na stroji '%-.64s'",-A
+"%-.16s p-B��kaz nep��stupn� pro u�ivatele: '%-.32s@%-.64s' pro tabulku '%-.64s'",-A
+"%-.16s p-B��kaz nep��stupn� pro u�ivatele: '%-.32s@%-.64s' pro sloupec '%-.64s' v tabulce '%-.64s'",-A
+"Neplatn-B� p��kaz GRANT/REVOKE. Pros�m, p�e�t�te si v manu�lu, jak� privilegia je mo�n� pou��t.",-A
+"Argument p-B��kazu GRANT u�ivatel nebo stroj je p��li� dlouh�",-A
 "Tabulka '%-64s.%s' neexistuje",
-"Neexistuje odpov�daj�c� grant pro u�ivatele '%-.32s' na stroji '%-.64s' pro tabulku '%-.64s'",
-"Pou�it� p��kaz nen� v t�to verzi MySQL povolen",
-"Va�e syntaxe je n�jak� divn�",
-"Zpo�d�n� insert threadu nebyl schopen z�skat po�adovan� z�mek pro tabulku %-.64s",
-"P��li� mnoho zpo�d�n�ch thread�",
-"Zru�eno spojen� %ld do datab�ze: '%-.64s' u�ivatel: '%-.64s' (%s)",
-"Zji�t�n p��choz� packet del�� ne� 'max_allowed_packet'",
-"Zji�t�na chyba p�i �ten� z roury spojen�",
-"Zji�t�na chyba fcntl()",
-"P��choz� packety v chybn�m po�ad�",
-"Nemohu rozkomprimovat komunika�n� packet",
-"Zji�t�na chyba p�i �ten� komunika�n�ho packetu",
-"Zji�t�n timeout p�i �ten� komunika�n�ho packetu",
-"Zji�t�na chyba p�i z�pisu komunika�n�ho packetu",
-"Zji�t�n timeout p�i z�pisu komunika�n�ho packetu",
-"V�sledn� �et�zec je del�� ne� max_allowed_packet",
-"Typ pou�it� tabulky nepodporuje BLOB/TEXT sloupce",
-"Typ pou�it� tabulky nepodporuje AUTO_INCREMENT sloupce",
-"INSERT DELAYED nen� mo�no s tabulkou '%-.64s' pou��t, proto�e je zam�en� pomoc� LOCK TABLES",
-"Nespr�vn� jm�no sloupce '%-.100s'",
-"Handler pou�it� tabulky neum� indexovat sloupce '%-.64s'",
-"V�echny tabulky v MERGE tabulce nejsou definov�ny stejn�",
-"Kv�li unique constraintu nemozu zapsat do tabulky '%-.64s'",
-"BLOB sloupec '%-.64s' je pou�it ve specifikaci kl��e bez d�lky",
-+"V-B�echny ��sti prim�rn�ho kl��e musej� b�t NOT NULL; pokud pot�ebujete NULL, pou�ijte UNIQUE",-A
-+"V-B�sledek obsahuje v�ce ne� jeden ��dek",-A
-+"Tento typ tabulky vy-B�aduje prim�rn� kl��",-A
-+"Tato verze MySQL nen-B� zkompilov�na s podporou RAID",-A
-+"Update tabulky bez WHERE s kl-B��em nen� v m�du bezpe�n�ch update dovoleno",-A
-+"Kl-B�� '%-.64s' v tabulce '%-.64s' neexistuje",-A
-+"Nemohu otev-B��t tabulku",-A
-+"Handler tabulky nepodporuje check/repair",
-"You are not allowed to execute this command in a transaction",
-"Got error %d during COMMIT",
-"Got error %d during ROLLBACK",
-"Got error %d during FLUSH_LOGS",
-"Got error %d during CHECKPOINT",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
-"The handler for the table does not support binary table dump",
-"Binlog closed while trying to FLUSH MASTER",
-"Failed rebuilding the index of dumped table '%-.64s'",
-"Error from master: '%-.64s'",
-"Net error reading from master",
-"Net error writing to master",
-"Can't find FULLTEXT index matching the column list",
+"Neexistuje odpov-B�daj�c� grant pro u�ivatele '%-.32s' na stroji '%-.64s' pro tabulku '%-.64s'",-A
+"Pou-B�it� p��kaz nen� v t�to verzi MySQL povolen",-A
+"Va-B�e syntaxe je n�jak� divn�",-A
+"Zpo-B�d�n� insert threadu nebyl schopen z�skat po�adovan� z�mek pro tabulku %-.64s",-A
+"P-B��li� mnoho zpo�d�n�ch thread�",-A
+"Zru-B�eno spojen� %ld do datab�ze: '%-.64s' u�ivatel: '%-.64s' (%s)",-A
+"Zji-B�t�n p��choz� packet del�� ne� 'max_allowed_packet'",-A
+"Zji-B�t�na chyba p�i �ten� z roury spojen�",-A
+"Zji-B�t�na chyba fcntl()",-A
+"P-B��choz� packety v chybn�m po�ad�",-A
+"Nemohu rozkomprimovat komunika-B�n� packet",-A
+"Zji-B�t�na chyba p�i �ten� komunika�n�ho packetu",-A
+"Zji-B�t�n timeout p�i �ten� komunika�n�ho packetu",-A
+"Zji-B�t�na chyba p�i z�pisu komunika�n�ho packetu",-A
+"Zji-B�t�n timeout p�i z�pisu komunika�n�ho packetu",-A
+"V-B�sledn� �et�zec je del�� ne� max_allowed_packet",-A
+"Typ pou-B�it� tabulky nepodporuje BLOB/TEXT sloupce",-A
+"Typ pou-B�it� tabulky nepodporuje AUTO_INCREMENT sloupce",-A
+"INSERT DELAYED nen-B� mo�no s tabulkou '%-.64s' pou��t, proto�e je zam�en� pomoc� LOCK TABLES",-A
+"Nespr-B�vn� jm�no sloupce '%-.100s'",-A
+"Handler pou-B�it� tabulky neum� indexovat sloupce '%-.64s'",-A
+"V-B�echny tabulky v MERGE tabulce nejsou definov�ny stejn�",-A
+"Kv-B�li unique constraintu nemozu zapsat do tabulky '%-.64s'",-A
+"BLOB sloupec '%-.64s' je pou-B�it ve specifikaci kl��e bez d�lky",-A
+"V-B�echny ��sti prim�rn�ho kl��e musej� b�t NOT NULL; pokud pot�ebujete NULL, pou�ijte UNIQUE",-A
+"V-B�sledek obsahuje v�ce ne� jeden ��dek",-A
+"Tento typ tabulky vy-B�aduje prim�rn� kl��",-A
+"Tato verze MySQL nen-B� zkompilov�na s podporou RAID",-A
+"Update tabulky bez WHERE s kl-B��em nen� v m�du bezpe�n�ch update dovoleno",-A
+"Kl-B�� '%-.64s' v tabulce '%-.64s' neexistuje",-A
+"Nemohu otev-B��t tabulku",-A
+"Handler tabulky nepodporuje check/repair",
+"Proveden-B� tohoto p��kazu nen� v transakci dovoleno",-A
+"Chyba %d p-B�i COMMIT",-A
+"Chyba %d p-B�i ROLLBACK",-A
+"Chyba %d p-B�i FLUSH_LOGS",-A
+"Chyba %d p-B�i CHECKPOINT",-A
+"Spojen-B� %ld do datab�ze: '%-.64s' u�ivatel: '%-.32s' stroj: `%-.64s' (%-.64s) bylo p�eru�eno",-A
+"Handler tabulky nepodporuje bin-B�rn� dump",-A
+"Binlog uzav-B�en p�i pokusu o FLUSH MASTER",-A
+"P-B�ebudov�n� indexu dumpnut� tabulky '%-.64s' nebylo �sp�n�",-A
+"Chyba masteru: '%-.64s'",
+"S-B��ov� chyba p�i �ten� z masteru",-A
+"S-B��ov� chyba p�i z�pisu na master",-A
+"-B��dn� sloupec nem� vytvo�en fulltextov� index",-A
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/danish/errmsg.sys b/sql/share/danish/errmsg.sys
index e59cb624472..fa6e3ed8edc 100644
--- a/sql/share/danish/errmsg.sys
+++ b/sql/share/danish/errmsg.sys
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 18dd8ce09b8..b711079a2ff 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -196,3 +196,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/dutch/errmsg.sys b/sql/share/dutch/errmsg.sys
index 0950a8d9bc4..a48e905103d 100644
--- a/sql/share/dutch/errmsg.sys
+++ b/sql/share/dutch/errmsg.sys
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 960200aa182..c093c4b8ecc 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -193,3 +193,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/english/errmsg.sys b/sql/share/english/errmsg.sys
index 7451111fcce..167683fe913 100644
--- a/sql/share/english/errmsg.sys
+++ b/sql/share/english/errmsg.sys
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 7c456a6f592..5b70e96740f 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -193,3 +193,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/estonia/errmsg.sys b/sql/share/estonia/errmsg.sys
index bd7927bdb5e..ee70248ab8f 100644
--- a/sql/share/estonia/errmsg.sys
+++ b/sql/share/estonia/errmsg.sys
diff --git a/sql/share/estonia/errmsg.txt b/sql/share/estonia/errmsg.txt
index a1614fbd3e8..7bbae9adf86 100644
--- a/sql/share/estonia/errmsg.txt
+++ b/sql/share/estonia/errmsg.txt
@@ -197,3 +197,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/french/errmsg.sys b/sql/share/french/errmsg.sys
index 6947930f875..477cef2f131 100644
--- a/sql/share/french/errmsg.sys
+++ b/sql/share/french/errmsg.sys
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 34c488b7129..cf63dc0601d 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -193,3 +193,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/german/errmsg.sys b/sql/share/german/errmsg.sys
index 94c99a9262d..c80a962568c 100644
--- a/sql/share/german/errmsg.sys
+++ b/sql/share/german/errmsg.sys
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index adc69b823b7..5c2c50c1540 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -196,3 +196,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/greek/errmsg.sys b/sql/share/greek/errmsg.sys
index 8fc053c381d..743532a9c75 100644
--- a/sql/share/greek/errmsg.sys
+++ b/sql/share/greek/errmsg.sys
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index b3a17af8ec0..c1db8832650 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -193,3 +193,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/hungarian/errmsg.sys b/sql/share/hungarian/errmsg.sys
index df039b66ec3..712262aa093 100644
--- a/sql/share/hungarian/errmsg.sys
+++ b/sql/share/hungarian/errmsg.sys
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 8e9e04b79b7..e48cab983cf 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -195,3 +195,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/italian/errmsg.sys b/sql/share/italian/errmsg.sys
index f1300819c3c..dde6350ba4b 100644
--- a/sql/share/italian/errmsg.sys
+++ b/sql/share/italian/errmsg.sys
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 0aa12667b5e..e09b947e06a 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -193,3 +193,4 @@
 "Errore di rete ricevendo dal master",
 "Errore di rete inviando al master",
 "Impossibile trovare un indice FULLTEXT che corrisponda all'elenco delle colonne",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/japanese/errmsg.sys b/sql/share/japanese/errmsg.sys
index 1b5547999a5..ae5057dd7e0 100644
--- a/sql/share/japanese/errmsg.sys
+++ b/sql/share/japanese/errmsg.sys
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index da15c0a22f1..5da104479aa 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -195,3 +195,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/korean/errmsg.sys b/sql/share/korean/errmsg.sys
index 4bd754f1ff5..1f2c93f8e42 100644
--- a/sql/share/korean/errmsg.sys
+++ b/sql/share/korean/errmsg.sys
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index b5f231e1b70..3ac5a9bb2fa 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -193,3 +193,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 75f86103f7c..491f913cb47 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -195,3 +195,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 7ad97882398..967de6da7fc 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -195,3 +195,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/polish/errmsg.sys b/sql/share/polish/errmsg.sys
index e3879e04810..0b21296d7ee 100644
--- a/sql/share/polish/errmsg.sys
+++ b/sql/share/polish/errmsg.sys
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index b73631afed1..f7b492a32d9 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -197,3 +197,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/portuguese/errmsg.sys b/sql/share/portuguese/errmsg.sys
index e9d5d4b9cec..12debe72eaf 100644
--- a/sql/share/portuguese/errmsg.sys
+++ b/sql/share/portuguese/errmsg.sys
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 466a2cadfd4..f9fbd57c647 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -193,3 +193,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/romania/errmsg.sys b/sql/share/romania/errmsg.sys
index 018333d3e1e..20870bb1fa3 100644
--- a/sql/share/romania/errmsg.sys
+++ b/sql/share/romania/errmsg.sys
diff --git a/sql/share/romania/errmsg.txt b/sql/share/romania/errmsg.txt
index 5d34f32e602..5ef2e630e81 100644
--- a/sql/share/romania/errmsg.txt
+++ b/sql/share/romania/errmsg.txt
@@ -197,3 +197,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/russian/errmsg.sys b/sql/share/russian/errmsg.sys
index 5ddaf2e2973..439223e4248 100644
--- a/sql/share/russian/errmsg.sys
+++ b/sql/share/russian/errmsg.sys
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index fe12cad035d..634c1f36249 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -196,3 +196,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "FULLTEXT ������, ��������������� ��������� ������ ��������, �� ������",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/slovak/errmsg.sys b/sql/share/slovak/errmsg.sys
index c14049c829f..9efe926ff15 100644
--- a/sql/share/slovak/errmsg.sys
+++ b/sql/share/slovak/errmsg.sys
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 7b5d8f9a015..485fff107ed 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -201,3 +201,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/spanish/errmsg.sys b/sql/share/spanish/errmsg.sys
index 60c71cb8e8f..e90aac38bc5 100644
--- a/sql/share/spanish/errmsg.sys
+++ b/sql/share/spanish/errmsg.sys
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 0f16b66f6d8..6a26480f7d4 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -194,3 +194,4 @@
 "Net error reading from master",
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/swedish/errmsg.OLD b/sql/share/swedish/errmsg.OLD
index 0181d0febd6..94055083e54 100644
--- a/sql/share/swedish/errmsg.OLD
+++ b/sql/share/swedish/errmsg.OLD
@@ -193,3 +193,5 @@
 "Fick n�tverksfel vid l�sning fr�n master",
 "Fick n�tverksfel vid skrivning till master",
 "Hittar inte ett FULLTEXT index i kolumnlist",
+#ER_LOCK_OR_ACTIVE_TRANSACTION
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/share/swedish/errmsg.sys b/sql/share/swedish/errmsg.sys
index d48cd88bf7b..ea9ae0f32fd 100644
--- a/sql/share/swedish/errmsg.sys
+++ b/sql/share/swedish/errmsg.sys
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 0181d0febd6..233a60a5221 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -193,3 +193,4 @@
 "Fick n�tverksfel vid l�sning fr�n master",
 "Fick n�tverksfel vid skrivning till master",
 "Hittar inte ett FULLTEXT index i kolumnlist",
+"Can't execute the given command because you have active locked tables or an active transaction",
diff --git a/sql/slave.cc b/sql/slave.cc
index afb14dd11c2..a527f3a1485 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -406,7 +406,7 @@ static int init_slave_thread(THD* thd)
 
   if (init_thr_lock() ||
       my_pthread_setspecific_ptr(THR_THD,  thd) ||
-      my_pthread_setspecific_ptr(THR_MALLOC, &thd->alloc) ||
+      my_pthread_setspecific_ptr(THR_MALLOC, &thd->mem_root) ||
       my_pthread_setspecific_ptr(THR_NET,  &thd->net))
   {
     close_connection(&thd->net,ER_OUT_OF_RESOURCES); // is this needed?
@@ -422,7 +422,7 @@ static int init_slave_thread(THD* thd)
   VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));
 #endif
 
-  thd->alloc.free=thd->alloc.used=0;
+  thd->mem_root.free=thd->mem_root.used=0;	// Probably not needed
   if (thd->max_join_size == (ulong) ~0L)
     thd->options |= OPTION_BIG_SELECTS;
 
@@ -557,7 +557,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
 	  {
 	    Query_log_event* qev = (Query_log_event*)ev;
 	    int q_len = qev->q_len;
-	    init_sql_alloc(&thd->alloc, 8192);
+	    init_sql_alloc(&thd->mem_root, 8192);
 	    thd->db = (char*)qev->db;
 	    if(db_ok(thd->db, replicate_do_db, replicate_ignore_db))
 	      {
@@ -602,13 +602,13 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
 	    thd->db = 0;// prevent db from being freed
 	    thd->query = 0; // just to be sure
 	    close_thread_tables(thd);
-	    free_root(&thd->alloc);
-	    if(thd->query_error)
-	      {
-		sql_print_error("Slave:  error running query '%s' ",
-				qev->query);
-		return 1;
-	      }
+	    free_root(&thd->mem_root);
+	    if (thd->query_error)
+	    {
+	      sql_print_error("Slave:  error running query '%s' ",
+			      qev->query);
+	      return 1;
+	    }
 	    delete ev;
 	    
 	    if(thd->fatal_error)
@@ -626,7 +626,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
   	case LOAD_EVENT:
 	  {
 	    Load_log_event* lev = (Load_log_event*)ev;
-	    init_sql_alloc(&thd->alloc, 8192);
+	    init_sql_alloc(&thd->mem_root, 8192);
 	    thd->db = (char*)lev->db;
 	    thd->query = 0;
 	    thd->query_error = 0;
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 983ffef0ace..e4e0bf14a3d 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -29,8 +29,6 @@
 #include <io.h>
 #endif
 
-#define MAX_DBKEY_LENGTH (FN_LEN*2+2)
-
 static int key_cache_used=0;
 TABLE *unused_tables;				/* Used by mysql_test */
 HASH open_cache;				/* Used by mysql_test */
@@ -120,7 +118,7 @@ static byte *cache_key(const byte *record,uint *length,
 
 void table_cache_init(void)
 {
-  VOID(hash_init(&open_cache,table_cache_size,0,0,cache_key,
+  VOID(hash_init(&open_cache,table_cache_size+16,0,0,cache_key,
 		 (void (*)(void*)) free_cache_entry,0));
   mysql_rm_tmp_tables();
 }
@@ -1234,7 +1232,7 @@ void close_old_data_files(THD *thd, TABLE *table, bool abort_locks)
   if the table is closed
 */
 
-static bool table_is_used(TABLE *table)
+bool table_is_used(TABLE *table)
 {
   do
   {
@@ -2171,4 +2169,3 @@ int setup_ftfuncs(THD *thd,TABLE_LIST *tables, List<Item_func_match> &ftfuncs)
 
   return 0;
 }
-
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 19b9ecdaae0..cdf100cb9a7 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -109,7 +109,7 @@ THD::THD()
   net.vio=0;
   ull=0;
   system_thread=0;
-  bzero((char*) &alloc,sizeof(alloc));
+  bzero((char*) &mem_root,sizeof(mem_root));
 #ifdef	__WIN__
   real_id = 0 ;
 #endif
@@ -154,7 +154,7 @@ THD::~THD()
   safeFree(user);
   safeFree(db);
   safeFree(ip);
-  free_root(&alloc);
+  free_root(&mem_root);
   mysys_var=0;					// Safety (shouldn't be needed)
   DBUG_VOID_RETURN;
 }
@@ -165,11 +165,10 @@ THD::~THD()
 bool THD::store_globals()
 {
   return (my_pthread_setspecific_ptr(THR_THD,  this) ||
-	  my_pthread_setspecific_ptr(THR_MALLOC, &alloc) ||
+	  my_pthread_setspecific_ptr(THR_MALLOC, &mem_root) ||
 	  my_pthread_setspecific_ptr(THR_NET,  &net));
 }
 
-
 /*****************************************************************************
 ** Functions to provide a interface to select results
 *****************************************************************************/
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 2ea18751dea..7e561cf9d80 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -223,7 +223,7 @@ class THD :public ilink {
 public:
   NET	  net;
   LEX	  lex;
-  MEM_ROOT alloc;
+  MEM_ROOT mem_root;
   HASH     user_vars;
   String  packet;				/* Room for 1 row */
   struct  sockaddr_in remote;
@@ -287,6 +287,19 @@ public:
     }
     return last_insert_id;
   }
+  inline bool active_transaction() { return transaction.bdb_tid != 0; }
+  inline gptr alloc(unsigned int size) { return alloc_root(&mem_root,size); }
+  inline gptr calloc(unsigned int size)
+  {
+    gptr ptr;
+    if ((ptr=alloc_root(&mem_root,size)))
+      bzero((char*) ptr,size);
+    return ptr;
+  }
+  inline char *strdup(const char *str)
+  { return strdup_root(&mem_root,str); }
+  inline char *memdup(const char *str, unsigned int size)
+  { return memdup_root(&mem_root,str,size); }
 };
 
 
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index fe8264814a6..bd0415aa936 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1215,14 +1215,19 @@ void select_insert::send_error(uint errcode,const char *err)
   ::send_error(&thd->net,errcode,err);
   table->file->extra(HA_EXTRA_NO_CACHE);
   table->file->activate_all_index(thd);
+  ha_rollback(thd);
 }
 
 
 bool select_insert::send_eof()
 {
-  int error;
-  if ((error=table->file->extra(HA_EXTRA_NO_CACHE)) ||
-      (error=table->file->activate_all_index(thd)))
+  int error,error2;
+  if (!(error=table->file->extra(HA_EXTRA_NO_CACHE)))
+    error=table->file->activate_all_index(thd);
+  if ((error2=ha_autocommit_or_rollback(thd,error)) && ! error)
+    error=error2;
+
+  if (error)
   {
     table->file->print_error(error,MYF(0));
     ::send_error(&thd->net);
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 6fd9f203d52..083bc8a83b5 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -46,7 +46,8 @@ enum enum_sql_command {
   SQLCOM_FLUSH, SQLCOM_KILL, SQLCOM_SHOW_GRANTS, SQLCOM_ANALYZE,
   SQLCOM_ROLLBACK, SQLCOM_COMMIT, SQLCOM_SLAVE_START, SQLCOM_SLAVE_STOP,
   SQLCOM_BEGIN, SQLCOM_LOAD_MASTER_TABLE, SQLCOM_SHOW_CREATE,
-  SQLCOM_SHOW_MASTER_STAT, SQLCOM_SHOW_SLAVE_STAT, SQLCOM_CHANGE_MASTER
+  SQLCOM_SHOW_MASTER_STAT, SQLCOM_SHOW_SLAVE_STAT, SQLCOM_CHANGE_MASTER,
+  SQLCOM_RENAME_TABLE
 };
 
 enum lex_states { STATE_START, STATE_CHAR, STATE_IDENT,
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index fb5125ac79f..9c509484b3c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -773,9 +773,9 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds,
   DBUG_ENTER("make_join_statistics");
 
   table_count=join->tables;
-  stat=(JOIN_TAB*) sql_calloc(sizeof(JOIN_TAB)*table_count);
-  stat_ref=(JOIN_TAB**) sql_alloc(sizeof(JOIN_TAB*)*MAX_TABLES);
-  table_vector=(TABLE**) sql_alloc(sizeof(TABLE**)*(table_count*2));
+  stat=(JOIN_TAB*) join->thd->calloc(sizeof(JOIN_TAB)*table_count);
+  stat_ref=(JOIN_TAB**) join->thd->alloc(sizeof(JOIN_TAB*)*MAX_TABLES);
+  table_vector=(TABLE**) join->thd->alloc(sizeof(TABLE**)*(table_count*2));
   if (!stat || !stat_ref || !table_vector)
     DBUG_RETURN(1);				// Eom /* purecov: inspected */
   select=0;
@@ -1832,7 +1832,7 @@ get_best_combination(JOIN *join)
 
   table_count=join->tables;
   if (!(join->join_tab=join_tab=
-	(JOIN_TAB*) sql_alloc(sizeof(JOIN_TAB)*table_count)))
+	(JOIN_TAB*) join->thd->alloc(sizeof(JOIN_TAB)*table_count)))
     return TRUE;
 
   join->const_tables=0;				/* for checking */
@@ -2056,8 +2056,8 @@ make_simple_join(JOIN *join,TABLE *tmp_table)
   TABLE **tableptr;
   JOIN_TAB *join_tab;
 
-  if (!(tableptr=(TABLE**) sql_alloc(sizeof(TABLE*))) ||
-      !(join_tab=(JOIN_TAB*) sql_alloc(sizeof(JOIN_TAB))))
+  if (!(tableptr=(TABLE**) join->thd->alloc(sizeof(TABLE*))) ||
+      !(join_tab=(JOIN_TAB*) join->thd->alloc(sizeof(JOIN_TAB))))
     return TRUE;
   join->join_tab=join_tab;
   join->table=tableptr; tableptr[0]=tmp_table;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 55142e21dad..c027f6397c2 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -55,7 +55,7 @@ mysqld_show_dbs(THD *thd,const char *wild)
   char *file_name;
   DBUG_ENTER("mysqld_show_dbs");
 
-  field->name=(char*) sql_alloc(20+ (wild ? strlen(wild)+4: 0));
+  field->name=(char*) thd->alloc(20+ (wild ? strlen(wild)+4: 0));
   field->max_length=NAME_LEN;
   end=strmov(field->name,"Database");
   if (wild && wild[0])
@@ -92,7 +92,7 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
   char *file_name;
   DBUG_ENTER("mysqld_show_tables");
 
-  field->name=(char*) sql_alloc(20+strlen(db)+(wild ? strlen(wild)+4:0));
+  field->name=(char*) thd->alloc(20+strlen(db)+(wild ? strlen(wild)+4:0));
   end=strxmov(field->name,"Tables_in_",db,NullS);
   if (wild && wild[0])
     strxmov(end," (",wild,")",NullS);
@@ -170,7 +170,7 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path,
       if (check_grant(thd,TABLE_ACLS,&table_list,1))
 	continue;
     }
-    if (files->push_back(sql_strdup(file->name)))
+    if (files->push_back(thd->strdup(file->name)))
     {
       my_dirend(dirp);
       DBUG_RETURN(-1);
@@ -868,12 +868,12 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
 	thread_info *thd_info=new thread_info;
 
 	thd_info->thread_id=tmp->thread_id;
-	thd_info->user=sql_strdup(tmp->user ? tmp->user : (tmp->system_thread ?
+	thd_info->user=thd->strdup(tmp->user ? tmp->user : (tmp->system_thread ?
 				  "system user" : "unauthenticated user"));
-	thd_info->host=sql_strdup(tmp->host ? tmp->host : (tmp->ip ? tmp->ip :
+	thd_info->host=thd->strdup(tmp->host ? tmp->host : (tmp->ip ? tmp->ip :
 				   (tmp->system_thread ? "none" : "connecting host")));
 	if ((thd_info->db=tmp->db))		// Safe test
-	  thd_info->db=sql_strdup(thd_info->db);
+	  thd_info->db=thd->strdup(thd_info->db);
 	thd_info->command=(int) tmp->command;
 	if (tmp->mysys_var)
 	  pthread_mutex_lock(&tmp->mysys_var->mutex);
@@ -902,7 +902,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
 	  uint length=strlen(tmp->query);
 	  if (length > max_query_length)
 	    length=max_query_length;
-	  thd_info->query=(char*) sql_memdup(tmp->query,length+1);
+	  thd_info->query=(char*) thd->memdup(tmp->query,length+1);
 	  thd_info->query[length]=0;
 	}
 	thread_infos.append(thd_info);
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index d9e14014189..1440929c98b 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -644,7 +644,7 @@ TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
 ** Alter a table definition
 ****************************************************************************/
 
-static bool
+bool
 mysql_rename_table(enum db_type base,
 		   const char *old_db,
 		   const char * old_name,
@@ -659,9 +659,17 @@ mysql_rename_table(enum db_type base,
   (void) sprintf(to,"%s/%s/%s",mysql_data_home,new_db,new_name);
   fn_format(from,from,"","",4);
   fn_format(to,to,    "","",4);
-  if (file->rename_table((const char*) from,(const char *) to) ||
-      rename_file_ext(from,to,reg_ext))
+  if (file->rename_table((const char*) from,(const char *) to))
     error=1;
+  else
+  {
+    if (rename_file_ext(from,to,reg_ext))
+    {
+      error=1;
+      /* Restore old file name */
+      file->rename_table((const char*) to,(const char *) from);
+    }
+  }
   delete file;
   DBUG_RETURN(error);
 }
@@ -1412,7 +1420,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
 
 #ifdef __WIN__
   // Win32 can't rename an open table, so we must close the org table!
-  table_name=sql_strdup(table_name);		// must be saved
+  table_name=thd->strdup(table_name);		// must be saved
   if (close_cached_table(thd,table))
   {						// Aborted
     VOID(quick_rm_table(new_db_type,new_db,tmp_name));
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 3028990fc95..5cfc05406c4 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -488,7 +488,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 	query verb_clause create change select drop insert replace insert2
 	insert_values update delete show describe load alter optimize flush
 	begin commit rollback slave master_def master_defs
-	repair analyze check field_list field_list_item field_spec kill
+	repair analyze check rename
+	field_list field_list_item field_spec kill
 	select_item_list select_item values_list no_braces
 	limit_clause delete_limit_clause fields opt_values values
 	procedure_list procedure_list2 procedure_item
@@ -504,6 +505,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 	flush_options flush_option insert_lock_option replace_lock_option
 	equal optional_braces opt_key_definition key_usage_list2
 	opt_mi_check_type opt_to mi_check_types normal_join
+	table_to_table_list table_to_table
 	END_OF_INPUT
 
 %type <NONE>
@@ -539,6 +541,7 @@ verb_clause:
 	| lock
 	| kill
 	| optimize
+	| rename
         | repair
 	| replace
 	| revoke
@@ -1078,6 +1081,7 @@ opt_place:
 opt_to:
 	/* empty */	{}
 	| TO_SYM	{}
+	| AS		{}
 
 slave:
 	SLAVE START_SYM
@@ -1134,6 +1138,24 @@ optimize:
 	     YYABORT;
 	}
 
+rename:
+	RENAME table_or_tables
+	{
+	   Lex->sql_command=SQLCOM_RENAME_TABLE;
+	}
+	table_to_table_list
+
+table_to_table_list:
+	table_to_table
+	| table_to_table_list ',' table_to_table
+
+table_to_table:
+	table_ident TO_SYM table_ident
+	{ if (add_table_to_list($1,NULL,TL_IGNORE) ||
+	      add_table_to_list($3,NULL,TL_IGNORE))
+	     YYABORT;
+ 	}
+
 /*
 ** Select : retrieve data from table
 */
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc
index 8cf4f937546..9273b3eb5a5 100644
--- a/sql/thr_malloc.cc
+++ b/sql/thr_malloc.cc
@@ -23,6 +23,7 @@ extern "C" {
   void sql_alloc_error_handler(void)
   {
     current_thd->fatal_error=1; /* purecov: inspected */
+    sql_print_error(ER(ER_OUT_OF_RESOURCES));
   }
 }
 
@@ -37,10 +38,6 @@ gptr sql_alloc(uint Size)
 {
   MEM_ROOT *root=my_pthread_getspecific_ptr(MEM_ROOT*,THR_MALLOC);
   char *ptr= (char*) alloc_root(root,Size);
-  if (!ptr)
-  {
-    sql_print_error(ER(ER_OUT_OF_RESOURCES));
-  }
   return ptr;
 }
 
diff --git a/sql/unireg.h b/sql/unireg.h
index a0890473de8..988be3d398f 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -40,6 +40,7 @@
 
 #define ERRMAPP 1				/* Errormap f|r my_error */
 #define LIBLEN FN_REFLEN-FN_LEN			/* Max l{ngd p} dev */
+#define MAX_DBKEY_LENGTH (FN_LEN*2+2)
 #define MAX_FIELD_NAME 34			/* Max colum name length +2 */
 #define MAX_KEY 32				/* Max used keys */
 #define MAX_REF_PARTS 16			/* Max parts used as ref */
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 119443a0c95..9a5a91f9265 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -224,7 +224,8 @@ int my_strnncoll_sjis(const uchar *s1, int len1, const uchar *s2, int len2)
 
 int my_strcoll_sjis(const uchar *s1, const uchar *s2)
 {
-  return (uint) my_strnncoll_sjis(s1,(uint) strlen(s1), s2,(uint) strlen(s2));
+  return (uint) my_strnncoll_sjis(s1,(uint) strlen((char*) s1),
+				  s2,(uint) strlen((char*) s2));
 }
 
 int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
@@ -245,7 +246,7 @@ int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
 
 int my_strxfrm_sjis(uchar *dest, uchar *src, int len)
 {
-  return my_strnxfrm_sjis(dest, src, len, (uint) strlen(src));
+  return my_strnxfrm_sjis(dest, src, len, (uint) strlen((char*) src));
 }
author	unknown <monty@donna.mysql.com>	2000-08-21 03:00:52 +0300
committer	unknown <monty@donna.mysql.com>	2000-08-21 03:00:52 +0300
commit	55c5016f92383fdf7cd14de4ef3ec5afbb89fd5a (patch)
tree	f46edbbf41f400440bde25519820b29885305b1b
parent	259c7ea0f84f25d82ec7b818e5b770f0bc7917d3 (diff)
download	mariadb-git-55c5016f92383fdf7cd14de4ef3ec5afbb89fd5a.tar.gz