bk commit into 5.0 tree (monty:1.2385)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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-01-22 15:52:15+02:00, monty@stripped +8 -0
  Fixed compiler warnings
  Fixed wrong merge that disabled 'make test'
  Renamed all suppress files to end in '.supp'
  Don't give "skipped %d bytes from file" warnings in 5.0

  Makefile.am@stripped, 2007-01-22 15:52:14+02:00, monty@stripped +1 -0
    Added back missing cd from wrong merge

  heap/hp_write.c@stripped, 2007-01-22 15:52:14+02:00, monty@stripped +1 -1
    Fixed compiler warning

  mysql-test/purify.supp@stripped, 2007-01-22 15:50:29+02:00, monty@stripped +0 -0
    Rename: mysql-test/suppress.purify -> mysql-test/purify.supp

  mysql-test/r/mysqlbinlog.result@stripped, 2007-01-22 15:52:14+02:00, monty@stripped +7 -5
    Fixed test case to drop all used tables at start and used tables after each test group

  mysql-test/t/mysqlbinlog.test@stripped, 2007-01-22 15:52:14+02:00, monty@stripped +10 -5
    Fixed test case to drop all used tables at start and used tables after each test group

  sql/net_serv.cc@stripped, 2007-01-22 15:52:14+02:00, monty@stripped +1 -1
    Don't give "skipped %d bytes from file" warnings in 5.0
    (The proper fix for this is in 5.1)

  sql/table.cc@stripped, 2007-01-22 15:52:14+02:00, monty@stripped +2 -1
    Fixed compiler warning

  support-files/compiler_warnings.supp@stripped, 2007-01-22 15:50:29+02:00, monty@stripped +0
-0
    Rename: support-files/disabled_compiler_warnings.txt ->
support-files/compiler_warnings.supp

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.0

--- 1.95/Makefile.am	2007-01-18 22:15:14 +02:00
+++ 1.96/Makefile.am	2007-01-22 15:52:14 +02:00
@@ -123,6 +123,7 @@
 # making sure each user use different ports.
 
 test-ps:
+	cd mysql-test ; \
 	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol
 
 test-ns:

--- 1.28/heap/hp_write.c	2007-01-11 20:59:22 +02:00
+++ 1.29/heap/hp_write.c	2007-01-22 15:52:14 +02:00
@@ -68,7 +68,7 @@
 
 err:
   if (my_errno == HA_ERR_FOUND_DUPP_KEY)
-    DBUG_PRINT("info",("Duplicate key: %d", keydef - share->keydef));
+    DBUG_PRINT("info",("Duplicate key: %d", (int) (keydef - share->keydef)));
   info->errkey= keydef - share->keydef;
   /*
     We don't need to delete non-inserted key from rb-tree.  Also, if

--- 1.97/sql/net_serv.cc	2007-01-22 14:10:40 +02:00
+++ 1.98/sql/net_serv.cc	2007-01-22 15:52:14 +02:00
@@ -299,7 +299,7 @@
     {
       DBUG_PRINT("info",("skipped %d bytes from file: %s",
                          count, vio_description(net->vio)));
-#ifdef EXTRA_DEBUG
+#if defined(EXTRA_DEBUG) && (MYSQL_VERSION_ID < 51000)
       fprintf(stderr,"skipped %d bytes from file: %s\n",
               count, vio_description(net->vio));
 #endif

--- 1.242/sql/table.cc	2007-01-22 14:10:42 +02:00
+++ 1.243/sql/table.cc	2007-01-22 15:52:14 +02:00
@@ -2915,7 +2915,8 @@
   uint field_count;
   TABLE_LIST *add_table_ref= parent_table_ref ?
                              parent_table_ref : table_ref;
-
+  LINT_INIT(field_count);
+  
   if (field_it == &table_field_it)
   {
     /* The field belongs to a stored table. */

--- 1.26/mysql-test/r/mysqlbinlog.result	2006-12-14 12:19:27 +02:00
+++ 1.27/mysql-test/r/mysqlbinlog.result	2007-01-22 15:52:14 +02:00
@@ -1,5 +1,5 @@
 set timestamp=1000000000;
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3,t4,t5,t03,t04;
 create table t1 (word varchar(20));
 create table t2 (id int auto_increment not null primary key);
 insert into t1 values ("abirvalg");
@@ -23,7 +23,7 @@
 SET @@session.sql_mode=0/*!*/;
 /*!\C latin1 *//*!*/;
 SET
@@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-drop table if exists t1,t2/*!*/;
+drop table if exists t1,t2,t3,t4,t5,t03,t04/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 create table t1 (word varchar(20))/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
@@ -100,7 +100,7 @@
 SET @@session.sql_mode=0/*!*/;
 /*!\C latin1 *//*!*/;
 SET
@@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-drop table if exists t1,t2/*!*/;
+drop table if exists t1,t2,t3,t4,t5,t03,t04/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 create table t1 (word varchar(20))/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
@@ -192,6 +192,7 @@
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
+drop table t1,t2;
 flush logs;
 create table t3 (f text character set utf8);
 create table t4 (f text character set cp932);
@@ -209,13 +210,14 @@
 select HEX(f) from t4;
 HEX(f)
 835C
+drop table t3,t4,t03,t04;
 flush logs;
 select * from t5  /* must be (1),(1) */;
 a
 1
 1
+drop table t5;
 flush logs;
-drop table if exists t5;
 create table t5 (c1 int, c2 varchar(128) character set latin1 not null);
 insert into t5 values (1, date_format('2001-01-01','%W'));
 set lc_time_names=de_DE;
@@ -234,6 +236,7 @@
 1	Monday
 2	Montag
 3	Monday
+drop table t5;
 drop procedure if exists p1;
 flush logs;
 create procedure p1()
@@ -269,4 +272,3 @@
 1
 1
 drop procedure p1;
-drop table t1, t2, t03, t04, t3, t4, t5;

--- 1.37/mysql-test/t/mysqlbinlog.test	2007-01-22 14:04:35 +02:00
+++ 1.38/mysql-test/t/mysqlbinlog.test	2007-01-22 15:52:14 +02:00
@@ -7,7 +7,7 @@
 set timestamp=1000000000;
 
 --disable_warnings
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3,t4,t5,t03,t04;
 --enable_warnings
 
 create table t1 (word varchar(20));
@@ -106,8 +106,11 @@
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --exec $MYSQL_BINLOG --short-form --position=79 - <
$MYSQL_TEST_DIR/std_data/trunc_binlog.000001
+drop table t1,t2;
 
+#
 # Bug#16217 (mysql client did not know how not switch its internal charset)
+#
 flush logs;
 create table t3 (f text character set utf8);
 create table t4 (f text character set cp932); 
@@ -121,6 +124,7 @@
 select HEX(f) from t3;
 select HEX(f) from t04;
 select HEX(f) from t4;
+drop table t3,t4,t03,t04;
 
 #
 #BUG#14157: utf8 encoding in binlog without set character_set_client
@@ -133,6 +137,7 @@
 # should use default-character-set same as the server.
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL
 select * from t5  /* must be (1),(1) */;
+drop table t5;
 
 #
 # Bug#22645 LC_TIME_NAMES: Statement not replicated
@@ -140,7 +145,6 @@
 # lc_time_names dependent values correctly
 #
 flush logs;
-drop table if exists t5;
 create table t5 (c1 int, c2 varchar(128) character set latin1 not null);
 insert into t5 values (1, date_format('2001-01-01','%W'));
 set lc_time_names=de_DE;
@@ -152,6 +156,8 @@
 drop table t5;
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL
 select * from t5 order by c1;
+drop table t5;
+
 #
 # Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 
 #
@@ -175,14 +181,13 @@
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009 | $MYSQL
 call p1();
 drop procedure p1;
+
+#
 # Some coverage of not normally used parts
 #
 --disable_query_log
 --exec $MYSQL_BINLOG --version 2>&1 > /dev/null
 --exec $MYSQL_BINLOG --help 2>&1 > /dev/null
 --enable_query_log
-
-# clean up
-drop table t1, t2, t03, t04, t3, t4, t5; 
 
 # End of 5.0 tests