bzr push into mysql-5.1-bugteam branch (staale.smedseng:2795 to 2796) Bug#41528

[Staale Smedseng]

 2796 Staale Smedseng	2009-02-13
      A fix for Bug#41528
modified:
  sql-bench/test-create.sh

 2795 Matthias Leich	2009-02-13 [merge]
      Merge actual tree -> local GCA tree, no conflicts
removed:
  cmd-line-utils/libedit/TEST/
  cmd-line-utils/libedit/TEST/test.c
  cmd-line-utils/libedit/compat.h
  cmd-line-utils/libedit/compat_conf.h
  cmd-line-utils/libedit/editline.3
  cmd-line-utils/libedit/editrc.5
  cmd-line-utils/libedit/fgetln.c
  cmd-line-utils/libedit/fgetln.h
  cmd-line-utils/libedit/libedit_term.h
  cmd-line-utils/libedit/strlcpy.c
  cmd-line-utils/libedit/strlcpy.h
  cmd-line-utils/libedit/tokenizer.h
  cmd-line-utils/libedit/unvis.c
  cmd-line-utils/libedit/vis.c
  cmd-line-utils/libedit/vis.h
  mysql-test/include/wait_for_query_to_suceed.inc
added:
  cmd-line-utils/libedit/README
  cmd-line-utils/libedit/filecomplete.c
  cmd-line-utils/libedit/filecomplete.h
  mysql-test/extra/binlog_tests/binlog_truncate.test
  mysql-test/include/wait_for_query_to_succeed.inc
  mysql-test/r/innodb_ignore_builtin.result
  mysql-test/suite/binlog/r/binlog_truncate_innodb.result
  mysql-test/suite/binlog/r/binlog_truncate_myisam.result
  mysql-test/suite/binlog/t/binlog_truncate_innodb-master.opt
  mysql-test/suite/binlog/t/binlog_truncate_innodb.test
  mysql-test/suite/binlog/t/binlog_truncate_myisam.test
  mysql-test/suite/rpl/r/rpl_drop_if_exists.result
  mysql-test/suite/rpl/t/rpl_drop_if_exists.test
  mysql-test/t/innodb_ignore_builtin-master.opt
  mysql-test/t/innodb_ignore_builtin.test
modified:
  client/mysql.cc
  cmd-line-utils/libedit/Makefile.am
  cmd-line-utils/libedit/chared.c
  cmd-line-utils/libedit/chared.h
  cmd-line-utils/libedit/common.c
  cmd-line-utils/libedit/config.h
  cmd-line-utils/libedit/el.c
  cmd-line-utils/libedit/el.h
  cmd-line-utils/libedit/el_term.h
  cmd-line-utils/libedit/emacs.c
  cmd-line-utils/libedit/hist.c
  cmd-line-utils/libedit/histedit.h
  cmd-line-utils/libedit/history.c
  cmd-line-utils/libedit/key.c
  cmd-line-utils/libedit/key.h
  cmd-line-utils/libedit/makelist.sh
  cmd-line-utils/libedit/map.c
  cmd-line-utils/libedit/np/fgetln.c
  cmd-line-utils/libedit/np/strlcat.c
  cmd-line-utils/libedit/np/strlcpy.c
  cmd-line-utils/libedit/np/unvis.c
  cmd-line-utils/libedit/np/vis.c
  cmd-line-utils/libedit/np/vis.h
  cmd-line-utils/libedit/parse.c
  cmd-line-utils/libedit/parse.h
  cmd-line-utils/libedit/prompt.c
  cmd-line-utils/libedit/read.c
  cmd-line-utils/libedit/read.h
  cmd-line-utils/libedit/readline.c
  cmd-line-utils/libedit/readline/readline.h
  cmd-line-utils/libedit/refresh.c
  cmd-line-utils/libedit/search.c
  cmd-line-utils/libedit/sig.c
  cmd-line-utils/libedit/sig.h
  cmd-line-utils/libedit/sys.h
  cmd-line-utils/libedit/term.c
  cmd-line-utils/libedit/tokenizer.c
  cmd-line-utils/libedit/tty.c
  cmd-line-utils/libedit/tty.h
  cmd-line-utils/libedit/vi.c
  include/my_global.h
  mysql-test/extra/rpl_tests/rpl_truncate.test
  mysql-test/extra/rpl_tests/rpl_truncate_helper.test
  mysql-test/lib/My/SafeProcess/safe_process_win.cc
  mysql-test/lib/mtr_unique.pm
  mysql-test/mysql-test-run.pl
  mysql-test/r/commit_1innodb.result
  mysql-test/r/fulltext.result
  mysql-test/r/merge.result
  mysql-test/r/mysqlbinlog_row_trans.result
  mysql-test/r/read_only.result
  mysql-test/r/windows.result
  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
  mysql-test/suite/binlog/r/binlog_unsafe.result
  mysql-test/suite/binlog/t/binlog_unsafe.test
  mysql-test/suite/binlog/t/disabled.def
  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
  mysql-test/suite/rpl/r/rpl_sp.result
  mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
  mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
  mysql-test/t/fulltext.test
  mysql-test/t/merge.test
  mysql-test/t/read_only.test
  mysql-test/t/rename.test
  mysql-test/t/windows.test
  sql/item_func.cc
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/set_var.cc
  sql/sql_base.cc
  sql/sql_class.cc
  sql/sql_delete.cc
  sql/sql_parse.cc
  sql/sql_plugin.cc
  sql/sql_yacc.yy
  storage/myisammrg/ha_myisammrg.cc
  storage/myisammrg/ha_myisammrg.h
  storage/myisammrg/myrg_open.c
  support-files/my-huge.cnf.sh
  support-files/my-large.cnf.sh
  support-files/my-medium.cnf.sh
  support-files/my-small.cnf.sh

=== modified file 'sql-bench/test-create.sh'
--- a/sql-bench/test-create.sh	2006-12-31 00:32:21 +0000
+++ b/sql-bench/test-create.sh	2009-02-13 12:35:38 +0000
@@ -247,7 +247,7 @@ for ($i=2 ; $i <= $keys ; $i++)
 $loop_time=new Benchmark;
 for ($i=1 ; $i <= $opt_loop_count ; $i++)
 {
-  do_many($dbh,$server->create("bench_$i", \@fields, \@index));
+  do_many($dbh,$server->create("bench_$i", \@fields, \@keys));
   $dbh->do("drop table bench_$i" . $server->{'drop_attr'}) or die $DBI::errstr;
 }