← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to sql/Makefile.am

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/Makefile.am
64
64
                        procedure.h sql_class.h sql_lex.h sql_list.h \
65
65
                        sql_map.h sql_string.h unireg.h \
66
66
                        sql_error.h field.h handler.h mysqld_suffix.h \
67
 
                        sql_profile.h \
 
67
                        sql_profile.h \
68
68
                        ha_ndbcluster.h ha_ndbcluster_cond.h \
69
69
                        ha_ndbcluster_binlog.h ha_ndbcluster_tables.h \
70
70
                        ha_ndbcluster_connection.h ha_ndbcluster_connection.h \
77
77
                        sql_repl.h slave.h rpl_filter.h rpl_injector.h \
78
78
                        log_event.h rpl_record.h \
79
79
                        log_event_old.h rpl_record_old.h \
80
 
                        stacktrace.h sql_sort.h sql_cache.h set_var.h \
 
80
                        sql_sort.h sql_cache.h set_var.h \
81
81
                        spatial.h gstream.h client_settings.h tzfile.h \
82
82
                        tztime.h my_decimal.h\
83
83
                        sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
84
84
                        parse_file.h sql_view.h sql_trigger.h \
85
85
                        sql_array.h sql_cursor.h events.h scheduler.h \
86
86
                        event_db_repository.h event_queue.h \
87
 
                        sql_plugin.h authors.h \
 
87
                        sql_plugin.h authors.h event_parse_data.h \
88
88
                        event_data_objects.h event_scheduler.h \
89
89
                        sql_partition.h partition_info.h partition_element.h \
90
90
                        probes.h sql_audit.h \
91
 
                        contributors.h sql_servers.h ddl_blocker.h si_objects.h
 
91
                        contributors.h sql_servers.h ddl_blocker.h \
 
92
                        si_objects.h sql_plist.h mdl.h
92
93
 
93
94
mysqld_SOURCES =        sql_lex.cc sql_handler.cc sql_partition.cc \
94
95
                        item.cc item_sum.cc item_buff.cc item_func.cc \
114
115
                        discover.cc time.cc opt_range.cc opt_sum.cc \
115
116
                        records.cc filesort.cc handler.cc \
116
117
                        ha_partition.cc \
 
118
                        debug_sync.cc \
117
119
                        sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
118
120
                        sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
119
121
                        sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
122
124
                        rpl_reporting.cc \
123
125
                        sql_union.cc sql_derived.cc \
124
126
                        sql_client.cc \
125
 
                        stacktrace.c repl_failsafe.h repl_failsafe.cc \
 
127
                        repl_failsafe.h repl_failsafe.cc \
126
128
                        sql_olap.cc sql_view.cc \
127
129
                        gstream.cc spatial.cc sql_help.cc sql_cursor.cc \
128
130
                        tztime.cc my_decimal.cc\
133
135
                        sql_plugin.cc sql_binlog.cc \
134
136
                        sql_builtin.cc sql_tablespace.cc partition_info.cc \
135
137
                        sql_servers.cc sql_audit.cc sha2.cc \
136
 
                        ddl_blocker.cc si_objects.cc
 
138
                        ddl_blocker.cc si_objects.cc event_parse_data.cc \
 
139
                        mdl.cc
137
140
 
138
141
if HAVE_DTRACE
139
142
  mysqld_SOURCES += probes.d
158
161
                        -DDATADIR="\"$(MYSQLDATAdir)\"" \
159
162
                        -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
160
163
                        -DPLUGINDIR="\"$(pkgplugindir)\"" \
 
164
                        -DHAVE_EVENT_SCHEDULER \
161
165
                        @DEFS@
162
166
 
163
167
BUILT_MAINT_SRC =       sql_yacc.cc sql_yacc.h
203
207
        sed "s/#include <unistd.h>//g" probes.h.bak > probes.h
204
208
        rm probes.h.bak
205
209
 
 
210
# We might have some stuff not built in this build, but that we want to install
 
211
install-exec-hook:
 
212
        $(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(pkglibdir)
 
213
        test ! -x mysqld-debug$(EXEEXT) || $(INSTALL_PROGRAM) mysqld-debug$(EXEEXT) $(DESTDIR)$(libexecdir)
 
214
        test ! -f mysqld-debug.sym.gz   || $(INSTALL_DATA)    mysqld-debug.sym.gz   $(DESTDIR)$(pkglibdir)
 
215
        test ! -f mysqld.sym.gz         || $(INSTALL_DATA)    mysqld.sym.gz         $(DESTDIR)$(pkglibdir)
 
216
 
206
217
SUFFIXES : .d
207
218
 
208
219
.d.o : $(DTRACEFILES)