Commit 14315122 authored by unknown's avatar unknown
Browse files

Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


mysql-test/t/query_cache_sql_prepare.test:
  Auto merged
parents a79e08a6 9bfc0677

BUILD/check-cpu

+17 −9
Original line number Diff line number Diff line
@@ -165,26 +165,34 @@ check_cpu () { 


  cc_ver=`$cc --version | sed 1q`

  cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  set -- `echo $cc_verno | tr '.' ' '`

  cc_major=$1

  cc_minor=$2

  cc_patch=$3

  cc_comp=`expr $cc_major '*' 100 '+' $cc_minor`



  case "$cc_ver--$cc_verno" in

    *GCC*)

        # different gcc backends (and versions) have different CPU flags

        case `gcc -dumpmachine` in

          i?86-*)

                case "$cc_verno" in

                      3.4*|3.5*|4.*)

                            check_cpu_args='-mtune=$cpu_arg -march=$cpu_arg'

                            ;;

                      *)

                            check_cpu_args='-mcpu=$cpu_arg -march=$cpu_arg'

                            ;;

            esac

	    if test "$cc_comp" -lt 304

            then

                            check_cpu_args='-mcpu=$cpu_arg'

            else

                            check_cpu_args='-mtune=$cpu_arg'

            fi

            ;;

          ppc-*)

                    check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg'

            ;;

          x86_64-*)

	    if test "$cc_comp" -lt 304

            then

                            check_cpu_args='-mcpu=$cpu_arg'

            else

                            check_cpu_args='-mtune=$cpu_arg'

            fi

            ;;

          *)

            check_cpu_cflags=""

Docs/.cvsignore

+1 −36
Original line number Diff line number Diff line 
COPYING

COPYING.LIB

INSTALL-SOURCE

INSTALL-BINARY

Makefile

Makefile.in

Manual-updates

before-gpl-changes-manual.texi

include.texi

manual-before-gpl.texi

manual-tmp.aux

manual-tmp.cp

manual-tmp.fn

manual-tmp.ky

manual-tmp.log

manual-tmp.pdf

manual-tmp.pg

manual-tmp.texi

manual-tmp.toc

manual-tmp.tp

manual-tmp.vr

manual.aux

manual.cp

manual.cps

manual.fn

manual.fns

manual.html

manual.ky

manual.log

manual.pdf

manual.pg

manual.toc

manual.tp

manual.txt

manual.vr

manual_a4.ps

manual_a4.ps.gz

manual_letter.ps

manual_letter.ps.gz

manual_toc.html

mysql.info

Docs/internals.texi

deleted100644 → 0
+0 −101
Original line number Diff line number Diff line 
\input texinfo  @c -*-texinfo-*-

@c

@c *********************************************************

@c

@c This is a dummy placeholder file for internals.texi in the

@c MySQL source trees.

@c

@c Note, that the internals documentation has been moved into a separate

@c BitKeeper source tree named "mysqldoc" - do not attempt to edit this

@c file! All changes to internals.texi should be done in the mysqldoc tree.

@c

@c See http://www.mysql.com/doc/en/Installing_source_tree.html

@c for information about how to work with BitKeeper source trees.

@c

@c This dummy file is being replaced with the actual file from the

@c mysqldoc tree when building the official source distribution.

@c

@c Please e-mail docs@mysql.com for more information or if

@c you are interested in doing a translation.

@c

@c *********************************************************

@c

@c %**start of header



@setfilename internals.info



@c We want the types in the same index

@syncodeindex tp fn



@ifclear tex-debug

@c This removes the black squares in the right margin

@finalout

@end ifclear



@c Set background for HTML

@set _body_tags BGCOLOR=silver TEXT=#000000 LINK=#101090 VLINK=#7030B0

@c Set some style elements for the manual in HTML form. 'suggested'

@c natural language colors: aqua, black, blue, fuchsia, gray, green,

@c lime, maroon, navy, olive, purple, red, silver, teal, white, and

@c yellow. From Steeve Buehler <ahr@YogElements.com>

@set _extra_head <style> code {color:purple} tt {color:green} samp {color:navy} pre {color:maroon} </style>



@settitle Dummy MySQL internals documentation for version @value{mysql_version}.



@c We want single-sided heading format, with chapters on new pages. To

@c get double-sided format change 'on' below to 'odd'

@setchapternewpage on



@paragraphindent 0



@c %**end of header



@ifinfo

@format

START-INFO-DIR-ENTRY

* mysql: (mysql).               MySQL documentation.

END-INFO-DIR-ENTRY

@end format

@end ifinfo



@titlepage

@sp 10

@center @titlefont{Empty placeholder for the MySQL Internals Documentation}

@sp 10

@center Copyright @copyright{} 1995-2003 MySQL AB

@c blank page after title page makes page 1 be a page front.

@c also makes the back of the title page blank.

@page

@end titlepage



@c This should be added. The HTML conversion also needs a MySQL version

@c number somewhere.



@iftex

@c change this to double if you want formatting for double-sided

@c printing

@headings single



@oddheading @thischapter @| @| @thispage

@evenheading @thispage @| @| MySQL Internal Reference for Version @value{mysql_version}



@end iftex



@node Top, (dir), (dir), (dir)



@ifinfo

This is an empty placeholder file for the MySQL internals documentation.



The real version of this file is now maintained in a separate BitKeeper

source tree!  Please see

@url{http://www.mysql.com/doc/en/Installing_source_tree.html} for more info

on how to work with BitKeeper.



Please do not attempt to edit this file directly - use the one in the

@code{mysqldoc} BK tree instead.



This file will be replaced with the current @code{internals.texi} when

building the official source distribution.

@end ifinfo



@bye

Docs/linuxthreads.txt

+2 −0
Original line number Diff line number Diff line 
[Note this information is obsolete]



Notes on compiling glibc for the standard MySQL binary:



 - make sure you have gcc 2.95 and gmake 3.79 or newer

Docs/my_sys.txt

deleted100644 → 0
+0 −140
Original line number Diff line number Diff line 
Functions i mysys: (For flags se my_sys.h)



 int my_copy _A((const char *from,const char *to,myf MyFlags));

	- Copy file



 int my_delete _A((const char *name,myf MyFlags));

	- Delete file



 int my_getwd _A((string buf,uint size,myf MyFlags));

 int my_setwd _A((const char *dir,myf MyFlags));

	- Get and set working directory



 string my_tempnam _A((const char *pfx,myf MyFlags));

	- Make a uniq temp file name by using dir and adding something after

	 pfx to make name uniq. Name is made by adding a uniq 6 length-string

	 and TMP_EXT after pfx.

	 Returns pointer to malloced area for filename. Should be freed by

	 free().



 File my_open _A((const char *FileName,int Flags,myf MyFlags));

 File my_create _A((const char *FileName,int CreateFlags,

			  int AccsesFlags, myf MyFlags));

 int my_close _A((File Filedes,myf MyFlags));

 uint my_read _A((File Filedes,byte *Buffer,uint Count,myf MyFlags));

 uint my_write _A((File Filedes,const byte *Buffer,uint Count,

			 myf MyFlags));

 ulong my_seek _A((File fd,ulong pos,int whence,myf MyFlags));

 ulong my_tell _A((File fd,myf MyFlags));

	- Use instead of open,open-with-create-flag, close read and write

	  to get automatic error-messages (flag: MYF_WME) and only have

	  to test for != 0 if error (flag: MY_NABP).



 int my_rename _A((const char *from,const char *to,myf MyFlags));

	- Rename file



 FILE *my_fopen _A((const char *FileName,int Flags,myf MyFlags));

 FILE *my_fdopen _A((File Filedes,int Flags,myf MyFlags));

 int my_fclose _A((FILE *fd,myf MyFlags));

 uint my_fread _A((FILE *stream,byte *Buffer,uint Count,myf MyFlags));

 uint my_fwrite _A((FILE *stream,const byte *Buffer,uint Count,

			  myf MyFlags));

 ulong my_fseek _A((FILE *stream,ulong pos,int whence,myf MyFlags));

 ulong my_ftell _A((FILE *stream,myf MyFlags));

	- Same read-interface for streams as for files



 gptr _mymalloc _A((uint uSize,const char *sFile,

			  uint uLine, myf MyFlag));

 gptr _myrealloc _A((string pPtr,uint uSize,const char *sFile,

			   uint uLine, myf MyFlag));

 void _myfree _A((gptr pPtr,const char *sFile,uint uLine));

 int _sanity _A((const char *sFile,unsigned int uLine));

 gptr _myget_copy_of_memory _A((const byte *from,uint length,

				      const char *sFile, uint uLine,

				      myf MyFlag));

	- malloc(size,myflag) is mapped to this functions if not compiled

	  with -DSAFEMALLOC



 void TERMINATE _A((void));

	- Writes malloc-info on stdout if compiled with -DSAFEMALLOC.



 int my_chsize _A((File fd,ulong newlength,myf MyFlags));

	- Change size of file



 void my_error _D((int nr,myf MyFlags, ...));

	- Writes message using error number (se mysys/errors.h) on

	  stdout or curses if  MYSYS_PROGRAM_USES_CURSES() is called.



 void my_message _A((const char *str,myf MyFlags));

	- Writes message-string on

	 stdout or curses if  MYSYS_PROGRAM_USES_CURSES() is called.



 void my_init _A((void ));

	- Start each program (in main) with this.

 void my_end _A((int infoflag));

	- Gives info about program.

	- If infoflag & MY_CHECK_ERROR prints if some files are left open

	- If infoflag & MY_GIVE_INFO   prints timing info and malloc info

	  about prog.



 int my_redel _A((const char *from, const char *to, int MyFlags));

	- Delete from before rename of to to from. Copyes state from old

	  file to new file. If MY_COPY_TIME is set sets old time.



 int my_copystat _A((const char *from, const char *to, int MyFlags));

	- Copye state from old file to new file.

	  If MY_COPY_TIME is set sets copy also time.



 string my_filename _A((File fd));

	- Give filename of open file.



 int dirname _A((string to,const char *name));

	- Copy name of directory from filename.



 int test_if_hard_path _A((const char *dir_name));

	- Test if dirname is a hard path (Starts from root)



 void convert_dirname _A((string name));

	- Convert dirname acording to system.

	  - In MSDOS changes all caracters to capitals and changes '/' to

	    '\'

 string fn_ext _A((const char *name));

	- Returns pointer to extension in filename

 string fn_format _A((string to,const char *name,const char *dsk,

			    const char *form,int flag));

	format a filename with replace of library and extension and

	converts between different systems.

	params to and name may be identicall

	function dosn't change name if name != to

	Flag may be:	1   force replace filnames library with 'dsk'

			2   force replace extension with 'form' */

			4   force Unpack filename (replace ~ with home)

			8   Pack filename as short as possibly for output to

			    user.

	All open requests should allways use at least:

	"open(fn_format(temp_buffe,name,"","",4),...)" to unpack home and

	convert filename to system-form.



 string fn_same _A((string toname,const char *name,int flag));

	- Copys directory and extension from name to toname if neaded.

	  copy can be forced by same flags that in fn_format.



 int wild_compare _A((const char *str,const char *wildstr));

	- Compare if str matches wildstr. Wildstr can contain "*" and "?"

	  as match-characters.

	  Returns 0 if match.



 void get_date _A((string to,int timeflag));

	- Get current date in a form ready for printing.



 void soundex _A((string out_pntr, string in_pntr))

	- Makes in_pntr to a 5 chars long string. All words that sounds

	  alike have the same string.



 int init_key_cache _A((ulong use_mem,ulong leave_this_much_mem));

	- Use cacheing of keys in MISAM, PISAM, and ISAM.

	  KEY_CACHE_SIZE is a good size.

	  - Remember to lock databases for optimal cacheing



 void end_key_cache _A((void));

	- End key-cacheing.