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

Merge 192.168.0.10:mysql/mysql-5.1-maint

Browse Source 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2007-02-06 15:50:24 +01:00
parent 7bba59bb25 2470806f9a
commit a2a6839e07
7 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3615,13 +3615,14 @@ sub mysqld_arguments ($$$$$) {
}
}
my $pidfile;
# Check if "extra_opt" contains --skip-log-bin
my $skip_binlog= grep('--skip-log-bin', @$extra_opt);
if ( $type eq 'master' )
{
my $id= $idx > 0 ? $idx + 101 : 1;
if (! $opt_skip_master_binlog)
if (! ($opt_skip_master_binlog || $skip_binlog) )
{
mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix,
$opt_vardir, $sidx);
@ -3683,7 +3684,7 @@ sub mysqld_arguments ($$$$$) {
mtr_add_arg($args, "%s--datadir=%s", $prefix,
$slave->[$idx]->{'path_myddir'});
mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);
if (! $opt_skip_slave_binlog)
if (! ( $opt_skip_slave_binlog || $skip_binlog ))
{
mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix,
$opt_vardir, $sidx); # FIXME use own dir for binlogs
@ -3820,6 +3821,10 @@ sub mysqld_arguments ($$$$$) {
{
$found_skip_core= 1;
}
elsif ($skip_binlog and mtr_match_prefix($arg, "--binlog-format"))
{
; # Dont add --binlog-format when running without binlog
}
else
{
mtr_add_arg($args, "%s%s", $prefix, $arg);

4
mysql-test/r/cast.result
View File

@ -348,6 +348,10 @@ Warnings:
Warning 1292 Truncated incorrect INTEGER value: '-1e+30'
Warning 1292 Truncated incorrect INTEGER value: '1e+30'
DROP TABLE t1;
select isnull(date(NULL)), isnull(cast(NULL as DATE));
isnull(date(NULL)) isnull(cast(NULL as DATE))
1 1
End of 4.1 tests
select cast('1.2' as decimal(3,2));
cast('1.2' as decimal(3,2))
1.20

8
mysql-test/t/cast.test
View File

@ -176,7 +176,13 @@ INSERT INTO t1 SET f1 = +1.0e+30 ;
SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;
DROP TABLE t1;
# End of 4.1 tests
#
# Bug #23938: cast(NULL as DATE)
#
select isnull(date(NULL)), isnull(cast(NULL as DATE));
--echo End of 4.1 tests
#decimal-related additions

1
mysql-test/t/disabled.def
View File

@ -36,7 +36,6 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb
#ndb_binlog_discover : bug#21806 2006-08-24
#ndb_autodiscover3 : bug#21806
flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin
mysql_upgrade : Bug#25074 mysql_upgrade gives inconsisten results
plugin : Bug#25659 memory leak via "plugins" test
rpl_ndb_dd_advance : Bug#25913 rpl_ndb_dd_advance fails randomly

2
mysql-test/t/flush2-master.opt
View File

@ -1 +1 @@
--disable-log-bin
--skip-log-bin

2
server-tools/instance-manager/instance.cc
View File

@ -17,7 +17,7 @@
#pragma implementation
#endif
#include <my_global.h>
#include <mysql.h>
#include <signal.h>

3
sql/item_timefunc.cc
View File

@ -2531,7 +2531,10 @@ longlong Item_date_typecast::val_int()
DBUG_ASSERT(fixed == 1);
TIME ltime;
if (args[0]->get_date(&ltime, TIME_FUZZY_DATE))
{
null_value= 1;
return 0;
}
return (longlong) (ltime.year * 10000L + ltime.month * 100 + ltime.day);
}