into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
bug in interpretedupdate (used for auto-increment) that made TUPKEYREF be sent twice
this was however "normally" shadowed, but made LQH crash when LCP was about to start
mysql-test/r/ndb_basic.result:
testcase
mysql-test/t/ndb_basic.test:
testcase
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
make sure TUPKEYREF is not sent twice in case of "error" in interpreted program
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
Fix DeleteRead in multi-operation
Dont use setup_read, as it will (correctly) find that tuple is deleted
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fix multi-op DeleteRead
storage/ndb/test/ndbapi/testBasic.cpp:
Fix multi-op DeleteRead
(here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds.
scripts/Makefile.am:
Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive
a "make clean", this is essential for cross-builds.
So move them from "CLEANFILES" to "DISTCLEANFILES".
- validating current result files
- updating with new features in information_schema / error messages
- forced order by and removed time stamps
removed a_version files that are not needed (now that the suite is in the main tree
Note: datadict tests still fail as a result of bug 28181 (a regression introduced in
5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed
BitKeeper/deleted/.del-a_version_check.test~82ea7fb267df9e58:
Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result~97a8ec1e3211c26:
Delete: mysql-test/suite/funcs_1/r/a_version_check.result
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
corrections to fooce order by on queries, replace time stamps with strings and enable the
testing of referential_constraints table
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/innodb_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/memory_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/memory_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/myisam_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/ndb_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/ndb_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/t/disabled.def:
Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Added code to test for error in case of a trigger name that is to long
mysql-test/suite/funcs_1/views/views_master.inc:
Correction to remove wrong '--eror' meaningless tag that generated warnings
into linux.site:/home/omer/source/bld51_2
BitKeeper/deleted/.del-a_version_check.result:
Auto merged
BitKeeper/deleted/.del-a_version_check.test:
Auto merged
BitKeeper/deleted/.del-datadict_load.inc:
Auto merged
BitKeeper/deleted/.del-datadict_master.inc:
Auto merged
BitKeeper/deleted/.del-datadict_show_schema.inc:
Auto merged
BitKeeper/deleted/.del-disabled.def~1:
Auto merged
BitKeeper/deleted/.del-innodb__datadict.result:
Auto merged
BitKeeper/deleted/.del-innodb_trig_08.result:
Auto merged
BitKeeper/deleted/.del-innodb_views.result:
Auto merged
BitKeeper/deleted/.del-memory__datadict.result:
Auto merged
BitKeeper/deleted/.del-memory_trig_08.result:
Auto merged
BitKeeper/deleted/.del-memory_views.result:
Auto merged
BitKeeper/deleted/.del-myisam__datadict.result:
Auto merged
BitKeeper/deleted/.del-myisam_trig_08.result:
Auto merged
BitKeeper/deleted/.del-views_master.inc:
Auto merged
BitKeeper/deleted/.del-innodb_func_view.result:
manual merge - using local file
BitKeeper/deleted/.del-memory_func_view.result:
manual merge - using local file
BitKeeper/deleted/.del-myisam_func_view.result:
manual merge - using local file
BitKeeper/deleted/.del-myisam_views.result:
manual merge - using local file
source tarball, this is essential for cross builds, like for NetWare.
scripts/Makefile.am:
On a fast build machine, both the source (mysql_fix_privilege_tables.sql)
and the generated file (mysql_fix_privilege_tables_sql.c) may have identical timestamps
(granularity is one second only, may be too coarse).
If that happens, the Makefile rule will fire, and "comp_sql" will be built and called -
which fails in a cross build, like for NetWare.
Prevent that by sleeping for 5 (five) seconds, this will ensure a time difference.
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
scripts/Makefile.am:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
into trift2.:/MySQL/M51/mysql-5.1
libmysqld/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
Auto merged
client/Makefile.am:
Merge does not fit - to be done manually.
client/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
libmysqld/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
netware/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
scripts/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
win/Makefile.am:
After a backslash (to mark a continuation line) there must not be a trailing blank.
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
mysql-test/r/ndb_insert.result:
Auto merged
mysql-test/t/ndb_insert.test:
Auto merged
sql/ha_ndbcluster.cc:
Using local (will hand merge).
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
mysql-test/r/alter_table.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
sql/item_func.h:
Auto merged
- validated current result files
- forced order by and removed time stamps
removed a_version files (since do not make sense now when suite is in the main tree)
Note: datadict tests still fail as a result of regression bug 28181 in 5.0.42 (discovered
while performing this update) - tests should run clean once bug is fixed
BitKeeper/deleted/.del-a_version_check.test:
Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result:
Delete: mysql-test/suite/funcs_1/r/a_version_check.result
BitKeeper/deleted/.del-innodb_views.warnings:
Delete: mysql-test/suite/funcs_1/r/innodb_views.warnings
BitKeeper/deleted/.del-memory_views.warnings:
Delete: mysql-test/suite/funcs_1/r/memory_views.warnings
BitKeeper/deleted/.del-myisam_views.warnings:
Delete: mysql-test/suite/funcs_1/r/myisam_views.warnings
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
corrections to force order by on queries and replace time stamps with strings
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file with order bu selects, elimination of time stamps
and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/innodb_func_view.result:
confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
confirming existing results as correct ones - returned results are correct,
wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file with order bu selects, elimination of time stamps
and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/memory_func_view.result:
confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/memory_trig_08.result:
confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
confirming existing results as correct ones - returned results are correct,
wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file with order bu selects, elimination of time stamps
and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/myisam_func_view.result:
confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
confirming existing results as correct ones - returned results are correct,
wrong 'expected' error messages removed
mysql-test/suite/funcs_1/t/disabled.def:
Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/views/views_master.inc:
removed invalid -- lines generating warning files
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
mysql-test/r/alter_table.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
mysql-test/r/alter_table.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
mysql-test/r/olap.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_select.cc:
Auto merged
