Commit f4da1be1 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

parents 8d75ff64 c25a9921

Build-tools/Do-linux-build

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ BUILD/compile-pentium-max $OTHER_LIBC \ 
  --prefix=/usr/local/mysql --with-extra-charset=complex \

  --enable-thread-safe-client --enable-local-infile \

  --with-server-suffix=-max

nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz

scripts/make_binary_distribution

make dist

Build-tools/Do-rpm --local
@@ -22,4 +23,5 @@ BUILD/compile-pentium --with-other-libc=$OTHER_LIBC_DIR \ 
  --with-comment="Official MySQL Binary" \

  --prefix=/usr/local/mysql --with-extra-charset=complex \

  --enable-thread-safe-client --enable-local-infile

nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz

scripts/make_binary_distribution

Build-tools/mysql-copyright-2

+7 −2
Original line number Diff line number Diff line
@@ -89,13 +89,18 @@ sub add_copyright 
  elsif ($ARGV =~ /\.c$/ ||

	 $ARGV =~ /\.cc$/ ||

	 $ARGV =~ /\.h$/ ||

	 $ARGV =~ /\.yy$/ ||

	 $ARGV =~ /-x86\.s$/)

	 $ARGV =~ /\.yy$/)

  {

    $start_copyright="/* ";

    $line_copyright= "   ";

    $end_copyright=  " */";

  }

	elsif ($ARGV =~ /-x86\.s$/)

	{

		$start_copyright="# ";

		$line_copyright= "# ";

		$end_copyright=  "";

	}

  elsif ($ARGV =~ /\.s$/)

  {

    $start_copyright="! ";