Commit aedfd072 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41


sql/opt_range.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/Makefile.am:
  Manual merge.
parents 7b659332 66fc547d

mysql-test/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -101,15 +101,15 @@ uninstall-local: 
	@RM@ -f -r $(DESTDIR)$(testdir)



std_data/client-key.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/client-cert.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/cacert.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data



SUFFIXES = .sh

ndb/include/kernel/GlobalSignalNumbers.h

+1 −0
Original line number Diff line number Diff line
@@ -587,6 +587,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_BLOCK_COMMIT_ORD            485

#define GSN_UNBLOCK_COMMIT_ORD          486



#define GSN_NODE_START_REP              502

#define GSN_NODE_STATE_REP              487

#define GSN_CHANGE_NODE_STATE_REQ       488

#define GSN_CHANGE_NODE_STATE_CONF      489

ndb/src/common/debugger/signaldata/SignalNames.cpp

+2 −0
Original line number Diff line number Diff line
@@ -399,6 +399,8 @@ const GsnName SignalNames [] = { 
  ,{ GSN_TUP_COM_UNBLOCK,        "TUP_COM_UNBLOCK" }

  ,{ GSN_DUMP_STATE_ORD,         "DUMP_STATE_ORD" }



  ,{ GSN_NODE_START_REP, "NODE_START_REP" }



  ,{ GSN_START_INFOREQ,  "START_INFOREQ" }

  ,{ GSN_START_INFOREF,  "START_INFOREF" }

  ,{ GSN_START_INFOCONF, "START_INFOCONF" }

ndb/src/kernel/blocks/ERROR_codes.txt

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Next QMGR 1 
Next NDBCNTR 1000

Next NDBFS 2000

Next DBACC 3002

Next DBTUP 4013

Next DBTUP 4014

Next DBLQH 5043

Next DBDICT 6007

Next DBDIH 7177
@@ -437,6 +437,8 @@ Drop Table/Index: 
8036: Fail next index drop in TC

6006: Crash participant in create index



4013: verify TUP tab descr before and after next DROP TABLE



System Restart:

---------------

ndb/src/kernel/blocks/dbdict/DictLock.txt

+8 −4
Original line number Diff line number Diff line
@@ -85,8 +85,12 @@ DIH/s 
    START_MECONF

DIH/s



* sp7 - release DICT lock

* (copy data, omitted)



* SL_STARTED - release DICT lock



CNTR/s

    NODE_START_REP

        DIH/s

            DICT_UNLOCK_ORD

                DICT/m