database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge mysql.com:/home/elkin/MySQL/BARE/5.0

Browse Source 
into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/case.test:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
sql/sql_base.cc:
  manual merge use local. Another changeset for 5.1 is following.
This commit is contained in:
unknown
2006-04-25 20:05:15 +03:00
parent 1e869b0e58 d00a6cf46c
commit 3b6263b88c
10 changed files with 107 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.pl
View File

@@ -3580,7 +3580,7 @@ sub valgrind_arguments {
if ( $opt_valgrind_options )
{
mtr_add_arg($args, split(' ', $opt_valgrind_options));
mtr_add_arg($args, '%s', $_) for (split(' ', $opt_valgrind_options));
}