database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge: 5.1 -> 5.1-rpl

Browse Source 
conflicts:
  Text conflict in mysql-test/lib/mtr_report.pm
  Text conflict in mysql-test/mysql-test-run.pl
This commit is contained in:
Luis Soares
2009-01-08 19:03:56 +00:00
parent 75017750c3 6f25dee2ac
commit b2cdc3b6cb
67 changed files with 181 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/mtr_report.pm
View File

@ -1,5 +1,5 @@
# -*- cperl -*-
# Copyright (C) 2004-2006 MySQL AB, 2008 Sun Microsystems, Inc.
# Copyright 2004-2008 MySQL AB, 2008 Sun Microsystems, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

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

@ -1463,12 +1463,12 @@ sub executable_setup () {
{
$exe_ndbd=
my_find_bin($basedir,
["storage/ndb/src/kernel", "libexec", "bin"],
["storage/ndb/src/kernel", "libexec", "sbin", "bin"],
"ndbd");
$exe_ndb_mgmd=
my_find_bin($basedir,
["storage/ndb/src/mgmsrv", "libexec", "bin"],
["storage/ndb/src/mgmsrv", "libexec", "sbin", "bin"],
"ndb_mgmd");
$exe_ndb_waiter=