bk commit into 5.1 tree (jani:1.2522)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-30 13:59:44+03:00, jani@stripped +5
-0
  Archive db fix plus added non-critical warnings
  in ignore list.

  mysql-test/lib/mtr_report.pl@stripped, 2007-05-30 13:59:39+03:00,
jani@stripped +3 -0
    Added non-critical warnings to be ignored.

  mysql-test/r/func_misc.result@stripped, 2007-05-30 13:59:39+03:00,
jani@stripped +4 -2
    Test case for archive db fix.

  mysql-test/t/func_misc.test@stripped, 2007-05-30 13:59:39+03:00,
jani@stripped +3 -1
    Test case for archive db fix.

  mysys/my_pread.c@stripped, 2007-05-30 13:59:39+03:00,
jani@stripped +1 -0
    Archive db fix.

  storage/archive/azio.c@stripped, 2007-05-30 13:59:39+03:00,
jani@stripped +1 -0
    Archive db fix.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a88-113-38-195.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.1-marvel

--- 1.20/mysys/my_pread.c	2007-05-10 12:59:25 +03:00
+++ 1.21/mysys/my_pread.c	2007-05-30 13:59:39 +03:00
@@ -182,6 +182,7 @@
     else
       break;					/* Return bytes written */
   }
+  DBUG_EXECUTE_IF("check", my_seek(Filedes, -1, SEEK_SET, MYF(0)););
   if (MyFlags & (MY_NABP | MY_FNABP))
     DBUG_RETURN(0);			/* Want only errors */
   DBUG_RETURN(writenbytes+written); /* purecov: inspected */

--- 1.18/storage/archive/azio.c	2007-05-10 12:59:30 +03:00
+++ 1.19/storage/archive/azio.c	2007-05-30 13:59:39 +03:00
@@ -791,6 +791,7 @@
     if (do_flush(s, Z_FINISH) != Z_OK)
       return destroy(s);
 
+    my_seek(s->file, 0, MY_SEEK_END, MYF(0));
     putLong(s->file, s->crc);
     putLong(s->file, (uLong)(s->in & 0xffffffff));
     s->dirty= AZ_STATE_CLEAN;

--- 1.50/mysql-test/lib/mtr_report.pl	2007-05-30 10:10:05 +03:00
+++ 1.51/mysql-test/lib/mtr_report.pl	2007-05-30 13:59:39 +03:00
@@ -305,6 +305,8 @@
 		/Invalid \(old\?\) table or database name/ or
 		/Lock wait timeout exceeded/ or
 		/Log entry on master is longer than max_allowed_packet/ or
+                /unknown option '--loose-/ or
+                /unknown variable 'loose-'/ or
 		/NDB Binlog:/ or
 		/NDB: failed to setup table/ or
 		/NDB: only row based binary logging/ or
@@ -328,6 +330,7 @@
 		/Slave: Table width mismatch/ or
 		/Slave: The incident LOST_EVENTS occured on the master/ or
 		/Slave: Unknown error.* 1105/ or
+		/Slave: Can't drop database.* database doesn't exist/ or
 		/Sort aborted/ or
 		/Time-out in NDB/ or
 		/Warning:\s+One can only use the --user.*root/ or

--- 1.32/mysql-test/r/func_misc.result	2007-04-27 01:12:06 +03:00
+++ 1.33/mysql-test/r/func_misc.result	2007-05-30 13:59:39 +03:00
@@ -22,8 +22,10 @@
 select length(uuid()), charset(uuid()), length(unhex(replace(uuid(),_utf8'-',_utf8'')));
 length(uuid())	charset(uuid())	length(unhex(replace(uuid(),_utf8'-',_utf8'')))
 36	utf8	16
-select cast(uuid_short()-uuid_short() as signed);
-cast(uuid_short()-uuid_short() as signed)
+set @a= uuid_short();
+set @b= uuid_short();
+select cast(@a - @b as signed);
+cast(@a - @b as signed)
 -1
 select length(format('nan', 2)) > 0;
 length(format('nan', 2)) > 0

--- 1.22/mysql-test/t/func_misc.test	2007-04-27 01:12:06 +03:00
+++ 1.23/mysql-test/t/func_misc.test	2007-05-30 13:59:39 +03:00
@@ -16,7 +16,9 @@
 
 # As we can assume we are the only user for the mysqld server, the difference
 # between two calls should be -1
-select cast(uuid_short()-uuid_short() as signed);
+set @a= uuid_short();
+set @b= uuid_short();
+select cast(@a - @b as signed);
 
 #
 # Test for core dump with nan