Commit 7b30dc9e authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/client_priv.h:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql-common/client.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/Makefile.am:
  Manual merge.
parents f3d2b307 a8c13c34

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign 


# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \

			README COPYING EXCEPTIONS-CLIENT cmakelists.txt

			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt

SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

client/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ strings_src=decimal.c 
DEFS =			-DUNDEF_THREADS_HACK \

			-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \

			-DDATADIR="\"$(localstatedir)\"" 

EXTRA_DIST =		get_password.c cmakelists.txt

EXTRA_DIST =		get_password.c CMakeLists.txt



link_sources:

	for f in $(sql_src) ; do \

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -59,5 +59,5 @@ enum options_client 
  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_SSL_VERIFY_SERVER_CERT,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT

};

dbug/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a 
pkglib_LIBRARIES =      libdbug.a

noinst_HEADERS =        dbug_long.h

libdbug_a_SOURCES =     dbug.c sanity.c

EXTRA_DIST =            cmakelists.txt example1.c example2.c example3.c \

EXTRA_DIST =            CMakeLists.txt example1.c example2.c example3.c \

                        user.r monty.doc dbug_add_tags.pl \

                        my_main.c main.c factorial.c dbug_analyze.c

NROFF_INC =             example1.r example2.r example3.r main.r \

extra/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h 
bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid innochecksum

noinst_PROGRAMS =	charset2html

EXTRA_DIST =		cmakelists.txt

EXTRA_DIST =		CMakeLists.txt



perror.o: perror.c 

	$(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<