removed this since it easily gives errors if previous tests fail
mysql-test/t/ndb_autodiscover.test:
removed this since it easily gives errors if previous tests fail
mysql-test/r/ndb_autodiscover.result:
removed this since it easily gives errors if previous tests fail
- renamed the tests that use the embedded server (client_test ->
mysql_client_test_embedded, mysqltest -> mysql_test_embedded
and changed some Makefiles and scripts so they are installed in $bindir
(required to be able to run the test suite against the embedded server)
tests/mysql_client_test.c:
Rename: tests/client_test.c -> tests/mysql_client_test.c
libmysql/libmysql.c:
- renamed client_test.c to mysql_client_test.c in a comment
libmysqld/examples/Makefile.am:
- renamed client_test -> mysql_client_test_embedded
- renamed mysqltest -> mysqltest_embedded
- both will be installed in $bindir
scripts/make_binary_distribution.sh:
- install mysql_client_test, mysql_client_test_embedded and mysqltest_embedded
into bin directory
tests/Makefile.am:
- renamed client_test to mysql_client_test
BitKeeper/etc/ignore:
Added tests/mysql_client_test to the ignore list
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
mysql-test/r/ndb_autodiscover.result:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
Merged a different solution from 4.1 to 5.0.
Unexplainable diffs.
mysql-test/r/insert_select.result:
BUG#6034 - Error code 124: Wrong medium type
Merge seems to replace the test results by a new version of itself.
mysql-test/t/insert_select.test:
BUG#6034 - Error code 124: Wrong medium type
Merge seems to replace the test case by a new version of itself.
sql/sql_select.cc:
BUG#6034 - Error code 124: Wrong medium type
This is solved differently between 5.0 and 4.1.
The differences are unexplainable.
result->prepare2() is new to 5.0, but doesn't
appear in the diffs. Weird.
added testcase for Bug#8035
added option to wait for not-started
Bug#8035
mysql-test/mysql-test-run.sh:
added variable NDB_MGM to be able to run the management client in tests
mysql-test/r/ndb_autodiscover.result:
added testcase for Bug#8035
mysql-test/t/ndb_autodiscover.test:
added testcase for Bug#8035
ndb/tools/waiter.cpp:
added option to wait for not-started
sql/lock.cc:
Bug#8035
Completely recoded the bugfix for 4.1.
This is just a merge changeset.
mysql-test/r/insert_select.result:
BUG#6034 - Error code 124: Wrong medium type
Replaced TYPE= by ENGINE=
mysql-test/t/insert_select.test:
BUG#6034 - Error code 124: Wrong medium type
Replaced TYPE= by ENGINE=
sql/sql_select.cc:
BUG#6034 - Error code 124: Wrong medium type
Completely recoded the bugfix for 4.1.
Bug#7834 Illegal mix of collations in IN operator
IN was the first function supporting
character set convertion.
agg_arg_charsets() was written afterwards,
which is more flexible.
Now IN just reuses this function.
sql/item_cmpfunc.cc:
Bug#7834 Illegal mix of collations in IN operator
IN was the first function supporting
character set convertion.
agg_arg_charsets() was written afterwards,
which is more flexible.
Now IN just reuses this function.
Adding Shift-JIS error messages
for Japanese Windows distributions.
Thanks to Serg for help with a perl program
to merge 4.1 messages into 5.0 format :)
sql/share/errmsg.txt:
Adding Shift-JIS error messages
for Japanese Windows distributions.
Thanks Serg for help :)
environment (using "build" on SUSE Linux)
Build-tools/Do-rpm:
- added functionality to perform RPM builds inside of a chrooted build
environment (using "build" on SUSE Linux) - see "--help" for more details
Auto-merge fix:
removing this file: error messages are done
in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
Delete: sql/share/japanese-sjis/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
Delete: sql/share/japanese-sjis/errmsg.txt
configure.in:
Auto-merge fix:
removing this file: error messages are done
in a different way in 5.0.
Add SJIS version of Japanese error messages.
Windows version should include this new file,
instead of the EUC-JP version.
configure.in:
Add SJIS version of Japanese error messages.
Windows version should include this new file,
instead of the EUC-JP version.
on a case-sensitive filesystem. (Bug #7887)
sql/mysqld.cc:
Add warning when running with lower_case_table_names=2 and datadir is
on a case-sensitive filesystem.
Version for 5.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
Now the preparation is split into two prepare methods.
The first detects the situation and defers some preparations
until the second phase.
mysql-test/r/insert_select.result:
BUG#6034 - Error code 124: Wrong medium type.
The test results.
mysql-test/t/insert_select.test:
BUG#6034 - Error code 124: Wrong medium type.
The test case.
sql/sql_class.h:
BUG#6034 - Error code 124: Wrong medium type.
Added a new method for deferred preparation actions.
sql/sql_insert.cc:
BUG#6034 - Error code 124: Wrong medium type.
If the insert table is one of the select tables, a part
of the result table preparations like disabling indexes
has to be done after the select phase.
This is now done in the new method select_insert::prepare2().
sql/sql_select.cc:
BUG#6034 - Error code 124: Wrong medium type.
The result table preparation is now split into prepare() and
prepare2(). Disabling indexes and other preparation stuff
is deferred until after the selection phase.
Version for 4.1. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'.
In this case the result is put into a temporary table first.
Hence, we can defer the preparation of the insert
table until the result is to be used.
mysql-test/r/insert_select.result:
BUG#6034 - Error code 124: Wrong medium type.
The test results.
mysql-test/t/insert_select.test:
BUG#6034 - Error code 124: Wrong medium type.
The test case.
sql/sql_select.cc:
BUG#6034 - Error code 124: Wrong medium type.
With OPTION_BUFFER_RESULT in the 'select_options',
defer the preparation of the insert table until the
result is to be used.
