sql/ha_innodb.cc:
Added new function to handlerton.
sql/handler.cc:
Removed Innodb dependency (last remaining function call).
sql/handler.h:
Added additional function for engines who need to know about client communication.
a normal 'make dist' source .tar.gz.
libmysql/mytest.c:
bk cp VC++Files/libmysqltest/mytest.c libmysql/mytest.c
sql/message.mc:
bk cp VC++Files/sql/message.mc sql/message.mc
Makefile.am:
Add Windows CMake stuff.
client/Makefile.am:
Add extra files needed for CMake Windows build.
cmakelists.txt:
Fix subdir order to make CMake dependency calculations happy.
configure.in:
Add extra files needed for CMake Windows build.
extra/Makefile.am:
Add extra files needed for CMake Windows build.
extra/yassl/Makefile.am:
Add extra files needed for CMake Windows build.
libmysql/Makefile.am:
Add extra files needed for CMake Windows build.
libmysql/cmakelists.txt:
Move mytest.c to a more sensible location.
libmysqld/Makefile.am:
Add extra files needed for CMake Windows build.
mysys/Makefile.am:
Add extra files needed for CMake Windows build.
regex/Makefile.am:
Add extra files needed for CMake Windows build.
server-tools/instance-manager/Makefile.am:
Add extra files needed for CMake Windows build.
sql/Makefile.am:
Add extra files needed for CMake Windows build.
sql/cmakelists.txt:
Move message.mc to a more sensible location.
Add some dependencies to avoid a stale handlerton.cc.
storage/archive/Makefile.am:
Add extra files needed for CMake Windows build.
storage/bdb/Makefile.in:
Add extra files needed for CMake Windows build.
storage/example/Makefile.am:
Add extra files needed for CMake Windows build.
storage/heap/Makefile.am:
Add extra files needed for CMake Windows build.
storage/innobase/Makefile.am:
Add extra files needed for CMake Windows build.
storage/innobase/include/univ.i:
Avoid including Unix config in Windows build.
storage/myisam/Makefile.am:
Add extra files needed for CMake Windows build.
storage/myisammrg/Makefile.am:
Add extra files needed for CMake Windows build.
strings/Makefile.am:
Add extra files needed for CMake Windows build.
tests/Makefile.am:
Add extra files needed for CMake Windows build.
vio/Makefile.am:
Add extra files needed for CMake Windows build.
zlib/Makefile.am:
Add extra files needed for CMake Windows build.
If the WHERE condition of a query contained an ORed FALSE term
then the set of tables whose rows cannot serve for null complements
in outer joins was determined incorrectly. It resulted in blocking
possible conversions of outer joins into joins for such queries.
mysql-test/r/join_outer.result:
Added a test case for bug #17164.
mysql-test/t/join_outer.test:
Added a test case for bug #17164.
tables corrupt triggers".
It turned out that we also have relied at certain places that
(new_table != table_name) were always true on Windows and for transactional
tables. Since our fix for the bug brakes this assumption we have to add new
flag to pass this information around.
This code needs to be refactored but I dare not to do this in 5.0.
sql/sql_table.cc:
mysql_alter_table():
Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on
transactional tables corrupt triggers". It turned out that we also have
relied at certain places that (new_table != table_name) were always true
on Windows and for transactional tables. Since our fix for the bug brakes
this assumption we have to add new flag to pass this information around.
This code needs to be refactored but I dare not to do this in 5.0.
into mysql.com:/home/dlenev/mysql-5.1-merges
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/ha_ndbcluster.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
triggers".
Applying ALTER/OPTIMIZE/REPAIR TABLE statements to transactional table or to
table of any type on Windows caused disappearance of its triggers.
Bug was introduced in 5.0.19 by my fix for bug #13525 "Rename table does not
keep info of triggers" (see comment for sql_table.cc for more info).
.
mysql-test/r/trigger.result:
Added test-case covering handling of triggers when one does ALTER TABLE which
should move table to different database.
mysql-test/t/trigger.test:
Added test-case covering handling of triggers when one does ALTER TABLE which
should move table to different database.
sql/sql_table.cc:
mysql_alter_table():
Removal of strdup() which is no longer necessary allows us to preserve
nice assumption that "(new_db != db || new_table != table_name) indicates
that table will be renamed. So now we really can use this condition to
avoid updating trigger definitions when table is not renamed.
Note that we can't use (alter_info->flags & ALTER_RENAME) condition instead
since it can be also true when we do "ALTER TABLE t1 RENAME TO t1".
sql/sql_trigger.cc:
Table_triggers_list::change_table_name():
Mentioned assumption that subject table is not renamed to itself in method
description. Added DBUG_ASSERT() to catch wrong usage of this method.
mysql-test/r/trigger-trans.result:
New BitKeeper file ``mysql-test/r/trigger-trans.result''
mysql-test/t/trigger-trans.test:
New BitKeeper file ``mysql-test/t/trigger-trans.test''
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/m_ctype.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
- make sure cluster/schema table is always created first
sql/ha_ndbcluster_binlog.cc:
make sure cluster/schema table is always created first
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
corrected bug causing hang in getTable when using blob tables
Moved some code to else path to avoid delete, create, delete, create scenarios.
Fixed up the partition info object for some cases where we move from default
partitioning in NDB to default partitioning using partitioning.
sql/sql_partition.cc:
Added a new parameter for partition default handling
This is to avoid calling get_no_parts on tables not yet
created.
Ensure that we don't reuse the old part_info object for
any other operation than CREATE TABLE after reading up
the frm file.
sql/sql_table.cc:
Moved some code to else path to avoid delete, create, delete, create scenarios.
Fixed up the partition info object for some cases where we move from default
partitioning in NDB to default partitioning using partitioning.
Partial fix for resolving the problem. Swapping contents of record[0]
and record[1] since this is what some storage engines expect.
sql/handler.cc:
Adding assertion to get early failure.
sql/log_event.cc:
Correcting code so that new record is passed in record[0] and
old record is passed in record[1] when calling update_row().
mysql-test/r/rpl_row_basic_8partition.result:
New BitKeeper file ``mysql-test/r/rpl_row_basic_8partition.result''
mysql-test/t/rpl_row_basic_8partition.test:
New BitKeeper file ``mysql-test/t/rpl_row_basic_8partition.test''
into shellback.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
sql/sql_error.cc:
Auto merged
mysql-test/mysql-test-run.pl:
SCCS merged
builds.
cmakelists.txt:
Get the correct options for storage engines and defines from
config-version.js.
mysys/cmakelists.txt:
Set USE_TLS only for release builds, as it crashes in debug builds.
sql/cmakelists.txt:
Fix build options to only include the configured storage engines.
sql/mysqld.cc:
Fix dummy innodb declarations, otherwise non-innodb build fails.
storage/bdb/cmakelists.txt:
Create cmakelists.txt for BDB.
win/README:
Update with new configure.js options.
win/config-handlerton.js:
Extend with more storage engines.
win/config-version.js:
Extend to handle storage engines and other configuration parameters.
mysql-test/r/subselect.result:
Fix for bug #18306: MySQL crashes and restarts using subquery
test case
mysql-test/t/subselect.test:
Fix for bug #18306: MySQL crashes and restarts using subquery
test case
sql/opt_range.cc:
Fix for bug #18306: MySQL crashes and restarts using subquery
Restore thd->mem_root because
during the cond->val_int() evaluation we can come across a subselect
item which may allocate memory on the thd->mem_root and assumes
all the memory allocated has the same life span as the subselect
item itself.
into mysql.com:/usr/home/bar/mysql-4.1.b15376
include/m_ctype.h:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
into mysql.com:/usr/home/bar/mysql-5.1-new
mysql-test/r/ctype_ujis.result:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-cp932.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-eucjpms.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
include/m_ctype.h:
After merge fix.
