[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2791)
#At lp:maria
2791 knielsen@knielsen-hq.org 2009-10-23 [merge]
Merge Peter Lieverdink's fixes:
- configtest target in rc script.
- type fix usefull -> useful.
modified:
Docs/myisam.txt
configure.in
mysql-test/mysql-stress-test.pl
mysys/safemalloc.c
sql/mysqld.cc
sql/sql_select.cc
sql/udf_example.c
support-files/mysql.server.sh
=== modified file 'Docs/myisam.txt'
--- a/Docs/myisam.txt 2000-07-31 19:29:14 +0000
+++ b/Docs/myisam.txt 2009-09-30 23:40:51 +0000
@@ -868,7 +868,7 @@ Space compression makes the index file s
Prefix compression helps if there are many strings with an identical prefix.
In memory table characteristics
-HEAP tables only exists in memory so they are lost if `mysqld' is taken down or crashes. But since they are *very* fast they are usefull as anyway.
+HEAP tables only exists in memory so they are lost if `mysqld' is taken down or crashes. But since they are *very* fast they are useful as anyway.
The *MySQL* internal HEAP tables uses 100% dynamic hashing without overflow areas and don't have problems with delete.
=== modified file 'configure.in'
--- a/configure.in 2009-10-08 09:43:31 +0000
+++ b/configure.in 2009-10-16 06:18:37 +0000
@@ -2847,7 +2847,7 @@ do
done
AC_SUBST(sql_union_dirs)
-# Some usefull subst
+# Some useful subst
AC_SUBST(CC)
AC_SUBST(GXX)
=== modified file 'mysql-test/mysql-stress-test.pl'
--- a/mysql-test/mysql-stress-test.pl 2006-03-03 18:15:01 +0000
+++ b/mysql-test/mysql-stress-test.pl 2009-09-30 23:40:51 +0000
@@ -1100,7 +1100,7 @@ mysql-stress-test.pl --stress-basedir=
participants (1)
-
knielsen@knielsen-hq.org