Commit c6fbbe72 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339
parents 37d0dda4 a310380b

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#

##############################################################################



archive              : Change between azio and gzio is causing an issue

events               : Test case instability - infinite locking. To be fixed.

func_group           : Bug#15448

func_math            : Bug#15448

sql/ha_archive.cc

+8 −2
Original line number Diff line number Diff line
@@ -1237,10 +1237,16 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt) 
      azwrite(&writer, block, read);

  }



  azflush(&writer, Z_SYNC_FLUSH);

  azclose(&writer);

  share->dirty= FALSE;

  azclose(&(share->archive_write));

  share->archive_write= writer; 

  if (!(azopen(&(share->archive_write), share->data_file_name, 

               O_WRONLY|O_APPEND|O_BINARY)))

  {

    DBUG_PRINT("info", ("Could not open archive write file"));

    rc= HA_ERR_CRASHED_ON_USAGE;

    goto error;

  }



  my_rename(writer_filename,share->data_file_name,MYF(0));

support-files/mysql.spec.sh

+21 −3
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ then 
  cp -fp mysql-debug-%{mysql_version}/config.log "$MYSQL_DEBUGCONFLOG_DEST"

fi



(cd mysql-debug-%{mysql_version} && make test-force) || true

(cd mysql-debug-%{mysql_version} && make -i test-force) || true



# Build release binary.

(cd mysql-release-%{mysql_version} &&
@@ -328,7 +328,7 @@ then 
  cp -fp  mysql-release-%{mysql_version}/config.log "$MYSQL_CONFLOG_DEST"

fi



(cd  mysql-release-%{mysql_version} && make test-force) || true

(cd  mysql-release-%{mysql_version} && make -i test-force) || true



%install

RBR=$RPM_BUILD_ROOT
@@ -648,7 +648,25 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog 

* Fri Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>

* Mon Feb 13 2006 Joerg Bruehe <joerg@mysql.com>



- Use "-i" on "make test-force";

  this is essential for later evaluation of this log file.



* Thu Feb 09 2006 Kent Boortz <kent@mysql.com>



- Pass '-static' to libtool, link static with our own libraries, dynamic

  with system libraries.  Link with the bundled zlib.



* Wed Feb 08 2006 Kristian Nielsen <knielsen@mysql.com>



- Modified RPM spec to match new 5.1 debug+max combined community packaging.



* Sun Dec 18 2005 Kent Boortz <kent@mysql.com>



- Added "client/mysqlslap"



* Mon Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>



- Added zlib to the list of (static) libraries installed

- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)