Commit d3ecf748 authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-opt 

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge


libmysqld/lib_sql.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
parents de63c6d4 53e526fd

dbug/dbug.c

+14 −0
Original line number Diff line number Diff line
@@ -2375,4 +2375,18 @@ va_list ap; 


#endif  /* NO_VARARGS */



#else



/*

 * Dummy function, workaround for MySQL bug#14420 related

 * build failure on a platform where linking with an empty

 * archive fails.

 *

 * This block can be removed as soon as a fix for bug#14420

 * is implemented.

 */

int i_am_a_dummy_function() {

       return 0;

}



#endif

dbug/factorial.c

+12 −2
Original line number Diff line number Diff line 
#ifdef DBUG_OFF				/* We are testing dbug */

#undef DBUG_OFF

#endif



int factorial(register int value) {

	if(value > 1) {

		value *= factorial(value-1);

	}

	return value;

}



#else



#include <my_global.h>
@@ -15,3 +22,6 @@ register int value) 
    DBUG_PRINT ("result", ("result is %d", value));

    DBUG_RETURN (value);

}



#endif

libmysqld/lib_sql.cc

+5 −0
Original line number Diff line number Diff line
@@ -538,6 +538,11 @@ int init_embedded_server(int argc, char **argv, char **groups) 
      sql_print_error("Warning: Can't create thread to manage maintenance");

  }



  // FIXME initialize binlog_filter and rpl_filter if not already done

  //       corresponding delete is in clean_up()

  if(!binlog_filter) binlog_filter = new Rpl_filter;

  if(!rpl_filter) rpl_filter = new Rpl_filter;



  if (opt_init_file)

  {

    if (read_init_file(opt_init_file))

support-files/mysql.spec.sh

+5 −5
Original line number Diff line number Diff line
@@ -722,17 +722,17 @@ fi 
  in the server RPM.

- The "mysqlmanager" man page got moved from section 1 to 8.



* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>



- Call "make install" using "benchdir_root=%{_datadir}", 

  because that is affecting the regression test suite as well.



* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>



- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) 

  replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading

  (bug#22081).



* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>



- Call "make install" using "benchdir_root=%{_datadir}", 

  because that is affecting the regression test suite as well.



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



- Add "--with-partition" to all server builds.