Attachment #114939 for bug #156681

Lines 6-12 Link Here

(-)mariadb/Makefile (-6 / +162 lines)
6	#	6	#
7		7
8	PORTNAME= mariadb	8	PORTNAME= mariadb
9	PORTVERSION= 5.2.4	9	PORTVERSION= 5.2.5
10	CATEGORIES= databases	10	CATEGORIES= databases
11	MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	11	MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
12	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	12	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
Lines 18-30 Link Here
18	http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/	18	http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/
19		19
20	MAINTAINER= dgeo@centrale-marseille.fr	20	MAINTAINER= dgeo@centrale-marseille.fr
21	COMMENT= A database server that offers drop-in replacement functionality for MySQL	21	COMMENT= A database server - drop-in replacement functionality for MySQL
22		22
23	LICENSE= GPLv2	23	LICENSE= GPLv2
		24
		25	CONFLICTS= mysql-server-[0-9]* mysql-client-[0-9]* mysql-scripts-[0-9]*
		26
		27	CONFIGURE_ARGS= --with-embedded-server
24		28
25	CONFLICTS= mysql-server-[0-9]* mysql-client-[0-9]*	29	CPPFLAGS+= -I${LOCALBASE}/include
26		30
27	CONFIGURE_ARGS= --with-embedded-server
28	DATADIR= ${PREFIX}/share/mysql	31	DATADIR= ${PREFIX}/share/mysql
29	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
30	USE_LDCONFIG= ${PREFIX}/lib/mysql	33	USE_LDCONFIG= ${PREFIX}/lib/mysql
Lines 83-90 Link Here
83	MAN8= mysqld.8 \	86	MAN8= mysqld.8 \
84	mysqlmanager.8	87	mysqlmanager.8
85		88
		89	OPTIONS= ARIADB "Aria storage engine" On \
		90	ARCHIVE "Archive storage plugin" On \
		91	BLACKHOLE "Blackhole storage engine" On \
		92	FEDERATED "Federated (old) storage engine" Off \
		93	FEDERATEDX "FederatedX storage engine (Federated replacement)" On \
		94	INNODB "InnoDB (old) engine" Off \
		95	XTRADB "XtraDB (InnoDB replacement) engine" On \
		96	OQGRAPH "Open Query Graph Computation engine" Off \
		97	PBXT "MVCC-based transactional engine" Off \
		98	PARTITION "Partitioning support" Off \
		99	SPHINX "SE client for Sphinx search daemon" On \
		100	NDB "Enable NDB support (imply PARTITION)" Off \
		101	EXAMPLES "Example engine,daemon and ftsearch plugins" Off \
		102	PORTEVENT "Use libevent from ports" Off \
		103	SSL "Activate SSL support (yassl)" Off \
		104	OPENSSL "Use OpenSSL instead of bundled yassl" Off
		105
		106	.include <bsd.port.options.mk>
		107
		108	.if ${ARCH} == "i386" \|\| ${ARCH} == "amd64"
		109	CONFIGURE_ARGS+= --enable-assembler
		110	.endif
		111	.if defined(WITH_SSL)
		112	.if defined(WITH_OPENSSL)
		113	USE_OPENSSL= yes
		114	CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
		115	.else
		116	CONFIGURE_ARGS+= --with-ssl=bundled
		117	.endif
		118	.else
		119	CONFIGURE_ARGS+= --without-ssl
		120	.endif
		121	.if defined(WITH_PORTEVENT)
		122	CONFIGURE_ARGS+= --with-libevent=${LOCALBASE}
		123	LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent
		124	.else
		125	CONFIGURE_ARGS+= --with-libevent=bundled
		126	.endif
		127	.if defined(WITH_ARIADB)
		128	PLIST_SUB+= ARIADB=""
		129	CONFIGURE_ARGS+= --with-plugin-aria --with-aria-tmp-tables
		130	.else
		131	CONFIGURE_ARGS+= --without-plugin-aria
		132	PLIST_SUB+= ARIADB="@comment "
		133	.endif
		134	.if defined(WITH_SPHINX)
		135	PLIST_SUB+= SPHINX=""
		136	.else
		137	CONFIGURE_ARGS+= --without-plugin-sphinx
		138	PLIST_SUB+= SPHINX="@comment "
		139	.endif
		140	.if defined(WITH_ARIADB)
		141	PLIST_SUB+= ARIADB=""
		142	.else
		143	CONFIGURE_ARGS+= --without-plugin-aria
		144	PLIST_SUB+= ARIADB="@comment "
		145	.endif
		146	.if defined(WITH_ARCHIVE)
		147	PLIST_SUB+= ARCHIVE=""
		148	.else
		149	CONFIGURE_ARGS+= --without-plugin-archive
		150	PLIST_SUB+= ARCHIVE="@comment "
		151	.endif
		152	.if defined(WITH_BLACKHOLE)
153	PLIST_SUB+= BLACKHOLE=""
154	.else
155	CONFIGURE_ARGS+= --without-plugin-blackhole
156	PLIST_SUB+= BLACKHOLE="@comment "
157	.endif
158	.if defined(WITH_FEDERATED)
159	PLIST_SUB+= FEDERATED=""
160	.else
161	CONFIGURE_ARGS+= --without-plugin-federated
162	PLIST_SUB+= FEDERATED="@comment "
163	.endif
164	.if defined(WITH_FEDERATEDX)
165	PLIST_SUB+= FEDERATEDX=""
166	.else
167	CONFIGURE_ARGS+= --without-plugin-federatedx
168	PLIST_SUB+= FEDERATEDX="@comment "
169	.endif
170	.if defined(WITH_INNODB)
171	PLIST_SUB+= INNODB=""
172	.else
173	CONFIGURE_ARGS+= --without-plugin-innodb_plugin
174	PLIST_SUB+= INNODB="@comment "
175	.endif
176	.if defined(WITH_XTRADB)
177	PLIST_SUB+= XTRADB=""
178	.else
179	CONFIGURE_ARGS+= --without-plugin-xtradb
180	PLIST_SUB+= XTRADB="@comment "
181	.endif
182	.if defined(WITH_OQGRAPH)
183	CONFIGURE_ARGS+= --with-plugin-oqgraph
184	PLIST_SUB+= OQGRAPH=""
185	LIB_DEPENDS+= boost_system.4:${PORTSDIR}/devel/boost-libs
186	.else
187	CONFIGURE_ARGS+= --without-plugin-oqgraph
188	PLIST_SUB+= OQGRAPH="@comment "
189	.endif
190	.if defined(WITH_PBXT)
191	CONFIGURE_ARGS+= --with-plugin-pbxt
192	PLIST_SUB+= PBXT=""
193	.else
194	CONFIGURE_ARGS+= --without-plugin-pbxt
195	PLIST_SUB+= PBXT="@comment "
196	.endif
197	.if defined(WITH_EXAMPLES)
198	PLIST_SUB+= EXAMPLES=""
199	.else
200	CONFIGURE_ARGS+= --without-plugin-example --without-plugin-daemon_example --without-plugin-ftexample
201	PLIST_SUB+= EXAMPLES="@comment "
202	.endif
203	.if defined(WITH_NDB)
204	CONFIGURE_ARGS+= --with-plugin-ndbcluster
205	WITH_PARTITION=yes
206	#MAN1+= ndb_config.1 ndb_delete_all.1 ndb_desc.1 ndb_drop_index.1 \
207	# ndb_drop_table.1 ndb_error_reporter.1 ndb_mgm.1 \
208	# ndb_print_backup_file.1 ndb_print_schema_file.1 \
209	# ndb_print_sys_file.1 ndb_restore.1 ndb_select_all.1 \
210	# ndb_select_count.1 ndb_show_tables.1 ndb_size.pl.1 ndb_waiter.1
211	PLIST_SUB+= NDB=""
212	.else
213	CONFIGURE_ARGS+= --without-plugin-ndbcluster
214	PLIST_SUB+= NDB="@comment "
215	.endif
216	.if defined(WITH_PARTITION)
217	CONFIGURE_ARGS+= --with-plugin-partition
218	.else
219	CONFIGURE_ARGS+= --without-plugin-partition
220	.endif
221
222	.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
223	CONFIGURE_ARGS+= --with-charset=${WITH_CHARSET}
224	.endif
225	.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
226	CONFIGURE_ARGS+= --with-extra-charsets=${WITH_XCHARSET}
227	.endif
228	.if defined(WITH_COLLATION) && ${WITH_COLLATION} != ""
229	CONFIGURE_ARGS+= --with-collation=${WITH_COLLATION}
230	.endif
231
232	pre-fetch:
233	@${ECHO} ""
234	@${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (def: latin1 selected: ${WITH_CHARSET})."
235	@${ECHO} " WITH_XCHARSET=list Define other built-in charsets (selected: ${WITH_XCHARSET})."
236	@${ECHO} " WITH_COLLATION=collate Define default collation (def: latin1_swedish_ci selected: ${WITH_COLLATION})."
237	@${ECHO} ""
238
86	post-patch:	239	post-patch:
87	@${REINPLACE_CMD} -e '/^install:/ s\|^$install:$.*$$\|\1\|' \	240	@${REINPLACE_CMD} -e '/^install:/ s\|^$install:$.*$$\|\1\|' \
88	${WRKSRC}/mysql-test/Makefile.in ${WRKSRC}/sql-bench/Makefile.in	241	${WRKSRC}/mysql-test/Makefile.in ${WRKSRC}/sql-bench/Makefile.in
89		242
		243	port-install:
		244	@${CAT} pkg-message
		245
90	.include <bsd.port.mk>	246	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)mariadb/distinfo (-2 / +2 lines)
1	SHA256 (mariadb-5.2.4.tar.gz) = 1aadddbe8e6d230ad16173b812d24801c493fe96c82d6bb36541e0138e5025dc	1	SHA256 (mariadb-5.2.5.tar.gz) = 1e137f23d8bf430beeed01aed8b3beecff3a7d65ec4bfd291bfcf6668f21c5a1
2	SIZE (mariadb-5.2.4.tar.gz) = 24964617	2	SIZE (mariadb-5.2.5.tar.gz) = 24925585

Added Link Here

(-)mariadb/pkg-message (+5 lines)
1	MariaDB: you may want to activate plugins
2	some plugins (those in ${LOCALBASE}/lib/mysql/plugin/*.so) must be loaded in <datadir>/my.cnf:
3
4	[mysqld]
5	plugin-load=ha_xtradb.so:ha_federatedx.so




%%ARIADB%%bin/aria_chk
%%ARIADB%%bin/aria_dump_log
%%ARIADB%%bin/aria_ftdump
%%ARIADB%%bin/aria_pack
%%ARIADB%%bin/aria_read_log
bin/innochecksum
bin/msql2mysql
bin/my_print_defaults

bin/replace
bin/resolve_stack_dump
bin/resolveip
%%PBXT%%bin/xtstat
%%NDB%%bin/ndb_config
%%NDB%%bin/ndb_delete_all
%%NDB%%bin/ndb_desc
%%NDB%%bin/ndb_drop_index
%%NDB%%bin/ndb_drop_table
%%NDB%%bin/ndb_error_reporter
%%NDB%%bin/ndb_mgm
%%NDB%%bin/ndb_print_backup_file
%%NDB%%bin/ndb_print_schema_file
%%NDB%%bin/ndb_print_sys_file
%%NDB%%bin/ndb_restore
%%NDB%%bin/ndb_select_all
%%NDB%%bin/ndb_select_count
%%NDB%%bin/ndb_show_tables
%%NDB%%bin/ndb_size.pl
%%NDB%%bin/ndb_test_platform
%%NDB%%bin/ndb_waiter
include/evutil.h
include/event.h
include/event-config.h
include/mysql/client_plugin.h
include/mysql/decimal.h
include/mysql/errmsg.h

include/mysql/sslopt-longopts.h
include/mysql/sslopt-vars.h
include/mysql/typelib.h
%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h
%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_error.h
%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_debug.h
%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
%%NDB%%include/mysql/storage/ndb/mgmapi/ndb_logevent.h
%%NDB%%include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h
%%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
%%NDB%%include/mysql/storage/ndb/ndbapi/Ndb.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbApi.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbError.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbOperation.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbBlob.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbPool.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
%%NDB%%include/mysql/storage/ndb/ndb_constants.h
%%NDB%%include/mysql/storage/ndb/ndb_init.h
%%NDB%%include/mysql/storage/ndb/ndb_types.h
%%NDB%%include/mysql/storage/ndb/ndb_version.h
%%ARIADB%%lib/mysql/libaria.a
lib/mysql/libdbug.a
lib/mysql/libheap.a
lib/mysql/libmyisam.a

lib/mysql/plugin/dialog.la
lib/mysql/plugin/dialog.so
lib/mysql/plugin/dialog.so.0
%%ARCHIVE%%lib/mysql/plugin/ha_archive.a
%%ARCHIVE%%lib/mysql/plugin/ha_archive.la
%%ARCHIVE%%lib/mysql/plugin/ha_archive.so
%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0
%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a
%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la
%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so
%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0
%%EXAMPLES%%lib/mysql/plugin/ha_example.a
%%EXAMPLES%%lib/mysql/plugin/ha_example.la
%%EXAMPLES%%lib/mysql/plugin/ha_example.so
%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0
%%FEDERATED%%lib/mysql/plugin/ha_federated.a
%%FEDERATED%%lib/mysql/plugin/ha_federated.la
%%FEDERATED%%lib/mysql/plugin/ha_federated.so
%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0
%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a
%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la
%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so
%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0
%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a
%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.la
%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so
%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0
%%SPHINX%%lib/mysql/plugin/ha_sphinx.a
%%SPHINX%%lib/mysql/plugin/ha_sphinx.la
%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0
%%XTRADB%%lib/mysql/plugin/ha_xtradb.a
%%XTRADB%%lib/mysql/plugin/ha_xtradb.la
%%XTRADB%%lib/mysql/plugin/ha_xtradb.so
%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0
%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.la
%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0
%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.a
%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.la
%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so
%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0
%%NDB%%lib/mysql/libndbclient.so.3
%%NDB%%lib/mysql/libndbclient.so
%%NDB%%lib/mysql/libndbclient.la
%%NDB%%lib/mysql/libndbclient.a
%%EXAMPLES%%lib/mysql/plugin/mypluglib.a
%%EXAMPLES%%lib/mysql/plugin/mypluglib.la
%%EXAMPLES%%lib/mysql/plugin/mypluglib.so
%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0
%%SPHINX%%lib/mysql/plugin/sphinx.a
%%SPHINX%%lib/mysql/plugin/sphinx.la
%%SPHINX%%lib/mysql/plugin/sphinx.so
%%SPHINX%%lib/mysql/plugin/sphinx.so.0
libexec/mysqld
libexec/mysqlmanager
%%NDB%%libexec/ndb_cpcd
%%NDB%%libexec/ndb_mgmd
%%NDB%%libexec/ndbd
share/aclocal/mysql.m4
%%DATADIR%%/binary-configure
%%DATADIR%%/charsets/Index.xml

@dirrm %%DATADIR%%
@dirrm lib/mysql/plugin
@dirrm lib/mysql
%%NDB%%@dirrm include/mysql/storage/ndb/mgmapi
%%NDB%%@dirrm include/mysql/storage/ndb/ndbapi
%%NDB%%@dirrm include/mysql/storage/ndb
%%NDB%%@dirrm include/mysql/storage
@dirrm include/mysql




--- extra/yassl/src/yassl_error.cpp     2010-04-28 12:52:24 +0000
+++ extra/yassl/src/yassl_error.cpp     2011-03-01 17:03:38 +0000
@@ -128,7 +128,7 @@
         break;

     case badVersion_error :
-        strncpy(buffer, "protocl version mismatch", max);
+        strncpy(buffer, "protocol version mismatch", max);
         break;

     case compress_error :






--- sql/mysqld.cc       2011-02-28 17:39:30 +0000
+++ sql/mysqld.cc       2011-03-04 10:39:27 +0000
@@ -744,9 +744,7 @@
 /* Static variables */

 static bool kill_in_progress, segfaulted;
-#ifdef HAVE_STACKTRACE
 static my_bool opt_stack_trace;
-#endif /* HAVE_STACKTRACE */
 static my_bool opt_bootstrap, opt_myisam_log;
 static int cleanup_done;
 static ulong opt_specialflag, opt_myisam_block_size;



Return to bug 156681

Lines 1-8 Link Here

(-)mariadb/pkg-plist (-50 / +116 lines)
1	bin/aria_chk	1	%%ARIADB%%bin/aria_chk
2	bin/aria_dump_log	2	%%ARIADB%%bin/aria_dump_log
3	bin/aria_ftdump	3	%%ARIADB%%bin/aria_ftdump
4	bin/aria_pack	4	%%ARIADB%%bin/aria_pack
5	bin/aria_read_log	5	%%ARIADB%%bin/aria_read_log
6	bin/innochecksum	6	bin/innochecksum
7	bin/msql2mysql	7	bin/msql2mysql
8	bin/my_print_defaults	8	bin/my_print_defaults
Lines 44-49 Link Here
44	bin/replace	44	bin/replace
45	bin/resolve_stack_dump	45	bin/resolve_stack_dump
46	bin/resolveip	46	bin/resolveip
		47	%%PBXT%%bin/xtstat
		48	%%NDB%%bin/ndb_config
		49	%%NDB%%bin/ndb_delete_all
		50	%%NDB%%bin/ndb_desc
		51	%%NDB%%bin/ndb_drop_index
		52	%%NDB%%bin/ndb_drop_table
		53	%%NDB%%bin/ndb_error_reporter
		54	%%NDB%%bin/ndb_mgm
		55	%%NDB%%bin/ndb_print_backup_file
		56	%%NDB%%bin/ndb_print_schema_file
		57	%%NDB%%bin/ndb_print_sys_file
		58	%%NDB%%bin/ndb_restore
		59	%%NDB%%bin/ndb_select_all
		60	%%NDB%%bin/ndb_select_count
		61	%%NDB%%bin/ndb_show_tables
		62	%%NDB%%bin/ndb_size.pl
		63	%%NDB%%bin/ndb_test_platform
		64	%%NDB%%bin/ndb_waiter
		65	include/evutil.h
		66	include/event.h
		67	include/event-config.h
47	include/mysql/client_plugin.h	68	include/mysql/client_plugin.h
48	include/mysql/decimal.h	69	include/mysql/decimal.h
49	include/mysql/errmsg.h	70	include/mysql/errmsg.h
Lines 85-91 Link Here
85	include/mysql/sslopt-longopts.h	106	include/mysql/sslopt-longopts.h
86	include/mysql/sslopt-vars.h	107	include/mysql/sslopt-vars.h
87	include/mysql/typelib.h	108	include/mysql/typelib.h
88	lib/mysql/libaria.a	109	%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h
		110	%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_error.h
		111	%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_debug.h
		112	%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
		113	%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
		114	%%NDB%%include/mysql/storage/ndb/mgmapi/ndb_logevent.h
		115	%%NDB%%include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h
		116	%%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
		117	%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
		118	%%NDB%%include/mysql/storage/ndb/ndbapi/Ndb.hpp
		119	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbApi.hpp
		120	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp
		121	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp
		122	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbError.hpp
		123	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp
		124	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp
		125	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbOperation.hpp
		126	%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp
		127	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbBlob.hpp
		128	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbPool.hpp
		129	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp
		130	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp
		131	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp
		132	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp
		133	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp
		134	%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp
		135	%%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
		136	%%NDB%%include/mysql/storage/ndb/ndb_constants.h
		137	%%NDB%%include/mysql/storage/ndb/ndb_init.h
		138	%%NDB%%include/mysql/storage/ndb/ndb_types.h
		139	%%NDB%%include/mysql/storage/ndb/ndb_version.h
		140	%%ARIADB%%lib/mysql/libaria.a
89	lib/mysql/libdbug.a	141	lib/mysql/libdbug.a
90	lib/mysql/libheap.a	142	lib/mysql/libheap.a
91	lib/mysql/libmyisam.a	143	lib/mysql/libmyisam.a
Lines 110-161 Link Here
110	lib/mysql/plugin/dialog.la	162	lib/mysql/plugin/dialog.la
111	lib/mysql/plugin/dialog.so	163	lib/mysql/plugin/dialog.so
112	lib/mysql/plugin/dialog.so.0	164	lib/mysql/plugin/dialog.so.0
113	lib/mysql/plugin/ha_archive.a	165	%%ARCHIVE%%lib/mysql/plugin/ha_archive.a
114	lib/mysql/plugin/ha_archive.la	166	%%ARCHIVE%%lib/mysql/plugin/ha_archive.la
115	lib/mysql/plugin/ha_archive.so	167	%%ARCHIVE%%lib/mysql/plugin/ha_archive.so
116	lib/mysql/plugin/ha_archive.so.0	168	%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0
117	lib/mysql/plugin/ha_blackhole.a	169	%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a
118	lib/mysql/plugin/ha_blackhole.la	170	%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la
119	lib/mysql/plugin/ha_blackhole.so	171	%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so
120	lib/mysql/plugin/ha_blackhole.so.0	172	%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0
121	lib/mysql/plugin/ha_example.a	173	%%EXAMPLES%%lib/mysql/plugin/ha_example.a
122	lib/mysql/plugin/ha_example.la	174	%%EXAMPLES%%lib/mysql/plugin/ha_example.la
123	lib/mysql/plugin/ha_example.so	175	%%EXAMPLES%%lib/mysql/plugin/ha_example.so
124	lib/mysql/plugin/ha_example.so.0	176	%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0
125	lib/mysql/plugin/ha_federated.a	177	%%FEDERATED%%lib/mysql/plugin/ha_federated.a
126	lib/mysql/plugin/ha_federated.la	178	%%FEDERATED%%lib/mysql/plugin/ha_federated.la
127	lib/mysql/plugin/ha_federated.so	179	%%FEDERATED%%lib/mysql/plugin/ha_federated.so
128	lib/mysql/plugin/ha_federated.so.0	180	%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0
129	lib/mysql/plugin/ha_federatedx.a	181	%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a
130	lib/mysql/plugin/ha_federatedx.la	182	%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la
131	lib/mysql/plugin/ha_federatedx.so	183	%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so
132	lib/mysql/plugin/ha_federatedx.so.0	184	%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0
133	lib/mysql/plugin/ha_innodb_plugin.a	185	%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a
134	lib/mysql/plugin/ha_innodb_plugin.la	186	%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.la
135	lib/mysql/plugin/ha_innodb_plugin.so	187	%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so
136	lib/mysql/plugin/ha_innodb_plugin.so.0	188	%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0
137	lib/mysql/plugin/ha_sphinx.a	189	%%SPHINX%%lib/mysql/plugin/ha_sphinx.a
138	lib/mysql/plugin/ha_sphinx.la	190	%%SPHINX%%lib/mysql/plugin/ha_sphinx.la
139	lib/mysql/plugin/ha_sphinx.so	191	%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
140	lib/mysql/plugin/ha_sphinx.so.0	192	%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0
141	lib/mysql/plugin/ha_xtradb.a	193	%%XTRADB%%lib/mysql/plugin/ha_xtradb.a
142	lib/mysql/plugin/ha_xtradb.la	194	%%XTRADB%%lib/mysql/plugin/ha_xtradb.la
143	lib/mysql/plugin/ha_xtradb.so	195	%%XTRADB%%lib/mysql/plugin/ha_xtradb.so
144	lib/mysql/plugin/ha_xtradb.so.0	196	%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0
145	lib/mysql/plugin/libdaemon_example.a	197	%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.la
146	lib/mysql/plugin/libdaemon_example.la	198	%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
147	lib/mysql/plugin/libdaemon_example.so	199	%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0
148	lib/mysql/plugin/libdaemon_example.so.0	200	%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.a
149	lib/mysql/plugin/mypluglib.a	201	%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.la
150	lib/mysql/plugin/mypluglib.la	202	%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so
151	lib/mysql/plugin/mypluglib.so	203	%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0
152	lib/mysql/plugin/mypluglib.so.0	204	%%NDB%%lib/mysql/libndbclient.so.3
153	lib/mysql/plugin/sphinx.a	205	%%NDB%%lib/mysql/libndbclient.so
154	lib/mysql/plugin/sphinx.la	206	%%NDB%%lib/mysql/libndbclient.la
155	lib/mysql/plugin/sphinx.so	207	%%NDB%%lib/mysql/libndbclient.a
156	lib/mysql/plugin/sphinx.so.0	208	%%EXAMPLES%%lib/mysql/plugin/mypluglib.a
		209	%%EXAMPLES%%lib/mysql/plugin/mypluglib.la
		210	%%EXAMPLES%%lib/mysql/plugin/mypluglib.so
		211	%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0
		212	%%SPHINX%%lib/mysql/plugin/sphinx.a
		213	%%SPHINX%%lib/mysql/plugin/sphinx.la
		214	%%SPHINX%%lib/mysql/plugin/sphinx.so
		215	%%SPHINX%%lib/mysql/plugin/sphinx.so.0
157	libexec/mysqld	216	libexec/mysqld
158	libexec/mysqlmanager	217	libexec/mysqlmanager
		218	%%NDB%%libexec/ndb_cpcd
		219	%%NDB%%libexec/ndb_mgmd
		220	%%NDB%%libexec/ndbd
159	share/aclocal/mysql.m4	221	share/aclocal/mysql.m4
160	%%DATADIR%%/binary-configure	222	%%DATADIR%%/binary-configure
161	%%DATADIR%%/charsets/Index.xml	223	%%DATADIR%%/charsets/Index.xml
Lines 252-255 Link Here
252	@dirrm %%DATADIR%%	314	@dirrm %%DATADIR%%
253	@dirrm lib/mysql/plugin	315	@dirrm lib/mysql/plugin
254	@dirrm lib/mysql	316	@dirrm lib/mysql
		317	%%NDB%%@dirrm include/mysql/storage/ndb/mgmapi
		318	%%NDB%%@dirrm include/mysql/storage/ndb/ndbapi
		319	%%NDB%%@dirrm include/mysql/storage/ndb
		320	%%NDB%%@dirrm include/mysql/storage
255	@dirrm include/mysql	321	@dirrm include/mysql

Added Link Here

(-)mariadb/files/patch-extra::yassl::src::yassl_error.cpp (+13 lines)
1	--- extra/yassl/src/yassl_error.cpp 2010-04-28 12:52:24 +0000
2	+++ extra/yassl/src/yassl_error.cpp 2011-03-01 17:03:38 +0000
3	@@ -128,7 +128,7 @@
4	break;
5
6	case badVersion_error :
7	- strncpy(buffer, "protocl version mismatch", max);
8	+ strncpy(buffer, "protocol version mismatch", max);
9	break;
10
11	case compress_error :
12
13

Added Link Here

(-)mariadb/files/patch-sql::mysqld.cc (+14 lines)
1	--- sql/mysqld.cc 2011-02-28 17:39:30 +0000
2	+++ sql/mysqld.cc 2011-03-04 10:39:27 +0000
3	@@ -744,9 +744,7 @@
4	/* Static variables */
5
6	static bool kill_in_progress, segfaulted;
7	-#ifdef HAVE_STACKTRACE
8	static my_bool opt_stack_trace;
9	-#endif /* HAVE_STACKTRACE */
10	static my_bool opt_bootstrap, opt_myisam_log;
11	static int cleanup_done;
12	static ulong opt_specialflag, opt_myisam_block_size;
13
14