[Pkg-mysql-commits] r1212 - in trunk: . debian/additions

[Monty Taylor]

Author: mtaylor-guest
Date: 2008-04-30 03:50:17 +0000 (Wed, 30 Apr 2008)
New Revision: 1212

Modified:
   trunk/
   trunk/debian/additions/debian-start.inc.sh
Log:
Discard the rowcount output and only capture warnings and errors. 



Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-04-27 22:06:51.084000111 -0700
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

   + timestamp: 2008-04-29 20:23:02.368999958 -0700
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

Name: bzr:revision-id:v3-trunk0
   - 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16
609 monty at inaugust.com-20080218191319-s202z6cpd2wkk6mx
610 monty at inaugust.com-20080218193205-41o5j3pbcsjpnwhp
611 monty at inaugust.com-20080219191434-rk81tk20rs716j21
612 monty at inaugust.com-20080219191453-lt7mlbmdj6vqmv2z
613 monty at inaugust.com-20080219191808-lm6fzgy5dldmgs00
614 monty at inaugust.com-20080219195801-1qsjv2edorbp07gu
615 monty at inaugust.com-20080227185513-vudpt1mtynu6jc4v
616 monty at inaugust.com-20080227193209-cl6e3g7cmlurkc2f
620 monty at inaugust.com-20080301125100-u5yhvmmzuf7g8baz
629 monty at inaugust.com-20080330023953-bpbgyxivz97shb09
630 monty at inaugust.com-20080330024030-0wolpf04aabjsrom
633 monty at inaugust.com-20080401091054-yra08fd5sy0jopl4
635 monty at inaugust.com-20080419183446-d38duis16nygevbi
636 monty at inaugust.com-20080426181506-gc9m9zmjme3j0eo1
637 monty at inaugust.com-20080428050351-bem6zu0e1njwl7r2
638 monty at inaugust.com-20080428050651-epbwxsjsty9iczis

   + 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16
609 monty at inaugust.com-20080218191319-s202z6cpd2wkk6mx
610 monty at inaugust.com-20080218193205-41o5j3pbcsjpnwhp
611 monty at inaugust.com-20080219191434-rk81tk20rs716j21
612 monty at inaugust.com-20080219191453-lt7mlbmdj6vqmv2z
613 monty at inaugust.com-20080219191808-lm6fzgy5dldmgs00
614 monty at inaugust.com-20080219195801-1qsjv2edorbp07gu
615 monty at inaugust.com-20080227185513-vudpt1mtynu6jc4v
616 monty at inaugust.com-20080227193209-cl6e3g7cmlurkc2f
620 monty at inaugust.com-20080301125100-u5yhvmmzuf7g8baz
629 monty at inaugust.com-20080330023953-bpbgyxivz97shb09
630 monty at inaugust.com-20080330024030-0wolpf04aabjsrom
633 monty at inaugust.com-20080401091054-yra08fd5sy0jopl4
635 monty at inaugust.com-20080419183446-d38duis16nygevbi
636 monty at inaugust.com-20080426181506-gc9m9zmjme3j0eo1
637 monty at inaugust.com-20080428050351-bem6zu0e1njwl7r2
638 monty at inaugust.com-20080428050651-epbwxsjsty9iczis
639 monty at inaugust.com-20080430032302-fdwn2tyfq0a4z2se


Modified: trunk/debian/additions/debian-start.inc.sh
===================================================================
--- trunk/debian/additions/debian-start.inc.sh	2008-04-30 03:50:14 UTC (rev 1211)
+++ trunk/debian/additions/debian-start.inc.sh	2008-04-30 03:50:17 UTC (rev 1212)
@@ -16,11 +16,14 @@
   # Checking for $? is unreliable so the size of the output is checked.
   # Some table handlers like HEAP do not support CHECK TABLE.
   tempfile=`tempfile`
-  LC_ALL=C $MYSQL -N -b -e 'select concat("select count(*) from ",TABLE_SCHEMA, 
-    ".", TABLE_NAME) from information_schema.TABLES where ENGINE="MyISAM"' | \
-    xargs -i $MYSQL -N -q -e "{}" 2>&1 \
-    | perl -e '$_=join("", <>); s/^[^\n]+\n(error|note)\s+: The (handler|storage engine) for the table doesn.t support check\n//smg;print;' \
-    > $tempfile
+  # We have to use xargs in this case, because a for loop barfs on the 
+  # spaces in the thing to be looped over. 
+  LC_ALL=C $MYSQL --skip-column-names --batch -e  '
+      select concat("select count(*) into @discard from ",
+                    TABLE_SCHEMA, ".", TABLE_NAME) 
+      from information_schema.TABLES where ENGINE="MyISAM"' | \
+    xargs -i $MYSQL --skip-column-names --silent --batch \
+                    --force -e "{}" >$tempfile 
   if [ -s $tempfile ]; then
     (
       /bin/echo -e "\n" \
@@ -29,7 +32,9 @@
        $MYADMIN processlist status
     ) >> $tempfile
     # Check for presence as a dependency on mailx would require an MTA.
-    if [ -x /usr/bin/mailx ]; then mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < $tempfile; fi
+    if [ -x /usr/bin/mailx ]; then 
+      mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < $tempfile 
+    fi
     (echo "$MYCHECK_SUBJECT"; cat $tempfile) | logger -p daemon.warn -i -t$0
   fi
   rm $tempfile