Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/users/pchardin/mysql-5.0

man/Makefile.am

@@ -17,11 +17,11 @@
 
 ## Process this file with automake to create Makefile.in
 
-man_MANS =	mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
+man_MANS =	mysql.1 mysql_zap.1 mysqlaccess.1 \
 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
 		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
 
-EXTRA_DIST =	mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
+EXTRA_DIST =	mysql.1.in mysql_zap.1.in \
 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
 		mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \
 		mysqld_safe.1.in mysql_fix_privilege_tables.1.in

man/isamchk.1.in

-.TH isamchk 1 "19 December 2000" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"
-.SH NAME
-.BR isamchk
- \- Description, check and repair of ISAM tables.
-Used without options all tables on the command will be checked for errors
-.SH USAGE
-isamchk [OPTIONS] tables[.ISM]
-.SH SYNOPSIS
-.B isamchk
-.RB [  \-a | \-\-analyze ]
-.RB [  \-# | \-\-debug=...  ]
-.RB [  \-\-character\-sets\-dir=...]
-.RB [  \-C | \-\-default\-character\-set=...]
-.RB [  \-d | \-\-description  ]
-.RB [  \-e | \-\-extend\-check  ]
-.RB [  \-f | \-\-force  ]      
-.RB [  \-? | \-\-help       ]   
-.RB [  \-i | \-\-information  ]
-.RB [  \-k | \-\-keys\-used=#   ]
-.RB [  \-l | \-\-no\-symlinks]   
-.RB [  \-q | \-\-quick      ]  
-.RB [  \-r | \-\-recover       ]
-.RB [  \-o | \-\-safe\-recover  ]
-.RB [  \-O | "\-\-set\-variable var=option"]
-.RB [  \-s | \-\-silent ]      
-.RB [  \-S | \-\-sort\-index    ]
-.RB [  \-R | \-\-sort\-records=#]
-.RB [  \-u | \-\-unpack       ]
-.RB [  \-v | \-\-verbose  ]    
-.RB [  \-V | \-\-version ]    
-.RB [  \-w | \-\-wait ]         
-.SH DESCRIPTION
-.TP
-.BR  \-a | \-\-analyze
-Analyze distribution of keys. Will make some joins in
-MySQL faster.
-.TP 
-.BR  \-# | \-\-debug=...
-Output debug log. Often this is 'd:t:o ,filename`
-.TP 
-.BR \-\-character\-sets\-dir=...
-Directory where character sets are
-.TP 
-.BR  \-C | \-\-default\-character\-set=...
-Set the default character set
-.TP 
-.BR    \-d | \-\-description
-Prints some information about table.
-.TP 
-.BR    \-e | \-\-extend\-check
-Check the table VERY thoroughly.  One need use this
-only in extreme cases as isamchk should normally find
-all errors even without this switch
-.TP 
-.BR    \-f | \-\-force
-Overwrite old temporary files.
-If one uses \-f when checking tables (running isamchk
-without \-r), isamchk will automatically restart with
-\-r on any wrong table.
-.TP 
-.BR    \-? | \-\-help
-Display help and exit.
-.TP 
-.BR    \-i | \-\-information
-Print statistics information about the table
-.TP 
-.BR    \-k | \-\-keys\-used=#   
-Used with '\-r'. Tell ISAM to update only the first
-# keys.  This can be used to get faster inserts!
-.TP 
-.BR    \-l | \-\-no\-symlinks   
-Do not follow symbolic links when repairing. Normally
-isamchk repairs the table a symlink points at.
-.TP 
-.BR    \-q | \-\-quick
-Used with \-r to get a faster repair. (The data file
-isn't touched.) One can give a second '\-q' to force
-isamchk to modify the original datafile.
-.TP 
-.BR    \-r | \-\-recover
-Can fix almost anything except unique keys that aren't
-unique.
-.TP 
-.BR    \-o | \-\-safe\-recover  
-Uses old recovery method; slower than '\-r' but can
-handle a couple of cases that '\-r' cannot handle.
-.TP 
-.BR    \-O | " \-\-set\-variable var=option "
-Change the value of a variable.
-.TP 
-.BR    \-s | \-\-silent
-Only print errors.  One can use two \-s to make isamchk
-very silent
-.TP 
-.BR    \-S | \-\-sort\-index
-Sort index blocks.  This speeds up 'read\-next' in
-applications
-.TP 
-.BR    \-R | \-\-sort\-records=#
-Sort records according to an index.  This makes your
-data much more localized and may speed up things
-(It may be VERY slow to do a sort the first time!)
-.TP 
-.BR    \-u | \-\-unpack
-Unpack file packed with pack_isam.
-.TP 
-.BR    \-v | \-\-verbose
-Print more information. This can be used with
-\-d and \-e. Use many \-v for more verbosity!
-.TP 
-.BR    \-V | \-\-version
-Print version and exit.
-.TP 
-.BR    \-w | \-\-wait
-Wait if table is locked.
-.SH "SEE ALSO"
-isamlog(1),
-mysql(1),
-mysqlaccess(1),
-mysqladmin(1),
-mysqld(1),
-mysqld_multi(1),
-mysqld_safe(1),
-mysqldump(1),
-mysql_fix_privilege_tables(1),
-mysqlshow(1),
-mysql_zap(1),
-perror(1),
-replace(1)
-.P
-For more information please refer to the MySQL reference
-manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
-.SH BUGS
-Please refer to http://bugs.mysql.com/ to report bugs.
-.SH AUTHOR
-Ver 1.0, distribution @MYSQL_NO_DASH_VERSION@
-Michael (Monty) Widenius (monty@mysql.com),
-MySQL AB (http://www.mysql.com/).
-This software comes with no warranty.
-Manual page by L. (Kill-9) Pedersen 
-(kill-9@kill\-9.dk), Mercurmedia Data Model Architect /
-system developer (http://www.mercurmedia.com)
-
-.\" end of man page

man/isamlog.1.in

-.TH isamlog 1 "19 December 2000" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"
-.SH NAME 
-isamlog - Write info about whats in a nisam log file. 
-.SH USAGE 
-isamlog [-?iruvIV] [-c #] [-f #] [-F filepath/] [-o #] [-R file recordpos] [-w write_file] [log-filename [table ...]] 
-.SH SYNOPSIS 
-.B isamlog 
-.RB [ -?  |  -I ] 
-.RB [ -V ] 
-.RB [ -c ] 
-.RB [ -f ] 
-.RB [ -F ] 
-.RB [ -i ] 
-.RB [ -o ] 
-.RB [ "-p #" ] 
-.RB [ -r ] 
-.RB [ -R ] 
-.RB [ -u ] 
-.RB [ -v ] 
-.RB [ -w ] 
-.SH DESCRIPTION 
-.TP
-.BR isamlog
-.TP
-.BR -?  |  -I
-info
-.TP
-.BR -V
-version
-.TP
-.BR -c
-do only # commands
-.TP
-.BR -f
-max open files
-.TP
-.BR -F
-file path
-.TP
-.BR -i
-extra info
-.TP
-.BR -o
-offset
-.TP
-.BR "-p #"
-remove # components from path
-.TP
-.BR -r
-recover
-.TP
-.BR -R
-file recordposition
-.TP
-.BR -u
-update
-.TP
-.BR -v
-verbose
-.TP
-.BR -w
-write file
-.SH NOTE 
-If no file name is given isam.log is used
-One can give a second and a third '-v' for more verbose.
-Normaly one does a update (-u).
-If a recover is done all writes and all possibly updates and deletes is done
-and errors are only counted.
-If one gives table names as arguments only these tables will be updated
-
-
-
-.SH "SEE ALSO" 
-isamchk(1),
-mysql(1),
-mysqlaccess(1),
-mysqladmin(1),
-mysqld(1),
-mysqld_multi(1),
-mysqld_safe(1),
-mysqldump(1),
-mysql_fix_privilege_tables(1),
-mysqlshow(1),
-mysql_zap(1),
-perror(1),
-replace(1)
-.P
-For more information please refer to the MySQL reference
-manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
-.SH BUGS
-Please refer to http://bugs.mysql.com/ to report bugs.
-
-.SH AUTHOR 
-
-Ver 1.0, distribution @MYSQL_NO_DASH_VERSION@
-Michael (Monty) Widenius (monty@mysql.com),
-MySQL AB (http://www.mysql.com/).
-This software comes with no warranty.
-Manual page by L. (Kill-9) Pedersen 
-(kill-9@kill-9.dk), Mercurmedia Data Model Architect /
-system developer (http://www.mercurmedia.com)
-
-
-.\" end of man page
-
-

support-files/mysql.spec.sh

@@ -468,8 +468,6 @@ fi
 
 %doc %attr(644, root, root) %{_infodir}/mysql.info*
 
-%doc %attr(644, root, man) %{_mandir}/man1/isamchk.1*
-%doc %attr(644, root, man) %{_mandir}/man1/isamlog.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
@@ -480,8 +478,6 @@ fi
 
 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
 
-%attr(755, root, root) %{_bindir}/isamchk
-%attr(755, root, root) %{_bindir}/isamlog
 %attr(755, root, root) %{_bindir}/my_print_defaults
 %attr(755, root, root) %{_bindir}/myisamchk
 %attr(755, root, root) %{_bindir}/myisam_ftdump
@@ -502,7 +498,6 @@ fi
 %attr(755, root, root) %{_bindir}/mysqld_safe
 %attr(755, root, root) %{_bindir}/mysqlhotcopy
 %attr(755, root, root) %{_bindir}/mysqltest
-%attr(755, root, root) %{_bindir}/pack_isam
 %attr(755, root, root) %{_bindir}/perror
 %attr(755, root, root) %{_bindir}/replace
 %attr(755, root, root) %{_bindir}/resolve_stack_dump
@@ -556,7 +551,6 @@ fi
 %{_includedir}/mysql/*
 %{_libdir}/mysql/libdbug.a
 %{_libdir}/mysql/libheap.a
-%{_libdir}/mysql/libmerge.a
 %if %{have_libgcc}
 %{_libdir}/mysql/libmygcc.a
 %endif
@@ -568,7 +562,6 @@ fi
 %{_libdir}/mysql/libmysqlclient_r.la
 %{_libdir}/mysql/libmystrings.a
 %{_libdir}/mysql/libmysys.a
-%{_libdir}/mysql/libnisam.a
 %{_libdir}/mysql/libvio.a
 
 %files shared
@@ -597,6 +590,11 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Tue Jan 04 2005 Petr Chardin <petr@mysql.com>
+
+- ISAM and merge storage engines were purged. As well as appropriate
+  tools and manpages (isamchk and isamlog)
+
 * Thu Aug 26 2004 Lenz Grimmer <lenz@mysql.com>
 
 - MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)