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 bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936

Browse Source 
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
This commit is contained in:
istruewing@chilla.local
2007-04-27 23:38:05 +02:00
parent e327818c28 7dfd5e8d71
commit 6a8844de6f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,6 +667,7 @@ sub command_line_setup () {
$glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`;
chomp($glob_mysql_test_dir);
}
$default_vardir= "$glob_mysql_test_dir/var";
# In most cases, the base directory we find everything relative to,
# is the parent directory of the "mysql-test" directory. For source
@ -837,7 +838,6 @@ sub command_line_setup () {
# --------------------------------------------------------------------------
# Set the "var/" directory, as it is the base for everything else
# --------------------------------------------------------------------------
$default_vardir= "$glob_mysql_test_dir/var";
if ( ! $opt_vardir )
{
$opt_vardir= $default_vardir;
@ -1361,7 +1361,7 @@ sub collect_mysqld_features () {
# --no-defaults and --skip-grant-tables are to avoid loading
# system-wide configs and plugins
#
my $list= `$exe_mysqld --no-defaults --language=$path_language --skip-grant-tables --verbose --help`;
my $list= `$exe_mysqld --no-defaults --datadir=$default_vardir --language=$path_language --skip-grant-tables --verbose --help`;
foreach my $line (split('\n', $list))
{

6
sql/log.h
View File

@ -603,13 +603,13 @@ public:
};
enum enum_binlog_format {
BINLOG_FORMAT_STMT= 0, // statement-based
BINLOG_FORMAT_ROW= 1, // row_based
/*
statement-based except for cases where only row-based can work (UUID()
etc):
*/
BINLOG_FORMAT_MIXED= 2,
BINLOG_FORMAT_MIXED= 0,
BINLOG_FORMAT_STMT= 1, // statement-based
BINLOG_FORMAT_ROW= 2, // row_based
/*
This value is last, after the end of binlog_format_typelib: it has no
corresponding cell in this typelib. We use this value to be able to know if

2
sql/mysqld.cc
View File

@ -405,7 +405,7 @@ my_bool opt_noacl;
my_bool sp_automatic_privileges= 1;
ulong opt_binlog_rows_event_max_size;
const char *binlog_format_names[]= {"STATEMENT", "ROW", "MIXED", NullS};
const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS};
TYPELIB binlog_format_typelib=
{ array_elements(binlog_format_names) - 1, "",
binlog_format_names, NULL };