- Port ha_tina.cc to run on windows
include/my_sys.h:
Add define for MAP_PRIVATE, to be used in my_mmap to decide what kind of map to open.
mysys/my_mmap.c:
Remove unused flProtect
Look at "prot" argument when deciding if map should be read or write.
storage/csv/ha_tina.cc:
Remove "include <sys/mman.h>", use the defines and functions from mysys
Add cast to byte* when calling 'my_write'
Add cast to char* when calling 'buffer.set'
munmap the file before setting it's size, my_chsize will fail if file is mapped.
storage/csv/ha_tina.h:
Remove "typedef" since no name is defined and "tina_set" is used in the code
into shellback.(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
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
add testprg for SR case aswell
ndb/test/ndbapi/testNodeRestart.cpp:
Test also partitioned start during SR
ndb/test/run-test/daily-basic-tests.txt:
Test also partitioned start during SR
config/ac-macros/yassl.m4:
typo
libmysql/Makefile.am:
move common code to Makefile.shared
libmysql/Makefile.shared:
move common code to Makefile.shared
libmysql_r/Makefile.am:
move common code to Makefile.shared
post weeked fixes :-)
change impl. to use READ_NODESREQ to query state of other qmgr(partition)
this as it has no (current) side effects, so that it's possible only to kill
starting cluster (if one started and one starting)
ndb/include/kernel/signaldata/FailRep.hpp:
Add paritioned FAIL_REP
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/test/ndbapi/testNodeRestart.cpp:
Require that only starting cluster dies
cmakelists.txt:
Move configure processing to top-level cmakelists.txt so that it can be
shared by mysqld and libmysqld.
libmysqld/lib_sql.cc:
Temporary #ifdef to allow building from both bitkeeper sources and windows source package.
libmysqld/libmysqld.def:
Add export missing for test_libmysqld
sql/cmakelists.txt:
Move configure processing to top-level cmakelists.txt so that it can be
shared by mysqld and libmysqld.
sql/mysqld.cc:
#ifdef out code that is not used, nor compiles, in embedded server.
strings/cmakelists.txt:
Add some missing sources to fix embedded server build.
Changed web address order.mysql.com to shop.mysql.com
netware/mysql_install_db.c:
Changed web address order.mysql.com to shop.mysql.com
Docs/MySQLEULA.txt:
Changed web address order.mysql.com to shop.mysql.com
scripts/mysql_install_db.sh:
Changed web address order.mysql.com to shop.mysql.com
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/field.cc:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
strings/ctype-ucs2.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
Multiple equalities were not adjusted after reading constant tables.
It resulted in neglecting good index based methods that could be
used to access of other tables.
mysql-test/r/having.result:
Adjusted a test case results after fix for bug #16504.
mysql-test/r/select.result:
Added a test case for bug #16504.
mysql-test/r/subselect.result:
Adjusted a test case results after fix for bug #16504.
mysql-test/r/varbinary.result:
Adjusted a test case results after fix for bug #16504.
mysql-test/t/select.test:
Added a test case for bug #16504.
sql/item.cc:
Fixed bug #16504.
An Item_equal object may contain only a constant member.
It may happen after reading constant tables.
sql/item_cmpfunc.cc:
Fixed bug #16504.
Added method Item_equal::check_const that check appearance of new
constant items in a multiple equality.
sql/item_cmpfunc.h:
Fixed bug #16504.
Added method Item_equal::check_const that check appearance of new
constant items in a multiple equality.
sql/sql_select.cc:
Fixed bug #16504.
Adjusted multiple equalities after reading constant tables.
Fixed a few typo in comments.
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
support-files/mysql.spec.sh:
Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
mysql-test/Makefile.am:
Let "make install" install mysql-test-run.pl
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
and search the given include directory first (bug#18369)
config/ac-macros/zlib.m4:
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
and search the given include directory first (bug#18369)
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
and search the given include directory first (bug#18369)
acinclude.m4:
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
and search the given include directory first (bug#18369)
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
VC++Files/libmysqld/libmysqld.vcproj:
Auto merged
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
