Merge

libmysqld/Makefile.am

@@ -137,7 +137,7 @@ else
 		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
 		else \
 		  (for arc in ./libmysqld_int.a $(INC_LIB); do \
-		    arpath=`echo $$arc|sed 's|[^/]*$$||'`; \
+		    arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \
 		    $(AR) t $$arc|xargs -n 1 find $$arpath -name; \
 		    $(AR) t $$arc|xargs -n 1 find `dirname $$arpath` -path \*/`basename $$arpath`/\* -name; \
 		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \

mysql-test/include/drop-on-restart.inc

@@ -1,467 +0,0 @@
-#
-# Stupid temporary way of cleaning up when restarting the server
-#
-
---disable_warnings
---disable_query_log
-
-drop database if exists BANK;
-drop database if exists MySQLTest;
-drop database if exists MySQLtesT;
-drop database if exists TEST_DB;
-drop database if exists `#mysql50#testdb-1`;
-drop database if exists `TEST_$1`;
-drop database if exists `drop-temp+table-test`;
-drop database if exists `test_$1`;
-drop database if exists `testdb-1`;
-drop database if exists `testdb1`;
-drop database if exists client_test_db;
-drop database if exists d1;
-drop database if exists d2;
-drop database if exists db1;
-drop database if exists db1_secret;
-drop database if exists db2;
-drop database if exists federated;
-drop database if exists mysqldump_test_db;
-drop database if exists mysqlslap;
-drop database if exists mysqltest1;
-drop database if exists mysqltest2;
-drop database if exists mysqltest3;
-drop database if exists mysqltest;
-drop database if exists mysqltest;
-drop database if exists mysqltest_1;
-drop database if exists mysqltest_LC2;
-drop database if exists mysqltest_bob;
-drop database if exists mysqltest_db1;
-drop database if exists mysqltest_prometheus;
-drop database if exists mysqltest_sisyfos;
-drop database if exists ndbsynctest;
-drop database if exists ndbtest1;
-drop database if exists rewrite;
-drop database if exists test2;
-drop database if exists test_only_ndb_tables;
-drop database if exists test_test;
-drop database if exists testdb1;
-drop database if exists testtets;
-
-drop function if exists append;
-drop function if exists bug10015_1;
-drop function if exists bug10015_2;
-drop function if exists bug10015_3;
-drop function if exists bug10015_4;
-drop function if exists bug10015_5;
-drop function if exists bug10015_6;
-drop function if exists bug10015_7;
-drop function if exists bug10055;
-drop function if exists bug10100f;
-drop function if exists bug11394;
-drop function if exists bug11394_1;
-drop function if exists bug11394_2;
-drop function if exists bug11554;
-drop function if exists bug11555_1;
-drop function if exists bug11555_2;
-drop function if exists bug11834_1;
-drop function if exists bug11834_2;
-drop function if exists bug12379;
-drop function if exists bug12712;
-drop function if exists bug12812;
-drop function if exists bug12953;
-drop function if exists bug12995;
-drop function if exists bug13012;
-drop function if exists bug131333;
-drop function if exists bug13825_0;
-drop function if exists bug13825_1;
-drop function if exists bug13825_2;
-drop function if exists bug13825_3;
-drop function if exists bug13825_4;
-drop function if exists bug13825_5;
-drop function if exists bug13941;
-drop function if exists bug14233;
-drop function if exists bug14270;
-drop function if exists bug14723;
-drop function if exists bug2267_4;
-drop function if exists bug2564_3;
-drop function if exists bug2564_4;
-drop function if exists bug2674;
-drop function if exists bug2772;
-drop function if exists bug3132;
-drop function if exists bug4487;
-drop function if exists bug5240;
-drop function if exists bug5278;
-drop function if exists bug5893;
-drop function if exists bug6022;
-drop function if exists bug7049_1;
-drop function if exists bug7049_2;
-drop function if exists bug7648;
-drop function if exists bug8408_f;
-drop function if exists bug8409;
-drop function if exists bug8861;
-drop function if exists bug9048;
-drop function if exists bug9056_func1;
-drop function if exists bug9056_func2;
-drop function if exists bug9102;
-drop function if exists bug9559;
-drop function if exists bug9775;
-drop function if exists bug_13627_f;
-drop function if exists bug_9503;
-drop function if exists chistics;
-drop function if exists e;
-drop function if exists f0;
-drop function if exists f10;
-drop function if exists f11;
-drop function if exists f12_1;
-drop function if exists f12_2;
-drop function if exists f1;
-drop function if exists f2;
-drop function if exists f3;
-drop function if exists f4;
-drop function if exists f5;
-drop function if exists f6;
-drop function if exists f7;
-drop function if exists f8;
-drop function if exists f9;
-drop function if exists f_bug11247;
-drop function if exists fac;
-drop function if exists foo;
-drop function if exists fun;
-drop function if exists inc;
-drop function if exists mul;
-drop function if exists sp_vars_check_ret1;
-drop function if exists sp_vars_check_ret2;
-drop function if exists sp_vars_check_ret3;
-drop function if exists sp_vars_check_ret4;
-drop function if exists sub1;
-drop function if exists sub2;
-drop function if exists test.f1;
-
-drop procedure if exists BUG3259_2 ;
-drop procedure if exists Bug3259_3 ;
-drop procedure if exists ` bug15658`;
-drop procedure if exists `a'b`;
-drop procedure if exists a0;
-drop procedure if exists a;
-drop procedure if exists avg;
-drop procedure if exists b2;
-drop procedure if exists b;
-drop procedure if exists bar;
-drop procedure if exists bug10015_8;
-drop procedure if exists bug10100p;
-drop procedure if exists bug10100pc;
-drop procedure if exists bug10100pd;
-drop procedure if exists bug10100pt;
-drop procedure if exists bug10100pv;
-drop procedure if exists bug10100t;
-drop procedure if exists bug10136;
-drop procedure if exists bug10537;
-drop procedure if exists bug10961;
-drop procedure if exists bug10969;
-drop procedure if exists bug11158;
-drop procedure if exists bug11333;
-drop procedure if exists bug11394;
-drop procedure if exists bug11529;
-drop procedure if exists bug11587;
-drop procedure if exists bug12168;
-drop procedure if exists bug12297;
-drop procedure if exists bug12379_1;
-drop procedure if exists bug12379_2;
-drop procedure if exists bug12379_3;
-drop procedure if exists bug12589_1;
-drop procedure if exists bug12589_2;
-drop procedure if exists bug12589_3;
-drop procedure if exists bug12712;
-drop procedure if exists bug12849_1;
-drop procedure if exists bug12849_2;
-drop procedure if exists bug12979_1;
-drop procedure if exists bug12979_2;
-drop procedure if exists bug13012;
-drop procedure if exists bug13037_p1;
-drop procedure if exists bug13037_p2;
-drop procedure if exists bug13037_p3;
-drop procedure if exists bug13095;
-drop procedure if exists bug13124;
-drop procedure if exists bug131333;
-drop procedure if exists bug13510_1;
-drop procedure if exists bug13510_2;
-drop procedure if exists bug13510_3;
-drop procedure if exists bug13510_4;
-drop procedure if exists bug13549_1;
-drop procedure if exists bug13549_2;
-drop procedure if exists bug13729;
-drop procedure if exists bug13825_0;
-drop procedure if exists bug13825_1;
-drop procedure if exists bug13825_2;
-drop procedure if exists bug13941;
-drop procedure if exists bug14210;
-drop procedure if exists bug14233;
-drop procedure if exists bug14304;
-drop procedure if exists bug14376;
-drop procedure if exists bug14498_1;
-drop procedure if exists bug14498_2;
-drop procedure if exists bug14498_3;
-drop procedure if exists bug14498_4;
-drop procedure if exists bug14498_5;
-drop procedure if exists bug14643_1;
-drop procedure if exists bug14643_2;
-drop procedure if exists bug14723;
-drop procedure if exists bug14840_1;
-drop procedure if exists bug14840_2;
-drop procedure if exists bug1495;
-drop procedure if exists bug15011;
-drop procedure if exists bug15091;
-drop procedure if exists bug15231_1;
-drop procedure if exists bug15231_2;
-drop procedure if exists bug15231_3;
-drop procedure if exists bug15231_4;
-drop procedure if exists bug15441;
-drop procedure if exists bug1547;
-drop procedure if exists bug1656;
-drop procedure if exists bug1862;
-drop procedure if exists bug1863;
-drop procedure if exists bug1874;
-drop procedure if exists bug2227;
-drop procedure if exists bug2260;
-drop procedure if exists bug2267_1;
-drop procedure if exists bug2267_2;
-drop procedure if exists bug2267_3;
-drop procedure if exists bug2267_4;
-drop procedure if exists bug2460_1;
-drop procedure if exists bug2460_2;
-drop procedure if exists bug2564_1;
-drop procedure if exists bug2564_2;
-drop procedure if exists bug2614;
-drop procedure if exists bug2656_1;
-drop procedure if exists bug2656_2;
-drop procedure if exists bug2773;
-drop procedure if exists bug2776_1;
-drop procedure if exists bug2776_2;
-drop procedure if exists bug2780;
-drop procedure if exists bug3157;
-drop procedure if exists bug3259_1 ;
-drop procedure if exists bug3294;
-drop procedure if exists bug3368;
-drop procedure if exists bug336;
-drop procedure if exists bug3426;
-drop procedure if exists bug3448;
-drop procedure if exists bug3583;
-drop procedure if exists bug3734 ;
-drop procedure if exists bug3788;
-drop procedure if exists bug3843;
-drop procedure if exists bug3863;
-drop procedure if exists bug4318;
-drop procedure if exists bug4579_1;
-drop procedure if exists bug4579_2;
-drop procedure if exists bug4726;
-drop procedure if exists bug4902;
-drop procedure if exists bug4902_2;
-drop procedure if exists bug4904;
-drop procedure if exists bug4905;
-drop procedure if exists bug4941;
-drop procedure if exists bug5251;
-drop procedure if exists bug5258;
-drop procedure if exists bug5258_aux;
-drop procedure if exists bug5287;
-drop procedure if exists bug5307;
-drop procedure if exists bug5963;
-drop procedure if exists bug5967;
-drop procedure if exists bug6029;
-drop procedure if exists bug6063;
-drop procedure if exists bug6127;
-drop procedure if exists bug6129;
-drop procedure if exists bug6642;
-drop procedure if exists bug6807;
-drop procedure if exists bug6857;
-drop procedure if exists bug6866;
-drop procedure if exists bug6898;
-drop procedure if exists bug6900;
-drop procedure if exists bug6900_9074;
-drop procedure if exists bug7013;
-drop procedure if exists bug7049_1;
-drop procedure if exists bug7049_2;
-drop procedure if exists bug7049_3;
-drop procedure if exists bug7049_4;
-drop procedure if exists bug7088_1;
-drop procedure if exists bug7088_2;
-drop procedure if exists bug7293;
-drop procedure if exists bug7299;
-drop procedure if exists bug7743;
-drop procedure if exists bug8116;
-drop procedure if exists bug822;
-drop procedure if exists bug8408_p;
-drop procedure if exists bug8540;
-drop procedure if exists bug8692;
-drop procedure if exists bug8757;
-drop procedure if exists bug8762;
-drop procedure if exists bug8776_1;
-drop procedure if exists bug8776_2;
-drop procedure if exists bug8776_3;
-drop procedure if exists bug8776_4;
-drop procedure if exists bug8849;
-drop procedure if exists bug8850;
-drop procedure if exists bug8937;
-drop procedure if exists bug9004_1;
-drop procedure if exists bug9004_2;
-drop procedure if exists bug9056_proc1;
-drop procedure if exists bug9056_proc2;
-drop procedure if exists bug9073;
-drop procedure if exists bug9074;
-drop procedure if exists bug9367;
-drop procedure if exists bug9486;
-drop procedure if exists bug9538;
-drop procedure if exists bug9565;
-drop procedure if exists bug9565_sub;
-drop procedure if exists bug9566;
-drop procedure if exists bug9598_1;
-drop procedure if exists bug9598_2;
-drop procedure if exists bug9674_1;
-drop procedure if exists bug9674_2;
-drop procedure if exists bug9841;
-drop procedure if exists bug9856;
-drop procedure if exists bug9902;
-drop procedure if exists c1;
-drop procedure if exists c2;
-drop procedure if exists c3;
-drop procedure if exists c4;
-drop procedure if exists c;
-drop procedure if exists cbv1;
-drop procedure if exists cbv2;
-drop procedure if exists chistics;
-drop procedure if exists code_sample;
-drop procedure if exists create_select;
-drop procedure if exists cur1;
-drop procedure if exists cur2;
-drop procedure if exists d;
-drop procedure if exists dummy;
-drop procedure if exists e;
-drop procedure if exists empty;
-drop procedure if exists f1;
-drop procedure if exists f;
-drop procedure if exists fib;
-drop procedure if exists fn3;
-drop procedure if exists foo42;
-drop procedure if exists g;
-drop procedure if exists goto1;
-drop procedure if exists goto2;
-drop procedure if exists goto3;
-drop procedure if exists goto4;
-drop procedure if exists goto5;
-drop procedure if exists goto6;
-drop procedure if exists h;
-drop procedure if exists hndlr1;
-drop procedure if exists hndlr2;
-drop procedure if exists hndlr3;
-drop procedure if exists hndlr4;
-drop procedure if exists i;
-drop procedure if exists ifac;
-drop procedure if exists inc2;
-drop procedure if exists inc;
-drop procedure if exists incr;
-drop procedure if exists into_dumpfile;
-drop procedure if exists into_outfile;
-drop procedure if exists into_tes2;
-drop procedure if exists into_test3;
-drop procedure if exists into_test4;
-drop procedure if exists into_test;
-drop procedure if exists iotest;
-drop procedure if exists ip;
-drop procedure if exists locset;
-drop procedure if exists mixset;
-drop procedure if exists modes;
-drop procedure if exists mysqltest1.p1;
-drop procedure if exists mysqltest1.p2;
-drop procedure if exists nullset;
-drop procedure if exists opp;
-drop procedure if exists p1;
-drop procedure if exists p2;
-drop procedure if exists p3;
-drop procedure if exists p4;
-drop procedure if exists p5;
-drop procedure if exists p6;
-drop procedure if exists p;
-drop procedure if exists p_bug11247;
-drop procedure if exists rc;
-drop procedure if exists scope;
-drop procedure if exists sel1;
-drop procedure if exists sel2;
-drop procedure if exists setcontext;
-drop procedure if exists sp1;
-drop procedure if exists sp2;
-drop procedure if exists sp3;
-drop procedure if exists sp4;
-drop procedure if exists sp_vars_check_assignment;
-drop procedure if exists sp_vars_check_dflt;
-drop procedure if exists sub1;
-drop procedure if exists sub2;
-drop procedure if exists sub3;
-drop procedure if exists sudoku_solve;
-drop procedure if exists test.longprocedure;
-drop procedure if exists test.p1;
-drop procedure if exists test.p2;
-drop procedure if exists test.p3;
-drop procedure if exists test.p4;
-drop procedure if exists test.p5;
-drop procedure if exists test.p6;
-drop procedure if exists test.p7;
-drop procedure if exists two;
-drop procedure if exists zap;
-drop procedure if exists zip;
-
-drop table if exists T1;
-drop table if exists `"t"1`,t1aa,t2aa;
-drop table if exists ```a`;
-drop table if exists `t1 test`;
-drop table if exists `t1a``b`,v1,v2,v3,v4,v5,v6;
-drop table if exists `t2 test`;
-drop table if exists a;
-drop table if exists bug13095_t1;
-drop table if exists bug13894;
-drop table if exists bug14672;
-drop table if exists federated.alter_me;
-drop table if exists federated.archive_table;
-drop table if exists federated.bug_13118_table;
-drop table if exists federated.normal_table;
-drop table if exists federated.t1;
-drop table if exists gis_point,gis_line,gis_polygon,gis_multi_point,gis_multi_line,gis_multi_polygon,gis_geometrycollection,gis_geometry;
-drop table if exists mysqltest1.t1;
-drop table if exists mysqltest1.t2;
-drop table if exists mysqltest1.t3;
-drop table if exists mysqltest1.t4;
-drop table if exists mysqltest_bar;
-drop table if exists mysqltest_foo;
-drop table if exists new_t2;
-drop table if exists not_exist;
-drop table if exists r1;
-drop table if exists t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t21,t70;
-drop table if exists t00,t03,t04;
-drop table if exists t0_template;
-drop table if exists t1Aa,t2Aa,v1Aa,v2Aa;
-drop table if exists t1_1,t1_2,t9_1,t9_2,t1aa,t2aa;
-drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
-drop table if exists t1aa,t2aa;
-drop table if exists t2aA,t1Aa;
-drop table if exists test,test1,test2;
-drop table if exists v1,v2,v3;
-
-drop temporary table if exists test.t1;
-
-# This doesn't work
-#drop trigger if exists `test trig`;
-#drop trigger if exists test.t1_bd;
-#drop trigger if exists test.t1_bi;
-#drop trigger if exists test.t1_bi_t2;
-#drop trigger if exists test.t1_bu;
-#drop trigger if exists test.t2_ad;
-#drop trigger if exists test.t2_ai;
-#drop trigger if exists test.t2_au;
-#drop trigger if exists test.t3_bi_t2;
-
-drop view if exists bug13095_v1;
-drop view if exists mysqltest1.v1;
-drop view if exists mysqltest1.v2;
-drop view if exists mysqltest1.v3;
-drop view if exists mysqltest1.v4;
-drop view if exists t1,t2,`t1a``b`;
-drop view if exists t1Aa,t2Aa,v1Aa,v2Aa;
-drop view if exists v0,v1,v2,v3,v4,v5,v6;
-
---enable_query_log
---enable_warnings

mysql-test/mysql-test-run.pl

@@ -144,7 +144,6 @@ our $glob_use_running_server=     0;
 our $glob_use_running_ndbcluster= 0;
 our $glob_use_running_ndbcluster_slave= 0;
 our $glob_use_embedded_server=    0;
-our $glob_mysqld_restart=         0;
 our @glob_test_mode;
 
 our $using_ndbcluster_master= 0;
@@ -609,7 +608,7 @@ sub command_line_setup () {
              # Specify ports
              'master_port=i'            => \$opt_master_myport,
              'slave_port=i'             => \$opt_slave_myport,
-             'ndbcluster-port=i'        => \$opt_ndbcluster_port,
+             'ndbcluster-port|ndbcluster_port=i' => \$opt_ndbcluster_port,
              'ndbcluster-port-slave=i'  => \$opt_ndbcluster_port_slave,
              'manager-port=i'           => \$opt_manager_port, # Currently not used
              'im-port=i'                => \$im_port, # Instance Manager port.

mysql-test/t/disabled.def

@@ -14,7 +14,9 @@ events_stress            : BUG#17619 2006-02-21 andrey  Test case unstable
 events                   : BUG#17619 2006-02-21 andrey  Test case unstable
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
+ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    Test fails randomly
 ndb_cache2               : BUG#18597 2006-03-28 brian
+ndb_cache_multi2         : BUG#18974 2006-04-10 kent    Test fails randomly
 ndb_gis                  : BUG#18600 2006-03-28 brian
 ndb_load                 : BUG#17233 2006-02-16 jmiller
 partition_03ndb          : BUG#16385 2006-03-24 mikael
@@ -34,7 +36,9 @@ rpl_ndb_myisam2ndb       : BUG#18261 2006-03-16 mats    Cluster Replication: tes
 rpl_ndb_multi_update3    : BUG#18627 2006-03-29 monty   Cluster Replication: rpl_ndb_multi_update3 fails on Intel 64 bit
 rpl_ndb_log              : BUG#18947 2006-03-21 tomas   Result not deterministic, TBD if should remove
 rpl_ndb_relay_space      : BUG#16993 2006-02-16 jmiller
+rpl_ndb_trig004          : BUG#18977 2006-04-10 kent    Test fails randomly
 rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian
+rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 rpl_row_inexist_tbl      : BUG#18948 2006-03-09 mats    Disabled since patch makes this test wait forever
 rpl_sp                   : BUG#16456 2006-02-16 jmiller
 rpl_until                : BUG#15886 2006-02-16 jmiller Unstable test case

scripts/make_binary_distribution.sh

@@ -241,9 +241,10 @@ $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
     mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
     mysql-test/std_data/*.cnf \
     $BASE/mysql-test/std_data
-$CP mysql-test/t/*.test mysql-test/t/*.imtest \
+$CP mysql-test/t/*.test $BASE/mysql-test/t
-    mysql-test/t/*.disabled mysql-test/t/*.opt \
+$CP mysql-test/t/*.imtest mysql-test/t/*.disabled $BASE/mysql-test/t
-    mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
+$CP mysql-test/t/*.opt mysql-test/t/*.slave-mi $BASE/mysql-test/t
+$CP mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
 $CP mysql-test/r/*.result mysql-test/r/*.require \
     $BASE/mysql-test/r
 $CP mysql-test/extra/binlog_tests/*.test $BASE/mysql-test/extra/binlog_tests

scripts/make_win_src_distribution.sh

@@ -184,7 +184,7 @@ rm -r -f "$BASE/share/Makefile"
 rm -r -f "$BASE/share/Makefile.in"
 rm -r -f "$BASE/share/Makefile.am"
 
-mkdir $BASE/Docs $BASE/extra $BASE/include $BASE/storage
+mkdir $BASE/Docs $BASE/extra $BASE/include
 
 #
 # Copy directory files
@@ -251,7 +251,7 @@ copy_dir_dirs() {
 
 for i in client dbug extra storage/heap include storage/archive storage/csv \
          include/mysql libmysql libmysqld storage/myisam storage/example \
-         storage/myisammrg mysys regex sql strings sql-common sql/examples \
+         storage/myisammrg mysys regex sql strings sql-common \
          tools vio zlib
 do
   copy_dir_files $i
@@ -260,7 +260,7 @@ done
 #
 # Create project files for ndb
 #
-make -C $SOURCE/storage/ndb windoze
+#make -C $SOURCE/storage/ndb windoze
 
 #
 # Input directories to be copied recursively
@@ -298,8 +298,6 @@ do
   fi
 done
 
-cp extra/sql_state.h extra/mysqld_error.h $BASE/include
-
 #
 # support files
 #
@@ -350,8 +348,6 @@ find $BASE \( -name "*.cnf" -o -name "*.ini" \
   do
     unix_to_dos $v
   done
-# File extension '.txt' matches too many other files, error messages etc.
-unix_to_dos $BASE/Docs/*.txt 
 
 mv $BASE/README $BASE/README.txt
 

storage/archive/archive_test.c

@@ -1,5 +1,5 @@
+#include "azlib.h"
 #include <stdio.h>
-#include <azlib.h>
 
 #define TEST_STRING "This is a test"
 #define BUFFER_LEN 1024

storage/archive/azio.c

@@ -11,11 +11,11 @@
 
 /* @(#) $Id$ */
 
+#include "azlib.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "azlib.h"
-
 static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
 
 /* gzip flag byte */