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.
mysql-test/lib/init_db.sql:
make name not binary, then event names won't be case sensitive
mysql-test/r/events.result:
output fix
mysql-test/r/events_bugs.result:
update result
mysql-test/t/events_bugs.test:
test case for bug #16415 events' names are case sensitive
scripts/mysql_create_system_tables.sh:
make name not binary, then event names won't be case sensitive
scripts/mysql_fix_privilege_tables.sql:
make name not binary, then event names won't be case sensitive
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
still some compiler warnings
storage/ndb/include/util/OutputStream.hpp:
still some compiler warnings
storage/ndb/include/util/SimpleProperties.hpp:
still some compiler warnings
storage/ndb/src/kernel/vm/Pool.hpp:
still some compiler warnings
- 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
rewrite/clean up code a bit to avoid a gcc4 compiler bug
storage/ndb/src/kernel/vm/DLFifoList.hpp:
Fix compiler bug
storage/ndb/src/kernel/vm/DLList.hpp:
Fix compiler bug
storage/ndb/src/kernel/vm/SLList.hpp:
Fix compiler bug
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/lib/mtr_timer.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
Auto merged
storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
Auto merged
storage/ndb/test/run-test/conf-dl145a.txt:
Auto merged
storage/ndb/test/run-test/conf-ndbmaster.txt:
Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
Auto merged
storage/ndb/test/run-test/conf-shark.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge
storage/ndb/src/ndbapi/TransporterFacade.hpp:
merge
storage/ndb/test/run-test/Makefile.am:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
storage/ndb/tools/desc.cpp:
merge
- Make the windows implementation of 'my_dir' behave like the default implementation
mysys/my_lib.c:
If 'findfirst' returns EINVAL, just continue and return 0 files to read in this dir.
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
mysql-test/r/ndb_insert.result:
Auto merged
mysql-test/r/ndb_replace.result:
Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Keeping local and do manual merge
sql/ha_ndbcluster.h:
Keeping local and do hand merge
