BitKeeper/deleted/.del-innodb.result.es~ba2a97747fd41a3a:
Delete: mysql-test/r/innodb.result.es
mysql-test/mysql-test-run.sh:
Remove innodb tests from list of tests automatically skipped
with embedded server
mysql-test/r/innodb.result:
Update results
mysql-test/t/innodb-deadlock.test:
Skip with embedded server
mysql-test/t/innodb-lock.test:
Skip with embedded server
mysql-test/t/innodb.test:
Move test of replace delayed to new test file, add to --replace_result
to clean up path
mysql-test-run to the tests themselves.
mysql-test/t/bdb-deadlock.test:
Don't run this test with embedded server
mysql-test/mysql-test-run.sh:
Remove tests from being skipped with embedded server
mysql-test/t/connect.test:
Skip test under embedded server
mysql-test/t/flush_block_commit.test:
Skip test under embedded server
mysql-test/t/grant.test:
Skip test under embedded server
mysql-test/t/grant2.test:
Skip test under embedded server
mysql-test/t/grant_cache.test:
Skip test under embedded server
Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
which will follow in a separate changeset.
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Merge the 4.0 and 4.1 change of the new '--with-big-tables' flag.
configure.in:
Call the new macro to evaluate the '--with-big-tables' flag.
mysql-test/mysql-test-run.sh:
No change in 5.0, as 4.1 was a backport (Martin).
mysql-test/r/ps_7ndb.result:
Merge from 4.1 (Martin).
the current way of passing '-DBIG_TABLES' to the compilers.
This is needed even in 4.0, as 'Do-compile-all' must use this new approach for
all "max" builds in 4.0, 4.1, and up.
acinclude.m4:
Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option
and set the CPP symbol 'BIG_TABLES' accordingly.
configure.in:
Call the new 'MYSQL_CHECK_BIG_TABLES' macro.
mysys/charset-def.c:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
Auto merged
sql/mysqld.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
mysql-test/r/type_blob.result:
after merge fix
into mysql.com:/home/jonas/src/mysql-5.0
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/sql_select.cc:
Auto merged
Not active by default.
One need to pass -DHAVE_CYBOZU_COLLATION to
activate it.
mysys/charset-def.c:
Adding Cybozu's patch.
Not active by default.
strings/ctype-utf8.c:
Adding Cybozu's patch.
Not active by default.
Corrected typo
mtr_diff.pl:
A simplified unified diff in Perl
new file
mysql-test/lib/mtr_diff.pl:
A simplified unified diff in Perl
mysql-test/mysql-test-run.pl:
Corrected typo
client/mysqltest.c:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/type_enum.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
SCCS merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
SCCS merged
sql/sql_union.cc:
DBUG_ASSERT(TRUE) is useless so assume opposite
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
set up long key page vars in ACC_LOCKREQ
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
set up long key page vars in ACC_LOCKREQ
Fixed Field_timestamp::val_int() so now it works correctly in --new mode
(or for TIMESTAMP(19) columns).
Also removed unused Field_timestamp::fill_and_store() method.
mysql-test/r/type_timestamp.result:
Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when
using --new".
mysql-test/t/type_timestamp.test:
Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when
using --new".
sql/field.cc:
Field_timestamp::fill_and_store()
Removed unused method.
Field_timestamp::val_int()
Even in --new mode integer representation of TIMESTAMP value should
not exceed 14 digits.
sql/field.h:
Removed unused Field_timestamp::fill_and_store() method.
My code in get_actual_tablename was not checking to make sure SHOW TABLES LIKE % was returning rows. Now I check that the resultset is not null and has at least 1 row before I process the table.
mysqldump.c:
Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows
client/mysqldump.c:
Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows