bzr commit into mysql-trunk-mtr branch (bjorn.munch:2980)

[Bjorn Munch]

#At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped

 2980 Bjorn Munch	2010-10-25 [merge]
      Revert simplified if() in mysql-test/include/show_events.inc

    modified:
      mysql-test/include/show_events.inc
=== modified file 'mysql-test/include/show_events.inc'
--- a/mysql-test/include/show_events.inc	2010-10-21 07:37:10 +0000
+++ b/mysql-test/include/show_events.inc	2010-10-25 12:07:28 +0000
@@ -25,7 +25,9 @@ if ($binlog_file)
 
 --let $_statement= $_statement from $binlog_start
 
-if ($binlog_limit)
+# Cannot use if($binlog_limit) since the variable may begin with a 0
+
+if (`SELECT '$binlog_limit' <> ''`)
 {
   --let $_statement= $_statement limit $binlog_limit
 }

No bundle (reason: revision is a merge).