Commit 02e985a2 authored by unknown's avatar unknown
Browse files

Copyright string fixes (bug#15974), version fix for 5.0.17a "certified". 


configure.in:
  Change the version identification for the "certified" builds.
extra/comp_err.c:
  Ensure that the license spelling is as expected by the "mysql_copyright" tool.
scripts/mysqld_multi.sh:
  The "mysql_copyright" tool will not change non-C files, so do not mention the license.
parent 307c0b77

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.17)

AM_INIT_AUTOMAKE(mysql, 5.0.17a)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=17

NDB_VERSION_BUILD=17a

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

extra/comp_err.c

+4 −3
Original line number Diff line number Diff line
@@ -876,9 +876,10 @@ static void usage(void) 
{

  DBUG_ENTER("usage");

  print_version();

  printf("This software comes with ABSOLUTELY NO WARRANTY. This is free "

	 "software,\nand you are welcome to modify and redistribute it under "

	 "the GPL license\nUsage:\n");

  printf("This software comes with ABSOLUTELY NO WARRANTY. "

         "This is free software,\n"

         "and you are welcome to modify and redistribute it under the GPL license\n"

         "Usage:\n");

  my_print_help(my_long_options);

  my_print_variables(my_long_options);

  DBUG_VOID_RETURN;

scripts/mysqld_multi.sh

+0 −3
Original line number Diff line number Diff line
@@ -763,9 +763,6 @@ sub usage 
  print <<EOF;

$my_progname version $VER by Jani Tolonen



This software comes with ABSOLUTELY NO WARRANTY. This is free software,

and you are welcome to modify and redistribute it under the GPL license.



Description:

$my_progname can be used to start, or stop any number of separate

mysqld processes running in different TCP/IP ports and UNIX sockets.