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

Merge mysql.com:/home/timka/mysql/src/5.0-virgin 

into mysql.com:/home/timka/mysql/src/5.0-dbg


sql/opt_range.cc:
  Auto merged
parents 1a8c334b 5ae3967c

Docs/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -36,22 +36,22 @@ CLEAN_FILES: $(txt_files) 
GT = $(srcdir)/Support/generate-text-files.pl



../INSTALL-SOURCE:	mysql.info $(GT)

	perl -w $(GT) mysql.info "Installing" "Tutorial" > $@

	perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@



../INSTALL-WIN-SOURCE:	mysql.info $(GT)

	perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@

	perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@



# We put the description for the binary installation here so that

# people who download source wont have to see it. It is moved up to

# the toplevel by the script that makes the binary tar files.

INSTALL-BINARY:	mysql.info $(GT)

	perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@

	perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@



../EXCEPTIONS-CLIENT: mysql.info $(GT)

	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@

	perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@



../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)

	perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@

	perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@



# Don't update the files from bitkeeper

%::SCCS/s.%

Docs/Support/generate-flag-images

deleted100755 → 0
+0 −31
Original line number Diff line number Diff line 
#!/bin/sh



flags=`grep @image mirrors.texi | cut -d" " -f1 | cut -d/ -f2 | tr -d "}" | sort | uniq`



set -x

cd Flags



for c in $flags

do

  # For PNM, to be used later

  giftopnm ../Raw-Flags/$c.gif | pnmscale -xsize 30 > $c-tmp.pnm

  pnmpaste $c-tmp.pnm 1 1 ../Images/flag-background.pnm > $c.pnm

  rm -f $c-tmp.pnm



  # For GIF version

  ppmtogif $c.pnm > $c.gif

  # or cjpeg -optimize -quality 70 -outfile $c.jpg



  # For EPS version

  pnmtops -noturn $c.pnm > $c.eps



  # For PDF version

  ps2pdf $c.eps $c.pdf



  # For text version

  echo -n "" > $c.txt



  # PNM isn't really needed

  rm -f $c.pnm



done

Docs/Support/generate-text-files.pl

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ while (<IN>) 
{

  if ($in)

  {

    if (/Node: $tnode,/)

    if (/Node: $tnode,/ || /\[index/)

    {

      $in = 0;

    }

extra/yassl/taocrypt/include/runtime.hpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 






#if !defined(yaSSL_NEW_HPP) && defined(__GNUC__)

#if !defined(yaSSL_NEW_HPP) && defined(__GNUC__) && !defined(__ICC)



#define yaSSL_NEW_HPP

mysql-test/r/index_merge_innodb.result

+11 −0
Original line number Diff line number Diff line
@@ -123,3 +123,14 @@ key1a = 2 and key1b is null and key3a = 2 and key3b is null; 
count(*)

4

drop table t1,t2;

create table t1 (

id1 int,

id2 date ,

index idx2 (id1,id2),

index idx1 (id2)  

) engine = innodb;

insert into t1 values(1,'20040101'), (2,'20040102');

select * from t1  where id1 = 1  and id2= '20040101';

id1	id2

1	2004-01-01

drop table t1;