of client equals to character set of connection, possibly required
conversion to character set of column is not performed
(prepared statements, data is supplied using placeholders).
sql/item.cc:
Fix for the bug reported by Reggie: if character_set_connection
is equal to character_set_client, placeholder's value is not converted
furhter to character set of column when it's different.
This is because the original implementation left placeholder's character
set intact (binary) if there were no need for client->connection conversion.
tests/client_test.c:
A test case for the conversion bug.
in 4.1: Dump only VARBINARY() in hex,
while VARCHAR() COLLATE xxx_bin as a string.
client/mysqldump.c:
in 4.1: Dump only VARBINARY() in hex,
while VARCHAR() COLLATE xxx_bin as a string.
BitKeeper/etc/ignore:
Added mysql-test/mysql_test_run_new to the ignore list
mysql-test/Makefile.am:
All source files must be contained in their respective macros in order to be contained
in the DISTFILES macro so that they get included in the source file tar-ball.
"my_manage.h" was missing.
My previous change that "set @a=NULL" doesn't change charset
fixed 'Bug #6321' as well. Prove with a new test that
FIELD(<uservariable content NULL>, ...) now works fine too.
mysql-test/t/user_var.test:
My previous change that "set @a=NULL" doesn't change charset
fixed 'Bug #6321' as well. Prove with a new test that
FIELD(<uservariable content NULL>, ...) now works fine too.
mysql-test/r/user_var.result:
My previous change that "set @a=NULL" doesn't change charset
fixed 'Bug #6321' as well. Prove with a new test that
FIELD(<uservariable content NULL>, ...) now works fine too.
_all_ versions. It tries to remove "Docs/Images/Makefile*" as part of the actions to
correct bug number 6350. If the source tree does not contain a dummy file matching
that pattern, this "rm" will fail, and so "Bootstrap" will fail.
The "Makefile.am" introduced with this changeset is identical to the one that will
arrive here when "joerg:1.2057" is propagated from 4.0,
so this separate introduction here is just to allow "Bootstraps" in the meantime.
character set with NULL, @a should be latin2
after this query sequence:
SET @a=_latin2'string';
SET @a=NULL;
I.e. the second query should not change the charset
to the current default value, but should keep the
original value assigned during the first query.
In order to do it, we don't copy charset
from the argument if the argument is NULL
and the variable has previously been initialized.
mysql-test/r/ps_6bdb.result:
t
mysql-test/r/ps_5merge.result:
t
mysql-test/r/ps_3innodb.result:
t
mysql-test/r/ps_7ndb.result:
t
mysql-test/r/ps_4heap.result:
t
mysql-test/r/ps_2myisam.result:
t
sql/item_func.cc:
t
Bug #6351 make test failure "Unknown character set"
UCS2 related tests were moved into ctype_ucs.
mysql-test/t/ps.test:
Bug #6351 make test failure "Unknown character set"
UCS2 related tests were moved into ctype_ucs.
Bug #6351 make test failure "Unknown character set"
UCS2 related tests were moved into ctype_ucs.
mysql-test/t/ctype_ucs.test:
Bug #6351 make test failure "Unknown character set"
UCS2 related tests were moved into ctype_ucs.
mysql-test/r/ctype_ucs.result:
Bug #6351 make test failure "Unknown character set"
UCS2 related tests were moved into ctype_ucs.
mysql-test/r/ps.result:
Bug #6351 make test failure "Unknown character set"
UCS2 related tests were moved into ctype_ucs.
- 'mysqldump --help' comment that --xeh-blob
doesn't work with --extended-inserts was removed.
It does work now. Thanks to Lachlan
who noticed this wrong help message.
- Switched to use the recently introduced
mysql_hex_string() instead of slow sprintf().
Thanks to Sinisa for the idea.
- 'mysqldump --hex-blob' dumps in HEX not only
BLOBs but also BINARY(x) columns.
Thanks to Paul.
client/mysqldump.c:
- comment that --xeh-blob doesn't work with --extended-inserts was removed. It does work now.
- Switched to use recently introduced mysql_hex_string()
instead of sprintf()
- BINARY(x) are dumped in HEX too
Added a case for bug #6365.
item_cmpfunc.cc:
Fixed bug #6365 : Server crashed when list of values
in IN predicate contains NULL while the tested field is
of the character type and not of the default set;
e.g. when f in 'f IN (NULL,'aa') belongs to binary
character set, while the default character set is latin1.
sql/item_cmpfunc.cc:
Fixed bug #6365 : Server crash when list of values
in IN predicate contains NULL while the tested field is
of the character type of not of the default set
e.g. when f in 'f IN (NULL,'aa') belongs to binary
character set, while the default character set is latin1.
mysql-test/t/func_in.test:
Added a case for bug #6365.
mysql-test/r/func_in.result:
Added a case for bug #6365.
(prepared staements)": adding the test case to close the bug
(the bug was fixed along with other conversion incompatibilities
in 4.1.7)
tests/client_test.c:
A test case for Bug#4172: "Floating point conversion loses precision
(prepared staements)"
Fix memleak.
code check is wrong".
acinclude.m4:
Fix for Bug#6408 "configure checking for custom zlib fails because
code check is wrong".
AC_TRY_LINK needs something it can put into main() as its second argument.
Apparently everything worked before because gcc supports nested functions.
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/insert.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
changed to use new switch
mysql-test/ndb/ndbcluster.sh:
updated start script for ndbcluster to make better cleanup
ndb/test/run-test/main.cpp:
changed to use new switch
write_row(): document the ALTER TABLE tweak better,
and commit every n*10000 rows, not n*10000-1 rows.
sql/ha_innodb.cc:
write_row(): document the ALTER TABLE tweak better,
and commit every n*10000 rows, not n*10000-1 rows.
"SHOW CREATE TABLE" mysql-4.0 and mysql-3.23
compatibiliry mode change:
Check that a binary collation adds 'binary'
suffix into a char() column definition in
mysql40 and mysql2323 modes. This allows
not to lose the column's case sensitivity
when loading the dump in pre-4.1 servers.
mysql-test/t/sql_mode.test:
"SHOW CREATE TABLE" mysql-4.0 and mysql-3.23
compatibiliry mode change:
mysql-test/r/sql_mode.result:
"SHOW CREATE TABLE" mysql-4.0 and mysql-3.23
compatibiliry mode change:
Check that a binary collation adds 'binary'
suffix into a char() column definition in
mysql40 and mysql2323 modes. This allows
not to lose the column's case sensitivity
when loading the dump in pre-4.1 servers.
sql/field.cc:
"SHOW CREATE TABLE" mysql-4.0 and mysql-3.23
compatibiliry mode change:
Check that a binary collation adds 'binary'
suffix into a char() column definition in
mysql40 and mysql2323 modes. This allows
not to lose the column's case sensitivity
when loading the dump in pre-4.1 servers.
Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable
innobase/ibuf/ibuf0ibuf.c:
Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable
innobase/include/lock0lock.h:
Added function lock_get_ix_table()
innobase/include/row0mysql.h:
Added parameter "table" to row_lock_table_for_mysql()
innobase/lock/lock0lock.c:
Added function lock_get_ix_table()
innobase/row/row0mysql.c:
Added parameter "table" to row_lock_table_for_mysql()
sql/ha_innodb.cc:
write_row(): commit every 10000 rows in ALTER TABLE
sql/ha_innodb.h:
Added member variable num_write_row
ndb/src/ndbapi/ndberror.c:
826 error text
mysql-test/r/ndb_blob.result:
result displayed error
mysql-test/t/ndb_blob.test:
result displayed error
ndb/src/ndbapi/NdbBlob.cpp:
update head+inline earlier
ndb/src/ndbapi/NdbOperationExec.cpp:
blob IgnoreError bug
ndb/test/ndbapi/testBlobs.cpp:
tried to set non-nullable to null, causing a complex abort case
ndb/src/ndbapi/NdbConnection.cpp:
prepared ops CAN be left in complex abort
The idea of the fix is that the administrative statements
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not
generate binlog errors if there is no errors on the master.
sql/sql_parse.cc:
No binlog error generated
sql/sql_table.cc:
Documentation
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
there was a clash in using -c, added -f as the future proof switch
mysql-test/ndb/ndbcluster.sh:
changed to use the future-proof option to ndb_mgmd
ndb/src/mgmsrv/main.cpp:
there was a clash in using -c, added -f as the future proof switch
Bug #6045: Binary Comparison regression in MySQL 4.1
Binary searches didn't use a case insensitive index, now they do.
mysql-test/t/range.test:
Bug #6045: Binary Comparison regression in MySQL 4.1
Binary searches didn't use a case insensitive index, now they do.
mysql-test/r/range.result:
Bug #6045: Binary Comparison regression in MySQL 4.1
Binary searches didn't use a case insensitive index, now they do.
sql/opt_range.cc:
Bug #6045: Binary Comparison regression in MySQL 4.1
Binary searches didn't use a case insensitive index, now they do.
