into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
tests/mysql_client_test.c:
Remove the fflush(NULL) and instead explicitly fflush stdout and then stderr
Flush both stdout and stderr before abort'ing mysql_client_test
mysql-test/mysql-test-run.pl:
Run mysql_client_test wihtout --silent flag
tests/mysql_client_test.c:
Before aborting mysql_client_test in die, make sure
to first flush stdout and finally after the error message
has been printed also fflush stderr
mysql-test/r/mysqldump-max.result:
Update test result after fix of spelling error
mysql-test/r/rpl_trigger.result:
Update test result after fix of spelling error
mysql-test/r/type_newdecimal.result:
Update test result after fix of spelling error
mysql-test/t/mysqldump-max.test:
Fix spelling error "disable_warnings"
Write shorter "drop table..."
mysql-test/t/rpl_trigger.test:
Fix spelling error, there is no --ignore_warnings
mysql-test/t/type_newdecimal.test:
Fix spelling error
with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced
mysql-test/mysql-test-run.pl:
Attempt to run some quick queries to analyze the failure when mysqltest returns 1 indicating test has failed
Initially only code to analyze "could not sync with master" is added as that is a blackbox
and all problems looks the same
mysql-test/include/analyze_failure_sync_with_master.test:
New BitKeeper file ``mysql-test/include/analyze_failure_sync_with_master.test''
to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag
configure.in:
Replace references to yassl .la libraries with direct reference to
the .a libraries
netware/BUILD/mwldnlm:
Add comment about why mwldnlm is called with the "x" flag and how
to avoid it
vio/viossl.c:
No need for special code to switch from WinSock to BSD sockets when using yaSSL
vio/viosslfactories.c:
The OpenSSL port to NetWare has added some extra functions to free up memory, no need
to call them when using yaSSL
This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"
mysql-test/mysql-test-run.pl:
Avoid matching the trailing carriage return when parsing the mysqld.spec file
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
mysql-test/r/information_schema.result:
Update result
Because the length of I_S.COLUMNS.COLUMN_DEFAULT was increased to
65535 the column changed it's type from varchar(64) to longtext
The type is longtext if the length is > 65532 (the max varchar len)
mysql-test/t/information_schema.test:
test case for bug#23037: Bug in field "Default" of
query "SHOW COLUMNS FROM table"
Both SHOW COLUMNS and I_S.COLUMNS is TESTED as well the
value returned by both. Using --replace_regex is unfeasible
as the repetition value cannot be > 255.
--replace_regex /A{256}/VALUE/ doesn't work, not to talk about
/A{65532}/VALUE/
/(A{255}){255}/VALUE/ is awfully slow. Thus, simple function with
cursor is used to extract the value.
sql/sql_show.cc:
Default value can have TIMESTAMP, CHAR, VARCHAR, ENUM
VARCHAR can have the longest value, up to 65535. However, because
of table handler limitations the actual limit is 65532 characters,
latin1 charset. However, here is used MAX_FIELD_VARCHARLENGTH macro,
because there could be a storage engine without such limitation.
Revert 1 June change enough to restore ABI compatibility with previous
versions.
include/mysql.h:
Revert patch that breaks ABI compatibility
libmysqld/lib_sql.cc:
Remove useless assignment.
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION
sql/ha_innodb.cc:
Apply InnoDB snapshot ss923
Revision r922:
ha_innobase::store_lock(): When downgrading table locks, do not
check thd->in_lock_tables but test if
thd->lex->sql_command == SQLCOM_LOCK_TABLES
instead. Otherwise, stored functions will use table locks. (Bug #18077)
- compilation on the Alpha platform was broken because the Alpha-specific code was not updated after replacing the SIGRETURN_FRAME_COUNT constant with a variable
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
mysql-test/lib/mtr_misc.pl:
Add function mtr_exe_maybe_exists
mysql-test/mysql-test-run.pl:
Adapt to running from binary dist
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
commands and go directly to result file processing
client/mysqltest.c:
Add command "exit" to mysqltest
mysql-test/r/mysqltest.result:
Add command "exit" to mysqltest
mysql-test/t/mysqltest.test:
Add command "exit" to mysqltest
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/range.result:
SCCS merged
mysql-test/t/range.test:
SCCS merged
