mysql-test/mysql-test-run.sh:
In a release build on the platforms, TESTS_BINDIR needs to be set to $BASEDIR/tests because the test
program 'client_test' is expected there (see 'client_test.test' with its 'exec', bug#7909).
In an installation, TESTS_BINDIR needs to be set to $BASEDIR/bin because some NDB programs are
located there (see Jonas Oreland's change labeled '1.220, 2005-01-04 08:15:30+01:00').
This patch is to unite these conflicting requirements.
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/mysqld.cc:
Auto merged
added number_of_replicas printout in show table status
mysql-test/r/ndb_alter_table.result:
added number_of_replicas to show table status printout
mysql-test/r/ndb_autodiscover.result:
added number_of_replicas to show table status printout
ndb/include/ndbapi/NdbDictionary.hpp:
added get method for replica count
ndb/include/ndbapi/ndb_cluster_connection.hpp:
added get method of node id
ndb/src/ndbapi/NdbDictionary.cpp:
added get method for replica count
ndb/src/ndbapi/ndb_cluster_connection.cpp:
added get method of node id
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/sql_show.cc:
Merge with s/TYPE/USING/ fixes
key algorithm for keys where they were explicitly specified.
mysql-test/r/show_check.result:
Add results
mysql-test/t/show_check.test:
Add tests for preservation of key algorithm in SHOW CREATE TABLE output
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/type_float.result.es:
Auto merged
mysql-test/r/type_float.result:
Auto merged
sql/field.cc:
Auto merged
mysql-test/r/ctype_latin1_de.result:
Auto merged
mysql-test/r/ctype_tis620.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_ujis.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774)
sql/field.cc:
Fix handling of negative values and fabs(values> < 1 in Field_str::store
mysql-test/r/type_float.result:
Add results
mysql-test/r/type_float.result.es:
Add results
mysql-test/t/type_float.test:
Add test for conversion of floats to character field
into build.mysql.com:/users/tulin/mysql-5.0-ndb
libmysql_r/Makefile.am:
Auto merged
mysql-test/r/analyse.result:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/sql_analyse.cc:
Auto merged
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
mysql-test/r/ctype_ucs.result:
backticks added
mysql-test/r/user_var.result:
backticks added
mysql-test/t/user_var.test:
testing a variable with BINARY collation, which needs the backticks
sql/log_event.cc:
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
into mysql.com:/home/jwinstead2/mysql-5.0-clean
libmysql_r/Makefile.am:
Auto merged
mysql-test/r/analyse.result:
Auto merged
sql/sql_analyse.cc:
Auto merged
mysql-test/r/func_sapdb.result:
Added test for bug #7586 "TIMEDIFF for sec+microsec not working
properly". Corrected previously wrong results of couple other
statements.
mysql-test/t/func_sapdb.test:
Added test for bug #7586 "TIMEDIFF for sec+microsec not working
properly".
sql/item_timefunc.cc:
Item_func_timediff::val_str():
Use simplier and less error-prone implementation. Now we are counting
difference between time values in microseconds and convert it to time
value (instead of using seconds and taking difference in "second_part"s
into account).
