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

into work.mysql.com:/home/bk/mysql-4.0

BitKeeper/etc/logging_ok

+heikki@donna.mysql.fi
 jani@janikt.pp.saunalahti.fi
 monty@hundin.mysql.fi
+monty@work.mysql.com
 mwagner@evoq.mwagner.org
 sasha@mysql.sashanet.com
 tonu@hundin.mysql.fi
-monty@work.mysql.com

Docs/manual.texi

@@ -44926,7 +44926,9 @@ table for a different site you are working on, but the table is just a
 bit different (that is - fields in different order, etc.).
 By Steve Shreeve.
 @item @uref{http://www.mysql.com/Downloads/Contrib/oracledump, oracledump}
-Perl program to convert Oracle databases to @strong{MySQL}. By Johan Andersson.
+Perl program to convert Oracle databases to @strong{MySQL}. Has same
+output format as mysqldump. By Johan Andersson.
+
 @item @uref{http://www.mysql.com/Downloads/Contrib/excel2mysql, excel2mysql}
 Perl program to import Excel spreadsheets into a @strong{MySQL} database. By Stephen Hurd @email{shurd@@sk.sympatico.ca}
 

include/my_sys.h

@@ -389,6 +389,8 @@ extern int my_realpath(char *to, const char *filename, myf MyFlags);
 extern File my_create_with_symlink(const char *linkname, const char *filename,
 				   int createflags, int access_flags,
 				   myf MyFlags);
+extern int my_delete_with_symlink(const char *name, myf MyFlags);
+extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags);
 extern int my_symlink(const char *content, const char *linkname, myf MyFlags);
 extern uint my_read(File Filedes,byte *Buffer,uint Count,myf MyFlags);
 extern uint my_pread(File Filedes,byte *Buffer,uint Count,my_off_t offset,

innobase/include/sync0sync.ic

@@ -94,10 +94,12 @@ mutex_test_and_set(
 
 	/* In assembly we use the so-called AT & T syntax where
 	the order of operands is inverted compared to the ordinary Intel
-	syntax. The 'l' after the mnemonics denotes a 32-bit operation. */
+	syntax. The 'l' after the mnemonics denotes a 32-bit operation.
+	The line after the code tells which values come out of the asm
+	code, and the second line tells the input to the asm code. */
 
 	asm volatile("movl $1, %%eax; xchgl (%%ecx), %%eax" :
-	              "=eax" (res):
+	              "=eax" (res), "=m" (*lw) :
 	              "ecx" (lw));
 	return(res);
 #else
@@ -132,12 +134,26 @@ mutex_reset_lock_word(
 	__asm   MOV     EDX, 0
         __asm   MOV     ECX, lw
         __asm   XCHG    EDX, DWORD PTR [ECX]                    
+#elif defined(__GNUC__) && defined(UNIV_INTEL_X86)
+	ulint*	lw;
+
+	lw = &(mutex->lock_word);
+
+	/* In assembly we use the so-called AT & T syntax where
+	the order of operands is inverted compared to the ordinary Intel
+	syntax. The 'l' after the mnemonics denotes a 32-bit operation. */
+
+	asm volatile("movl $0, %%eax; xchgl (%%ecx), %%eax" :
+	              "=m" (*lw) :
+	              "ecx" (lw) :
+		      "eax");	/* gcc does not seem to understand
+				that our asm code resets eax: tell it
+				explicitly that after the third ':' */
 #else
 	mutex->lock_word = 0;
-#if !(defined(__GNUC__) && defined(UNIV_INTEL_X86))
+
 	os_fast_mutex_unlock(&(mutex->os_fast_mutex));
 #endif
-#endif
 }
 
 /**********************************************************************

libmysql/Makefile.shared

@@ -51,7 +51,7 @@ mysysobjects1 =		my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
 			mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\
 			mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo \
 			mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \
-			my_fstream.lo \
+			my_symlink.lo my_fstream.lo \
 			mf_loadpath.lo my_pthread.lo my_thr_init.lo \
 			thr_mutex.lo mulalloc.lo string.lo default.lo \
 			my_compress.lo array.lo my_once.lo list.lo my_net.lo \

mysys/Makefile.am

@@ -33,7 +33,7 @@ libmysys_a_SOURCES =	my_init.c my_getwd.c mf_getdate.c\
 			my_alloc.c safemalloc.c my_fopen.c my_fstream.c \
 			my_error.c errors.c my_div.c my_messnc.c \
 			mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \
-			my_symlink.c \
+			my_symlink.c my_symlink2.c \
 			mf_pack.c mf_pack2.c mf_unixpath.c mf_stripp.c \
 			mf_casecnv.c mf_soundex.c mf_wcomp.c mf_wfile.c \
 			mf_qsort.c mf_qsort2.c mf_sort.c \

mysys/mf_same.c

@@ -20,19 +20,22 @@
 #include "mysys_priv.h"
 #include <m_string.h>
 
-	/* Formaterar ett filnamn i avsende p} ett annat namn */
-	/* Klarar {ven to = name */
-	/* Denna funktion r|r inte p} utg}ngsnamnet */
+        /*
+	  Copy directory and/or extension between filenames.
+	  (For the meaning of 'flag', check mf_format.c)
+	  'to' may be equal to 'name'.
+	  Returns 'to'.
+	*/
 
-my_string fn_same(my_string toname, const char *name, int flag)
+my_string fn_same(char *to, const char *name, int flag)
 {
   char dev[FN_REFLEN];
   const char *ext;
   DBUG_ENTER("fn_same");
-  DBUG_PRINT("mfunkt",("to: %s  name: %s  flag: %d",toname,name,flag));
+  DBUG_PRINT("enter",("to: %s  name: %s  flag: %d",to,name,flag));
 
   if ((ext=strrchr(name+dirname_part(dev,name),FN_EXTCHAR)) == 0)
     ext="";
 
-  DBUG_RETURN(fn_format(toname,toname,dev,ext,flag));
+  DBUG_RETURN(fn_format(to,to,dev,ext,flag));
 } /* fn_same */

mysys/my_symlink.c

@@ -18,6 +18,7 @@
 #include "mysys_priv.h"
 #include "mysys_err.h"
 #include <m_string.h>
+#include <errno.h>
 #ifdef HAVE_REALPATH
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -26,13 +27,16 @@
 /*
   Reads the content of a symbolic link
   If the file is not a symbolic link, return the original file name in to.
+  Returns: 0 if table was a symlink,
+           1 if table was a normal file
+	   -1 on error.
 */
 
 int my_readlink(char *to, const char *filename, myf MyFlags)
 {
 #ifndef HAVE_READLINK
   strmov(to,filename);
-  return 0;
+  return 1;
 #else
   int result=0;
   int length;
@@ -43,6 +47,7 @@ int my_readlink(char *to, const char *filename, myf MyFlags)
     /* Don't give an error if this wasn't a symlink */
     if ((my_errno=errno) == EINVAL)
     {
+      result= 1;
       strmov(to,filename);
     }
     else
@@ -81,44 +86,6 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags)
 #endif /* HAVE_READLINK */
 }
 
-
-/*
-  Create a file and a symbolic link that points to this file
-  If linkname is a null pointer or equal to filename, we don't
-  create a link.
- */
-
-
-File my_create_with_symlink(const char *linkname, const char *filename,
-			    int createflags, int access_flags, myf MyFlags)
-{
-  File file;
-  int tmp_errno;
-  DBUG_ENTER("my_create_with_symlink");
-  if ((file=my_create(filename, createflags, access_flags, MyFlags)) >= 0)
-  {
-    /* Test if we should create a link */
-    if (linkname && strcmp(linkname,filename))
-    {
-      /* Delete old link/file */
-      if (MyFlags & MY_DELETE_OLD)
-	my_delete(linkname, MYF(0));
-      /* Create link */
-      if (my_symlink(filename, linkname, MyFlags))
-      {
-	/* Fail, remove everything we have done */
-	tmp_errno=my_errno;
-	my_close(file,MYF(0));
-	my_delete(filename, MYF(0));
-	file= -1;
-	my_errno=tmp_errno;
-      }
-    }
-  }
-  DBUG_RETURN(file);
-}
-
-
 /*
   Resolve all symbolic links in path
   'to' may be equal to 'filename'
@@ -162,7 +129,7 @@ int my_realpath(char *to, const char *filename, myf MyFlags)
       result= -1;
     }
   }
-  return result;
+  DBUG_RETURN(result);
 #else
   if (to != filename)
     strmov(to,filename);

mysys/my_symlink2.c

+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA */
+
+/*
+  Advanced symlink handling.
+  This is used in MyISAM to let users symlinks tables to different disk.
+  The main idea with these functions is to automaticly create, delete and
+  rename files and symlinks like they would be one unit.
+*/
+
+#include "mysys_priv.h"
+#include <m_string.h>
+
+File my_create_with_symlink(const char *linkname, const char *filename,
+			    int createflags, int access_flags, myf MyFlags)
+{
+  File file;
+  int tmp_errno;
+  DBUG_ENTER("my_create_with_symlink");
+  if ((file=my_create(filename, createflags, access_flags, MyFlags)) >= 0)
+  {
+    /* Test if we should create a link */
+    if (linkname && strcmp(linkname,filename))
+    {
+      /* Delete old link/file */
+      if (MyFlags & MY_DELETE_OLD)
+	my_delete(linkname, MYF(0));
+      /* Create link */
+      if (my_symlink(filename, linkname, MyFlags))
+      {
+	/* Fail, remove everything we have done */
+	tmp_errno=my_errno;
+	my_close(file,MYF(0));
+	my_delete(filename, MYF(0));
+	file= -1;
+	my_errno=tmp_errno;
+      }
+    }
+  }
+  DBUG_RETURN(file);
+}
+
+/*
+  If the file was a symlink, delete both symlink and the file which the
+  symlink pointed to.
+*/
+
+int my_delete_with_symlink(const char *name, myf MyFlags)
+{
+  char link_name[FN_REFLEN];
+  int was_symlink= !my_readlink(link_name, name, MYF(0));
+  int result;
+  DBUG_ENTER("my_delete_with_symlink");
+
+  if (!(result=my_delete(name, MyFlags)))
+  {
+    if (was_symlink)
+      result=my_delete(link_name, MyFlags);
+  }
+  DBUG_RETURN(result);
+}
+
+/*
+  If the file is a normal file, just rename it.
+  If the file is a symlink:
+   - Create a new file with the name 'to' that points at
+     symlink_dir/basename(to)
+   - Rename the symlinked file to symlink_dir/basename(to)
+   - Delete 'from'
+   If something goes wrong, restore everything.
+*/
+
+int my_rename_with_symlink(const char *from, const char *to, myf MyFlags)
+{
+#ifdef HAVE_READLINK
+  return my_rename(from, to, MyFlags);
+#else
+  char link_name[FN_REFLEN], tmp_name[FN_REFLEN];
+  int was_symlink= !my_readlink(link_name, name, MYF(0));
+  int result;
+  DBUG_ENTER("my_rename_with_symlink");
+
+  if (!was_symlink)
+    DBUG_RETURN(my_rename(from, to, MyFlags));
+
+  /* Change filename that symlink pointed to */
+  strmov(tmp_name, to);
+  fn_same(tmp_name,link_name,1);		/* Copy dir */
+
+  /* Create new symlink */
+  if (my_symlink(tmp_name, to, MyFlags))
+    DBUG_RETURN(-1);
+
+  /*
+    Rename symlinked file if the base name didn't change.
+    This can happen if you use this function where 'from' and 'to' has
+    the same basename and different directories.
+   */
+
+  if (strcmp(link_name, tmp_name) && my_rename(link_name, tmp_name, MyFlags))
+  {
+    my_delete(to, MyFlags);			/* Remove created symlink */
+    DBUG_RETURN(-1);
+  }
+
+  /* Remove original symlink */
+  if (my_delete(from, MyFlags))
+  {
+    /* Remove created link */
+    my_delete(to, MyFlags);
+    /* Rename file back */
+    if (strcmp(link_name, tmp_name))
+      (void) my_rename(tmp_name, link_name, MyFlags);
+  }
+  DBUG_RETURN(result);
+#endif /* HAVE_READLINK */
+}

sql/slave.cc

@@ -963,36 +963,37 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
 	
 	// sanity check to make sure the master did not get a really bad
 	// error on the query
-	if(!check_expected_error(thd, (expected_error = qev->error_code)))
+	if (!check_expected_error(thd, (expected_error = qev->error_code)))
+	{
+	  mysql_parse(thd, thd->query, q_len);
+	  if (expected_error !=
+	      (actual_error = thd->net.last_errno) && expected_error)
 	  {
-	    mysql_parse(thd, thd->query, q_len);
-	    if (expected_error !=
-		(actual_error = thd->net.last_errno) && expected_error)
-	      {
-		const char* errmsg = "Slave: did not get the expected error\
- running query from master - expected: '%s', got '%s'"; 
-		sql_print_error(errmsg, ER(expected_error),
-				actual_error ? thd->net.last_error:"no error"
-				);
-		thd->query_error = 1;
-	      }
-	    else if (expected_error == actual_error)
-	      {
-		thd->query_error = 0;
-		*last_slave_error = 0;
-		last_slave_errno = 0;
-	      }
+	    const char* errmsg = "Slave: did not get the expected error\
+ running query from master - expected: '%s'(%d), got '%s'(%d)"; 
+	    sql_print_error(errmsg, ER_SAFE(expected_error),
+			    expected_error,
+			    actual_error ? thd->net.last_error:"no error",
+			    actual_error);
+	    thd->query_error = 1;
 	  }
-	else // master could be inconsistent, abort and tell DBA to
-	  //    check/fix it
+	  else if (expected_error == actual_error)
 	  {
-	    thd->db = thd->query = 0;
-	    thd->convert_set = 0;
-	    close_thread_tables(thd);
-            free_root(&thd->mem_root,0);
-	    delete ev;
-	    return 1;
+	    thd->query_error = 0;
+	    *last_slave_error = 0;
+	    last_slave_errno = 0;
 	  }
+	}
+	else
+	{
+	  // master could be inconsistent, abort and tell DBA to check/fix it
+	  thd->db = thd->query = 0;
+	  thd->convert_set = 0;
+	  close_thread_tables(thd);
+	  free_root(&thd->mem_root,0);
+	  delete ev;
+	  return 1;
+	}
       }
       thd->db = 0;				// prevent db from being freed
       thd->query = 0;				// just to be sure

sql/sql_repl.cc

@@ -764,14 +764,18 @@ int change_master(THD* thd)
       // if we change host or port, we must reset the postion
       glob_mi.log_file_name[0] = 0;
       glob_mi.pos = 4; // skip magic number
+      glob_mi.pending = 0;
     }
 
   if(lex_mi->log_file_name)
     strmake(glob_mi.log_file_name, lex_mi->log_file_name,
 	    sizeof(glob_mi.log_file_name));
   if(lex_mi->pos)
+  {
     glob_mi.pos = lex_mi->pos;
-
+    glob_mi.pending = 0;
+  }
+  
   if(lex_mi->host)
     {
       strmake(glob_mi.host, lex_mi->host, sizeof(glob_mi.host));

sql/unireg.h

@@ -38,6 +38,8 @@
 #endif
 
 #define ER(X) errmesg[(X)-1000]
+#define ER_SAFE(X) (((X) >= 1000 && (X) < ER_ERROR_MESSAGES + 1000) ? ER(X) : "Invalid error code")
+
 
 #define ERRMAPP 1				/* Errormap f|r my_error */
 #define LIBLEN FN_REFLEN-FN_LEN			/* Max l{ngd p} dev */