Commit 65baa839 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


extra/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents 54886b08 892e3a41

extra/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -41,9 +41,10 @@ $(top_builddir)/include/mysqld_error.h: comp_err.c \ 
$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h

$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h



bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

bin_PROGRAMS =		replace perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid innochecksum

noinst_PROGRAMS =	charset2html

EXTRA_PROGRAMS =	comp_err

EXTRA_DIST =		CMakeLists.txt



perror.o: perror.c

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ INCLUDES = @ZLIB_INCLUDES@ \ 
WRAPLIBS=		@WRAPLIBS@

SUBDIRS =		share

libexec_PROGRAMS =	mysqld

noinst_PROGRAMS =	gen_lex_hash

EXTRA_PROGRAMS =	gen_lex_hash

bin_PROGRAMS =		mysql_tzinfo_to_sql

gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@

LDADD =			$(top_builddir)/vio/libvio.a \

support-files/mysql.spec.sh

+0 −1
Original line number Diff line number Diff line
@@ -640,7 +640,6 @@ fi 
%defattr(-, root, root, 0755)

%doc mysql-release-%{mysql_version}/EXCEPTIONS-CLIENT

%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*

%attr(755, root, root) %{_bindir}/comp_err

%attr(755, root, root) %{_bindir}/mysql_config

%dir %attr(755, root, root) %{_includedir}/mysql

%dir %attr(755, root, root) %{_libdir}/mysql