mysql-test/r/ndb_cache2.result:
Decreased ndb_cache_check_time to avoid timing related problem on aix52-64bit and octane2
mysql-test/t/ndb_cache2.test:
Decreased ndb_cache_check_time to avoid timing related problem on aix52-64bit and octane2
into mysql.com:/usr/home/bar/mysql-5.0.fresh
include/my_base.h:
Auto merged
myisam/mi_rnext_same.c:
Auto merged
mysql-test/r/ctype_latin1_de.result:
Auto merged
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
configure.in:
Auto merged
mysql-test/r/drop_temp_table.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
- the variable MASTER_MY_PORT1 was used from the script, but it was not set to the port where the second server was started
mysql-test/mysql-test-run.sh:
Export the variable MASTER_MY_PORT1 from the place where the second master is started
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
sql/log.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
in the grant tables case-insensitive and updating test results.
scripts/mysql_create_system_tables.sh:
Fix collation of procs_priv.proc_priv
scripts/mysql_fix_privilege_tables.sql:
Fix enum fields to have case-insensitive collation
mysql-test/r/information_schema.result:
Update results
mysql-test/r/system_mysql_db.result:
Update results
mysql-test/r/lowercase_table_grant.result:
Update results
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/r/lowercase_table2.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/system_mysql_db.result:
Update results
scripts/mysql_create_system_tables.sh:
Merge fix for Bug #7617, making enum fields in grant tables
case-insensitive.
scripts/mysql_fix_privilege_tables.sql:
Merge fix for Bug #7617, and fix additional enum/set columns.
sql/sql_acl.cc:
Hand-merge due to whitespace change
sql/sql_lex.cc:
Hand-merge bug fix.
(Bug #8475)
sql/sql_parse.cc:
Reset the start time before each statement before each statement in
a multi-statement query, and check whether each statement should
be logged to the slow query log independently.
mysql-test/r/multi_statement.result:
Add new results
mysql-test/t/multi_statement.test:
Add new regression test
Make .disabled files part of distribution
mysql-test/Makefile.am:
Make .disabled files part of distribution
scripts/make_binary_distribution.sh:
Make .disabled files part of distribution
Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
mysql-test/r/innodb.result:
Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
mysql-test/t/innodb.test:
Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
- Added tescases
- Added handling of HA_ERR_NO_SUCH_TABLE in mysql_rm_table_part2 so that
error messages now are consistent
mysql-test/r/ndb_autodiscover.result:
Added tess for dropping tables that does not exists in engine
mysql-test/t/ndb_autodiscover.test:
Added tess for dropping tables that does not exists in engine
sql/ha_ndbcluster.cc:
Updated delete_table and drop_table to retrn HA_ERR_NO_SUCH_TABLE if table was not found in engine.
Clear error after calling mysql_rm_table_part2 from mysql_find_files
sql/sql_table.cc:
Added handling of the case when table does not exist in storage engine but on disk as .frm file.
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Fixed that negative arguments to certain integer options wrap around.
mysql-test/r/variables.result:
Added a test case for bug#6958.
mysql-test/t/variables.test:
Added a test case for bug#6958.
sql/set_var.cc:
sys_var_long_ptr::check function was added.
sql/set_var.h:
Use sys_var_long_ptr::check function for sys_var_long_ptr class.
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
merge
