Commit b948d085 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

merged

parents 3f51fcf1 1bf47bba

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -46,3 +46,4 @@ tonu@x153.internalnet 
tonu@x3.internalnet

venu@work.mysql.com

zak@linux.local

jcole@mugatu.spaceapes.com

Docs/Support/test-make-manual-de

0 → 100755
+137 −0
Original line number Diff line number Diff line 
#!/bin/sh



needed_flags=0

needed_texi2html=0

needed_texinfo_tex=0

needed_include_texi=0



if [ -z $BROWSER ]; then

    BROWSER=netscape 

    echo "BROWSER not set, using $BROWSER"

fi



die ()

{

    echo

    echo $1

    cleanup

    exit 1

}



cleanup ()

{

    echo "Cleaning up..."

    if [ $needed_flags ]; then

        bk clean Flags

    fi



    if [ $needed_texi2html ]; then

        bk clean Support/texi2html

    fi



    if [ $needed_texinfo_tex ]; then

        bk clean Support/texinfo.tex

    fi



    if [ $needed_include_texi ]; then

        rm -f include.texi

    fi



    for file in \

        manual.de.aux manual.de.cp  manual.de.cps manual.de.dvi  \

        manual.de.fn  manual.de.fns manual.de.ky  manual.de.html \

        manual.de.pg  manual.de.toc manual.de.tp  manual.de.vr   \

        mysql.de.info manual.de_toc.html                   ;

    do

        rm -f $file

    done

        

}





if [ -e Flags/usa.txt ]; then

    echo "Good, Flags are there."

else

    echo -n "Checking out Flags..."

    bk edit Flags >/dev/null 2>&1

    echo " Done."

    needed_flags=1

fi



if [ -e Support/texi2html ]; then

    echo "Good, texi2html is there."

else

    echo -n "Checking out texi2html..."

    bk edit Support/texi2html >/dev/null 2>&1

    echo " Done."

    needed_texi2html=1

fi



if [ -e Support/texinfo.tex ]; then

    echo "Good, texinfo.tex is there."

else

    echo -n "Checking out texinfo.tex..."

    bk edit Support/texinfo.tex >/dev/null 2>&1

    echo " Done."

    needed_texinfo_tex=1

fi



if [ -e include.texi ]; then

    echo "Good, include.texi is there."

else

    echo -n "Creating include.texi..."

    bk edit ../configure.in >/dev/null 2>&1

    echo "@c This file was generated by test-make-manual" > include.texi

    echo -n "@set mysql_version " >> include.texi

    grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \

    sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> include.texi

    echo -n "@set default_port " >> include.texi

    grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \

    sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> include.texi

    echo " Done."

    needed_include_texi=1

fi



echo -n "Running makeinfo..."

makeinfo --no-split -I . manual.de.texi



if [ $? != 0 ]; then

    die "Manual has errors - fix before you commit"

else

    echo " Looks good."

fi





echo -n "Running texi2html..."

/usr/bin/perl ./Support/texi2html -iso -number manual.de.texi



if [ $? != 0 ]; then

    die "Manual has errors - fix before you commit"

else

    echo " Looks good."

fi





echo -n "Running texi2dvi..."

texi2dvi --batch manual.de.texi > texi2dvi.out



if [ $? != 0 ]; then

    die "Manual has errors - fix before you commit (saved in texi2dvi.out)"

else

    rm texi2dvi.out

    echo " Looks good."

fi



echo

echo

echo "Please examine your modifications in \`manual.de.html'."

echo

echo "If you would like to use a different browser, set the 'BROWSER' environment"

echo "variable." 

echo



$BROWSER file:`pwd`/manual.de_toc.html



echo "-- Press Enter to Continue --"

read junk

cleanup

Docs/manual.de.texi

+7227 −7696

File changed.

Preview size limit exceeded, changes collapsed.

Docs/manual.texi

+32 −15
Original line number Diff line number Diff line
@@ -6252,7 +6252,7 @@ shell> groupadd mysql 
shell> useradd -g mysql mysql

shell> cd /usr/local

shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -

shell> ln -s mysql-VERSION-OS mysql

shell> ln -s full-path-to-mysql-VERSION-OS mysql

shell> cd mysql

shell> scripts/mysql_install_db

shell> chown -R root  .
@@ -6327,7 +6327,7 @@ Unpack the distribution and create the installation directory: 














@example















shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -













shell> ln -s mysql-VERSION-OS mysql













shell> ln -s full-path-to-mysql-VERSION-OS mysql















@end example





























The first command creates a directory named @file{mysql-VERSION-OS}.  The










@@ -9637,13 +9637,6 @@ client/server and don't need to access the server from other hosts.













@item















Add some nice start and shutdown icons to the MySQL installation.



























@item













Create a tool to manage registry entries for the MySQL startup













options.  The registry entry reading is already coded into @file{mysqld.cc},













but it should be recoded to be more parameter oriented.  The tool should













also be able to update the @file{C:\my.cnf} option file if the user prefers













to use that instead of the registry.



























@item















When registering @code{mysqld} as a service with @code{--install} (on NT)















it would be nice if you could also add default options on the command line.









@@ -9670,13 +9663,9 @@ interruptible. This would make it possible to kill open threads with













@code{mysqld} always starts in the "C" locale and not in the default locale.















We would like to have @code{mysqld} use the current locale for the sort order.



























@item













Implement UDF functions with @code{.DLL}s.



























@item















Add macros to use the faster thread-safe increment/decrement methods















provided by Windows.



























@end itemize





























Other Windows-specific issues are described in the @file{README} file that










@@ -11025,6 +11014,12 @@ make sure that @file{gmalloc.o} is included in @file{libgthreads.a} and













In FSU Pthreads, the following system calls are pthreads-aware: @code{read()},















@code{write()}, @code{getmsg()}, @code{connect()}, @code{accept()},















@code{select()}, and @code{wait()}.

























@item













The CSSA-2001-SCO.35.2 (the patch is listed in custom as













erg711905-dscr_remap security patch (ver 2.0.0) breaks FSU threads and













makes mysqld instable.  You have to remove this one if you want to run













mysqld on an OpenServer 5.0.6 machine.















@end itemize





























If you want to install DBI on SCO, you have to edit the @file{Makefile} in










@@ -37994,7 +37989,19 @@ you at the startup that it is creating new log files.













@subsection Backing up and Recovering an InnoDB Database





























The key to safe database management is taking regular backups.













To take a 'binary' backup of your database you have to do the following:

























InnoDB Hot Backup is an online backup tool you can use to













backup your InnoDB database while it is running. InnoDB













Hot Backup does not require you to shut down your database













and it does not set any locks or disturb your normal













database processing. InnoDB Hot Backup is a non-free













additional tool which is not included in the standard













MySQL distribution. See the InnoDB Hot Backup homepage













@uref{http://www.innodb.com/hotbackup.html}













for detailed information and screenshots. 

























If you are able to shut down your MySQL server, then to take













a 'binary' backup of your database you have to do the following: 





























@itemize @bullet















@item










@@ -41037,7 +41044,7 @@ Returns the error number for the most recently invoked MySQL function.













Returns the error message for the most recently invoked MySQL function.





























@item @strong{mysql_real_escape_string()} @tab













Escapes special characters in a string for use in a SQL statement taking













Escapes special characters in a string for use in a SQL statement, taking















into account the current charset of the connection.





























@item @strong{mysql_escape_string()} @tab










@@ -48708,6 +48715,8 @@ Fixed bug with indexless boolean fulltext search.













Fixed bug that sometimes appeared when fulltext search was used















with ``const'' tables.















@item













Fixed wrong error value when doing a @code{SELECT} with an empty HEAP table.













@item















Use @code{ORDER BY column DESC} now sorts @code{NULL} values first.















@item















Fixed bug in @code{SELECT DISTINCT ... ORDER BY DESC} optimization.










@@ -49086,6 +49095,12 @@ not yet 100% confident in this code.













@node News-3.23.50, News-3.23.49, News-3.23.x, News-3.23.x















@appendixsubsec Changes in release 3.23.50















@itemize @bullet













@item













Fixed problem with @code{SHOW CREATE TABLE} and @code{PRIMARY KEY} when using













32 indexes.













@item













Fixed that one can use @code{SET PASSWORD} for the anonymous user.













@item















Fixed core-dump bug when reading client groups from option files using















@code{mysql_options()}.















@item










@@ -51003,6 +51018,8 @@ Fixed coredump in LOAD_FILE(NULL).



























@itemize @bullet















@item













Added @code{mysql_real_escape_string()} function to the MySQL C API.













@item















Fixed a bug in @code{CONCAT()} where one of the arguments was a function















that returned a modified argument.















@item

























client/mysql.cc



+11
−3






























Original line number
Diff line number
Diff line








@@ -118,7 +118,8 @@ static bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0,













	    no_rehash=0,skip_updates=0,safe_updates=0,one_database=0,















	    opt_compress=0, using_opt_local_infile=0,















	    vertical=0,skip_line_numbers=0,skip_column_names=0,opt_html=0,













            opt_xml=0,opt_nopager=1, opt_outfile=0, no_named_cmds=1;













            opt_xml=0,opt_nopager=1, opt_outfile=0, no_named_cmds=1,













            opt_nobeep=0;















static uint verbose=0,opt_silent=0,opt_mysql_port=0, opt_local_infile=0;















static my_string opt_mysql_unix_port=0;















static int connect_flag=CLIENT_INTERACTIVE;










@@ -438,6 +439,7 @@ static struct option long_options[] =













  {"ignore-spaces", no_argument,	   0, 'i'},















  {"local-infile",  optional_argument,	   0, OPT_LOCAL_INFILE},















  {"no-auto-rehash",no_argument,	   0, 'A'},













  {"no-beep",       no_argument,           0, 'b'},















  {"no-named-commands", no_argument,       0, 'g'},















  {"no-tee",        no_argument,           0, OPT_NOTEE},















#ifndef __WIN__










@@ -501,6 +503,7 @@ static void usage(int version)













  -A, --no-auto-rehash  No automatic rehashing. One has to use 'rehash' to\n\















			get table and field completion. This gives a quicker\n\















			start of mysql and disables rehashing on reconnect.\n\













  -b, --no-beep         Turn off beep on error.\n\















  -B, --batch		Print results with a tab as separator, each row on\n\















			a new line. Doesn't use history file.\n\















  --character-sets-dir=...\n\










@@ -530,6 +533,7 @@ static void usage(int version)













  -h, --host=...	Connect to host.\n\















  -H, --html		Produce HTML output.\n\















  -X, --xml		Produce XML output.\n\













  --local-infile=[1|0]  Enable/disable LOAD DATA LOCAL INFILE\n\















  -L, --skip-line-numbers\n\















                        Don't write line number for errors.\n");















#ifndef __WIN__










@@ -604,7 +608,7 @@ static int get_options(int argc, char **argv)





























  set_all_changeable_vars(changeable_vars);















  while ((c=getopt_long(argc,argv,













			(char*) "?ABCD:LfgGHXinNoqrstTU::vVw::WEe:h:O:P:S:u:#::p::",













			(char*) "?AbBCD:LfgGHXinNoqrstTU::vVw::WEe:h:O:P:S:u:#::p::",















			long_options, &option_index)) != EOF)















  {















    switch(c) {









@@ -615,6 +619,9 @@ static int get_options(int argc, char **argv)













      strmov(mysql_charsets_dir, optarg);















      charsets_dir = mysql_charsets_dir;















      break;













    case 'b':













      opt_nobeep = 1;













      break;















    case OPT_TEE:















      if (!opt_outfile && strlen(optarg))















      {










@@ -2441,6 +2448,7 @@ put_info(const char *str,INFO_TYPE info_type,uint error)













    }















    if (info_type == INFO_ERROR)















    {













      if(!opt_nobeep)















	putchar('\007');		      	/* This should make a bell */















      vidattr(A_STANDOUT);















      if (error)