Commit 832dd46f authored by unknown's avatar unknown
Browse files

Automerge 


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysqlslap.c:
  SCCS merged
configure.in:
  SCCS merged
libmysql/libmysql.c:
  SCCS merged
mysys/my_init.c:
  SCCS merged
parents 0ae5e4c1 d3ee9abf

client/mysqlslap.c

+2 −2
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ build_query_string(void) 
  strmov(ptr->string, query_string.str);

  DBUG_PRINT("info", ("user_supplied_query %s", ptr->string));

  dynstr_free(&query_string);

  DBUG_RETURN(0);

  DBUG_RETURN(ptr);

}



static int

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1856,7 +1856,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bsearch bzero \ 
  pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \

  realpath rename rint rwlock_init setupterm \

  shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \

  sighold sigset sigthreadmask \

  sighold sigset sigthreadmask sleep \

  snprintf socket stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr strtol \

  strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr \

  posix_fallocate)

dbug/dbug.c

+1360 −1212

File changed.

Preview size limit exceeded, changes collapsed.

dbug/monty.doc

+1 −12
Original line number Diff line number Diff line 
Some extra options to DBUG_PUSH:



O,logfile   - As in "o,logfile", but do a close and reopen each time anything

	      is written to the logfile. This is needed when one expects

	      the program to crash anywhere, in which case one doesn't

	      (at least in MSDOS) get a full log-file.



If one wants a logfile with a ':' in the filename, one can get it by

giving a double ':'.  (As in "O,c::\tmp\log")



DBUG_DUMP("keyword",memory-position,length) writes a hexdump of the

given memory-area to the outputfile.



All changes that I or other people at MySQL AB have done to all files

in the dbug library (Mainly in dbug.c, dbug_analyze.c, dbug_long.h,
@@ -18,3 +6,4 @@ dbug.h) are put in public domain, as the rest of the dbug.c library) 
To my knowledge, all code in dbug library is in public domain.



Michael Widenius

dbug/readme.prof

deleted100644 → 0
+0 −70
Original line number Diff line number Diff line 
Hi,



I'm sending you the modifications I made to your Dbug routines to

allow profiling in a (relatively) machine independent fashion.

I use your Dbug routines fairly extensively.  Unfortunately, it's

a royal pain to have to keep profiled versions of various libraries

around.  The modifications allow profiling without the need for this.



How it works.

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



Basically, I just added code in the dbug routines to write out a file

called dbugmon.out (by default).  This is an ascii file containing lines

of the form:



<function-name> E <time-entered>

<function-name> X <time-exited>



A second program (analyze) reads this file, and produces a report on

standard output.



Profiling is enabled through the `g' flag.  It can take a list of

procedure names for which profiling is enabled.  By default, it

profiles all procedures.



The code in ``dbug.c'' opens the profile file for appending.  This

is in order that one can run a program several times, and get the

sum total of all the times, etc.



The only system dependent part that I'm aware of is the routine

Clock() at the end of dbug.c.  This returns the elapsed user time

in milliseconds.  The version which I have is for 4.3 BSD.  As I

don't have access to other systems, I'm not certain how this would

change.



An example of the report generated follows:



		Profile of Execution

		Execution times are in milliseconds



		    Calls			    Time

		    -----			    ----

		Times	Percentage	Time Spent	Percentage

Function	Called	of total	in Function	of total    Importance

========	======	==========	===========	==========  ==========

factorial      	     5	     83.33	         30	    100.00        8333

main           	     1	     16.67	          0	      0.00           0

========	======	==========	===========	==========

Totals         	     6	    100.00	         30	    100.00





As you can see, it's quite self-evident.  The ``Importance'' column is a

metric obtained by multiplying the percentage of the calls and the percentage

of the time.  Functions with higher 'importance' benefit the most from

being sped up.



I'm really not certain how to add support for setjmp/longjmp, or for

child processes, so I've ignored that for the time being.  In most of

the code that I write, it isn't necessary.  If you have any good ideas,

feel free to add them.



This has been very useful to me.  If you can use it as part of your

dbug distribution, please feel free to do so.



Regards,



				Binayak Banerjee

		{allegra | astrovax | bpa | burdvax}!sjuvax!bbanerje

			bbanerje%sjuvax.sju.edu@relay.cs.net

				July 9, 1987