into mysql.com:/home/mydev/mysql-5.1-bug5390
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item.cc:
Auto merged
sql/share/charsets/Index.xml:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
Recreating ctype-extra.c with additional 5.1
charset, and with additional missing 5.0 charset
due to bug with too small buffer MAX_BUF.
strings/ctype-extra.c:
Recreating ctype-extra.c with additional 5.1
charset, and with additional missing 5.0 charset
due to bug with too small buffer MAX_BUF.
Buffer was too small to load Index.xml.
So some charsets were not gerenrated.
Making the buffer bigger, and adding an DBUG_ASSERT,
to easier catch the problem in the future.
ctype-extra.c:
Additional charsets were generated.
strings/ctype-extra.c:
Additional charsets were generated.
strings/conf_to_src.c:
Buffer was too small to load Index.xml.
So some charsets were not gerenrated.
Making the buffer bigger, and adding an DBUG_ASSERT,
to easier catch the problem in the future.
into mysql.com:/usr/home/bar/mysql-5.1-new
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item.cc:
Auto merged
sql/share/charsets/Index.xml:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
never defined.
It was used at some point to add -Wuninitialized to debug flags,
but not any more. If there is still need to add -Wunitialized,
it can be added directly to $global_warnings.
BUILD/compile-amd64-debug-max-no-ndb:
Remove a no-op.
BUILD/compile-amd64-debug-max:
Remove a no-op.
BUILD/compile-darwin-mwcc:
Remove a no-op.
BUILD/compile-pentium-debug-max-no-embedded:
Remove a no-op.
BUILD/compile-pentium-debug-max-no-ndb:
Remove a no-op.
BUILD/compile-pentium-debug-max:
Remove a no-op.
BUILD/compile-pentium-debug-openssl:
Remove a no-op.
BUILD/compile-pentium-debug-yassl:
Remove a no-op.
BUILD/compile-pentium-debug:
Remove a no-op.
BUILD/compile-pentium-mysqlfs-debug:
Remove a no-op.
BUILD/compile-pentium-valgrind-max:
Remove a no-op.
BUILD/compile-pentium64-debug-max:
Remove a no-op.
BUILD/compile-pentium64-debug:
Remove a no-op.
BUILD/compile-pentium64-valgrind-max:
Remove a no-op.
BUILD/compile-ppc-debug-max-no-ndb:
Remove a no-op.
BUILD/compile-ppc-debug-max:
Remove a no-op.
BUILD/compile-ppc-debug:
Remove a no-op.
into mysql.com:/home/mydev/mysql-5.1-bug5390
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item.cc:
Auto merged
sql/share/charsets/Index.xml:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/table.h:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/lock.cc:
BUG#5390 - problems with merge tables
Manual merge from 5.0.
BUILD/SETUP.sh:
Remove dead options.
BUILD/compile-amd64-debug-max-no-ndb:
Remove dead options.
BUILD/compile-amd64-debug-max:
Remove dead options.
BUILD/compile-amd64-max:
Remove dead options.
BUILD/compile-darwin-mwcc:
Remove dead options.
BUILD/compile-pentium-debug-max-no-embedded:
Remove dead options.
BUILD/compile-pentium-debug-max-no-ndb:
Remove dead options.
BUILD/compile-pentium-debug-max:
Remove dead options.
BUILD/compile-pentium-icc-valgrind-max:
Remove dead options.
BUILD/compile-pentium-max:
Remove dead options.
BUILD/compile-pentium-valgrind-max:
Remove dead options. There is no ISAM any more.
BUILD/compile-pentium64-debug-max:
Remove dead options.
BUILD/compile-pentium64-valgrind-max:
Remove dead options. There is no ISAM any more.
BUILD/compile-ppc-debug-max-no-ndb:
Remove dead options.
BUILD/compile-ppc-debug-max:
Remove dead options.
BUILD/compile-ppc-max:
Remove dead options.
Additional fix for INSERT DELAYED with subselect.
Originally detected in 5.1, but 5.0 could also be affected.
The user thread creates a dummy table object,
which is not included in the lock. The 'real' table is
opened and locked by the 'delayed' system thread.
The dummy object is now marked as not locked and this is
tested in mysql_lock_have_duplicate().
sql/lock.cc:
BUG#5390 - problems with merge tables
Additional fix for INSERT DELAYED with subselect.
The user thread creates a dummy table object,
which is not included in the lock.
Changed to safer asserts.
sql/sql_insert.cc:
BUG#5390 - problems with merge tables
Marked the dummy table object as not being
included in the lock.
Mutli-table uses temporary table to store new values for fields. With the
new values the rowid of the record to be updated is stored in a Field_string
field. Table to be updated is set as source table of the rowid field.
But when the temporary table creates the tmp field for the rowid field it
converts it to a varstring field because the table to be updated was created by
the v4.1. Due to this the stored rowids were broken and no records for
update were found.
The flag can_alter_field_type is added to Field_string class. When it is set to
0 the field won't be converted to varstring. The Field_string::type() function
now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0.
The multi_update::initialize_tables() function now sets can_alter_field_type
flag to 0 for the rowid fields denying conversion of the field to a varstring
field.
sql/field.h:
Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
The flag can_alter_field_type is added to Field_string class. When it is set to
0 the field won't be converted to varstring.
The Field_string::type() function now always returns MYSQL_TYPE_STRING if
can_alter_field_type is set to 0.
sql/sql_update.cc:
Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
The multi_update::initialize_tables() function now sets can_alter_field_type
flag to 0 for the rowid fields denying conversion of the field to a varstring
field.
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
config/ac-macros/yassl.m4:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
Auto merged
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
VC++Files/storage/bdb/bdb.vcproj:
Auto merged
VC++Files/storage/innobase/innobase.vcproj:
Auto merged
config/ac-macros/yassl.m4:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
The code in opt_sum_query that prevented the COUNT/MIN/MAX
optimization from being applied to outer joins was not adjusted
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.
mysql-test/r/view.result:
Added a test case for bug #18237.
mysql-test/t/view.test:
Added a test case for bug #18237.
mysql-test/r/information_schema.result:
IS_COMPILED is not determenistic
mysql-test/t/information_schema.test:
IS_COMPILED is not determenistic
strings/conf_to_src.c:
Adding dumping of extra 5.0 fields
strings/ctype-extra.c:
Recreating sources according to 5.0 XML files using conf_to_src.
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
obtain partition number, call partition_info->get_part_partition_id() when
the table has subpartitions, and get_partition_id() otherwise. (The bug
was that we were always doing the latter)
mysql-test/r/partition_pruning.result:
Testcase for BUG#18659
mysql-test/t/partition_pruning.test:
Testcase for BUG#18659
- move slock bitmask to separate hash list, object living only during query
sql/ha_ndbcluster.h:
Bug #18596 binlog schema event auto push causes mysqld errors
