Commit 94a40d6c authored by unknown's avatar unknown
Browse files

Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build

into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint

parents 6fb9ef87 f397b422
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
# disabled in embedded until tools running is fixed with embedded
--source include/not_embedded.inc

-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/have_cp932.inc