mysql-test/r/binary.result:
Auto merged
mysql-test/t/binary.test:
Auto merged
sql/field_conv.cc:
Auto merged
support-files/mysql.spec.sh:
Embedded is to be enabled in 5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/binary.result:
Auto merged
mysql-test/r/case.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/events.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_02myisam.result:
Auto merged
mysql-test/r/partition_mgm_err.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/archive_gis.result:
Merge bug10460
mysql-test/r/bdb_gis.result:
Merge bug10460
mysql-test/r/func_system.result:
Merge bug10460
mysql-test/r/innodb_gis.result:
Merge bug10460
mysql-test/r/ndb_gis.result:
Merge bug10460
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
oops (but did not affect previous patch)
storage/ndb/include/ndbapi/NdbDictionary.hpp:
allow NDB API programs direct access to blob tables via main table or by name (hack)
storage/ndb/src/ndbapi/NdbDictionary.cpp:
allow NDB API programs direct access to blob tables via main table or by name (hack)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
allow NDB API programs direct access to blob tables via main table or by name (hack)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
allow NDB API programs direct access to blob tables via main table or by name (hack)
storage/ndb/src/ndbapi/ndberror.c:
allow NDB API programs direct access to blob tables via main table or by name (hack)
Check if the host of table hash record exactly matches host from GRANT command
mysql-test/r/grant.result:
Fix for bug#14385 GRANT and mapping to correct user account problems
test case
mysql-test/t/grant.test:
Fix for bug#14385 GRANT and mapping to correct user account problems
test case
into mysql.com:/home/timka/mysql/src/5.0-bug-15229
mysql-test/r/join.result:
Auto merged
mysql-test/t/join.test:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/sql_base.cc:
SCCS merged
calculate Item_func_format::max_length using charset->mbmaxlen
mysql-test/r/func_math.result:
Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
test case
mysql-test/t/func_math.test:
Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
test case
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
parse blob table name (temp hack)
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
parse blob table name (temp hack)
storage/ndb/src/ndbapi/DictCache.cpp:
do not put blob tables in ndb api dict cache
main table is cached and blob tables are owned by its blob columns
storage/ndb/src/ndbapi/Ndb.cpp:
do not put blob tables in ndb api dict cache
main table is cached and blob tables are owned by its blob columns
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
do not put blob tables in ndb api dict cache
main table is cached and blob tables are owned by its blob columns
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
do not put blob tables in ndb api dict cache
main table is cached and blob tables are owned by its blob columns
mysql-test/r/distinct.result:
result added
mysql-test/t/distinct.test:
testcase
sql/item_sum.cc:
MYSQL_TYPE_VARCHAR can't be 'binary' compared even when it is
binary
it breaks binary compatibility. The patch will be left intact
in 5.1.
libmysql/libmysql.c:
Revert the changeset for Bug#16144: it breaks binary compatibility.
tests/mysql_client_test.c:
Revert the changeset for Bug#16144: it breaks binary compatibility.
Fix this by passing the HA_EXTRA_PREPARE_FOR_DELETE onto the newly added or about to be dropped partitions
so they have an opportunity to close their OS file handle.
client/mysqltest.c:
prevent positive find of pattern when pattern has zero length (this has nothing to do with this bug fix)
sql/ha_partition.cc:
initialize m_new_file to NULL
call new function prepare_for_delete for the HA_EXTRA_PREPARE_FOR_DELETE operation
inside prepare_for_delete, loop over m_new_file and m_reorged_file if they are non-NULL
sql/ha_partition.h:
added decl for new prepare_for_delete function
it breaks binary compatibility. The patch will be left intact
in 5.1. Warning: this changeset should be null-merged into 5.1.
A separate commit in order to push into the release clone of
5.0.19.
libmysql/libmysql.c:
Undo the patch for Bug#16144
tests/mysql_client_test.c:
Undo the patch for Bug#16144
qualified subject table" which was introduced during work on bug #13525
"Rename table does not keep info of triggers".
The bug was caused by the fact that during reconstruction of CREATE TRIGGER
statement stored in .TRG file which happened during RENAME TABLE we damaged
trigger definition in case when it contained fully qualified name of subject
table (see comment for sql_yacc.yy for more info).
mysql-test/r/trigger.result:
Added test for bug #17866 "Problem with renaming table with triggers with fully
qualified subject table".
mysql-test/t/trigger.test:
Added test for bug #17866 "Problem with renaming table with triggers with fully
qualified subject table".
sql/sql_trigger.cc:
Table_triggers_list::change_table_name_in_triggers():
Instead of trying to use pointer to the end of subject table identifier
we use pointer to the beginning of FOR lexeme now, so during reconstruction
of CREATE TRIGGER statement in this function we need to add extra space
before part which begins with FOR to get nice trigger definition.
sql/sql_yacc.yy:
trigger_tail:
In this rule we can't rely on using remember_end token after table_ident token,
since value returned depends on whether table name is fully qualified or not.
So instead of trying to get pointer to the end of table identifier we use
pointer to the beginning of FOR lexeme.
