Commit a93d30b3 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge mysql.sashanet.com:/home/sasha/src/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents 568d72f0 1915d11b

Docs/manual.texi

+4 −0
Original line number Diff line number Diff line
@@ -28293,6 +28293,10 @@ If you connect using TCP/IP rather than Unix sockets, the result is 7.5% 
slower on the same computer. (If you are connection to @code{localhost},

@strong{MySQL} will, by default, use sockets).













@item













If you connect using TCP/IP from another computer over a 100M Ethernet,













things will be 8-11 % slower.



























@item















If you compile with @code{--with-debug=full}, then you will loose 20 %















for most queries, but some queries may take substantially longer (The

























mysql-test/mysql-test-run.sh



+37
−0






























Original line number
Diff line number
Diff line








@@ -20,9 +20,31 @@ TZ=GMT-3; export TZ # for UNIX_TIMESTAMP tests to work





























PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin





























# Standard functions



























which ()













{













  DIRS=`echo $PATH | tr ":" " "`













  for file













  do













    for dir in $DIRS













    do













      if test -f $dir/$file













      then













        echo "$dir/$file"













        continue 2













      fi













    done













    echo "which: no $file in ($PATH)"













    exit 1













  done













}











































# No paths below as we can't be sure where the program is!































BASENAME=`which basename | head -1`













DIFF=`which diff | head -1`















CAT=cat















CUT=cut















TAIL=tail










@@ -268,6 +290,20 @@ prompt_user ()













 read unused















}





























show_failed_diff ()













{













  reject_file=r/$1.reject













  result_file=r/$1.result













  if [ -x "$DIFF" ] && [ -f $reject_file ]













  then













    echo "Below are the diffs between actual and expected results:"













    echo "-------------------------------------------------------"













    $DIFF -u $result_file $reject_file













    echo "-------------------------------------------------------"













    echo "Please e-mail the above, along with the output of mysqlbug"













    echo "and any other relevant info to bugs@lists.mysql.com"













  fi  













}































error () {















    $ECHO  "Error:  $1"










@@ -660,6 +696,7 @@ run_testcase ()













	$ECHO "$RES$RES_SPACE [ fail ]"















        $ECHO















	error_is













	show_failed_diff $tname















	$ECHO















	if [ x$FORCE != x1 ] ; then















	 $ECHO "Aborting. To continue, re-run with '--force'."

































mysql-test/r/bench_count_distinct.result



+1
−1






























Original line number
Diff line number
Diff line















count(distinct n)













10000












100
























mysql-test/r/rpl000001.result



+2
−2






























Original line number
Diff line number
Diff line








@@ -6,8 +6,8 @@ sum(length(word))













(@id := id) - id















0















Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter













127.0.0.1	root	9306	1	master-bin.001	1729137	No			1053	Slave: query ' update t1 set n = n + 1' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START;	0













127.0.0.1	root	9306	1	master-bin.001	939	No			1053	Slave: query ' update t1 set n = n + get_lock('crash_lock', 2)' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START;	0















count(*)













30000













10















n















3456
























mysql-test/t/bench_count_distinct.test



+1
−1






























Original line number
Diff line number
Diff line















drop table if exists t1;















create table t1(n int not null, key(n)) delay_key_write = 1;













let $1=10000;













let $1=100;















while ($1)















{















 eval insert into t1 values($1);