bzr push into mysql-6.0 branch (serg:2753 to 2755)

[Sergei Golubchik]

 2755 Sergei Golubchik	2008-10-30 [merge]
      merged
modified:
  mysql-test/mysql-test-run.pl

 2754 Sergei Golubchik	2008-10-30 [merge]
      merged
modified:
  storage/maria/trnman.c

 2753 Sergei Golubchik	2008-10-28 [merge]
      merge
modified:
  configure.in
  sql/rpl_handler.cc
  sql/share/errmsg.txt
  unittest/mysys/Makefile.am

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-10-23 16:29:52 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-10-29 21:46:48 +0000
@@ -133,7 +133,7 @@ our $default_vardir;
 
 our $opt_usage;
 our $opt_suites;
-our $opt_suites_default= "main,backup,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
+our $opt_suites_default= "main,backup,binlog,rpl,rpl_ndb,ndb,maria"; # Default suites to run
 our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
 

=== modified file 'storage/maria/trnman.c'
--- a/storage/maria/trnman.c	2008-09-01 19:43:11 +0000
+++ b/storage/maria/trnman.c	2008-10-30 11:21:05 +0000
@@ -222,7 +222,7 @@ static TrID new_trid()
 static uint get_short_trid(TRN *trn)
 {
   int i= (int) ((global_trid_generator + (intptr)trn) * 312089 %
-                SHORT_TRID_MAX + 1);
+                SHORT_TRID_MAX) + 1;
   uint res=0;
 
   for ( ; !res ; i= 1)