Commit 410faef6 authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Fixed bug in ALTER TABLE for MERGE tables 

Portability fixes
Fixed problem when giving wrong arguments to myisam_recover
Fix to remove warnings when using purify
parent 934f3acc

BUILD/compile-solaris-sparc-purify

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ aclocal && autoheader && aclocal && automake && autoconf 
(cd bdb/dist && sh s_all)

(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)



CFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -O2" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_PURIFY -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug=full

CFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug=full --with-berkeley-db --with-innodb



gmake -j 4



cd sql ; rm mysqld ; make CXXLD="purify -best-effort g++"  mysqld

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ jcole@tetra.spaceapes.com 
davida@isil.mysql.com

tonu@x153.internalnet

tim@bitch.mysql.fi

monty@bitch.mysql.fi

mysql-test/install_test_db.sh

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ else 
basedir=.

rm -rf share

mkdir  share

ln -sf ../../sql/share share/mysql 

ln -f -s ../../sql/share share/mysql 

fi



# Initialize variables

sql/ha_myisam.cc

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ ulong myisam_recover_options= HA_RECOVER_NONE; 


/* bits in myisam_recover_options */

const char *myisam_recover_names[] =

{ "DEFAULT", "BACKUP", "FORCE", "QUICK"};

{ "DEFAULT", "BACKUP", "FORCE", "QUICK", NullS};

TYPELIB myisam_recover_typelib= {array_elements(myisam_recover_names),"",

				 myisam_recover_names};

sql/ha_myisammrg.cc

+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info) 
    MYRG_TABLE *table;

    THD *thd=current_thd;

    create_info->merge_list.next= &create_info->merge_list.first;

    create_info->merge_list.elements=0;



    for (table=file->open_tables ; table != file->end_table ; table++)

    {
@@ -240,6 +241,7 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info) 
      fn_format(buff,name,"","",3);

      if (!(ptr->real_name=thd->strdup(buff)))

	goto err;

      create_info->merge_list.elements++;

      (*create_info->merge_list.next) = (byte*) ptr;

      create_info->merge_list.next= (byte**) &ptr->next;

    }