Commit 3e68a46a authored by unknown's avatar unknown
Browse files

thread_registry.h, thread_registry.cc: 

  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files


scripts/make_binary_distribution.sh:
  Copy *.imtest files
mysql-test/Makefile.am:
  Preserve executable mode on scripts
server-tools/instance-manager/thread_registry.cc:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
server-tools/instance-manager/thread_registry.h:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
parent 682e1af4

mysql-test/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ dist-hook: 
	-$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t

	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data
@@ -79,7 +80,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t

	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t

	$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r

scripts/make_binary_distribution.sh

+2 −1
Original line number Diff line number Diff line
@@ -234,7 +234,8 @@ $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \ 
    mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \

    mysql-test/std_data/*.cnf \

    $BASE/mysql-test/std_data

$CP mysql-test/t/*.test mysql-test/t/*.disabled mysql-test/t/*.opt \

$CP mysql-test/t/*.test mysql-test/t/*.imtest \

    mysql-test/t/*.disabled mysql-test/t/*.opt \

    mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t

$CP mysql-test/r/*.result mysql-test/r/*.require \

    $BASE/mysql-test/r

server-tools/instance-manager/thread_registry.cc

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ static void handle_signal(int __attribute__((unused)) sig_no) 
}

#endif



/*

  Thread_info initializer methods

*/



Thread_info::Thread_info() {}

Thread_info::Thread_info(pthread_t thread_id_arg) :

  thread_id(thread_id_arg) {}



/*

  TODO: think about moving signal information (now it's shutdown_in_progress)

  to Thread_info. It will reduce contention and allow signal deliverence to

server-tools/instance-manager/thread_registry.h

+5 −4
Original line number Diff line number Diff line
@@ -67,13 +67,14 @@ 


class Thread_info

{

public:

  Thread_info();

  Thread_info(pthread_t thread_id_arg);

  friend class Thread_registry;

private:

  pthread_cond_t *current_cond;

  Thread_info *prev, *next;

  pthread_t thread_id;

  Thread_info() {}

  friend class Thread_registry;

public:

  Thread_info(pthread_t thread_id_arg) : thread_id(thread_id_arg) {}

};