when REORGANIZE creates new partition, no_subparts for that partition
isn't set right (call handler::set_partitions_defaults always returns 1)
Normally the number of subpartitions should be inherited from the
table.
mysql-test/r/partition.result:
result fixed
mysql-test/t/partition.test:
testcase
sql/sql_partition.cc:
no_subparts is set for newly created partitions
bug #25104
mysys/default.c:
Added /etc/mysql to the search path after /etc.
scripts/mysqld_multi.sh:
Added /etc/mysql to the my.cnf search path.
Changed chop to chomp - since it's smarter.
Pass different msg if waiting on empty queue
sql/event_queue.cc:
Calculate offset for wait time passed to set_timespec instead of
the "absolute time" from execute_at
Pass different msg if waiting on empty queue
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
merge
Yet another test result that needed to be regenerated due to new error
messages. This test only runs via ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row rpl_extraCol_innodb
incorrect handling of commit/ignore error in unique index code
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
1) handle potential ptr error
2) remove incorrect commit-handling in uk code
ndb/src/ndbapi/NdbTransaction.cpp:
1) force 4012
2) handle AO_IgnoreError in uk code
ndb/src/ndbapi/Ndbif.cpp:
force 4012
ndb/test/ndbapi/testIndex.cpp:
test program for 25059
ndb/test/run-test/daily-basic-tests.txt:
add testcase
- Move the specific test case to a separate file that is run only
if we have a disabled handler.
mysql-test/r/warnings.result:
Move the test for warning that table type is changed to separate file
as it only occurs when engine is disabled.
mysql-test/t/warnings.test:
Move the test for warning that table type is changed to separate file
as it only occurs when engine is disabled.
mysql-test/r/warnings_engine_disabled.result:
Move the test for warning that table type is changed to separate file
as it only occurs when engine is disabled.
mysql-test/t/warnings_engine_disabled-master.opt:
New BitKeeper file ``mysql-test/t/warnings_engine_disabled-master.opt''
mysql-test/t/warnings_engine_disabled.test:
Move the test for warning that table type is changed to separate file
as it only occurs when engine is disabled.
make sure apicon timer is reset when setting CS_CONNECTED
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
make sure apicon timer is reset when setting CS_CONNECTED
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysys/typelib.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
into polly.local:/tmp/maint/bug24117/my51-bug24117
mysql-test/t/sp.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
mysql-test/r/sp.result:
Manual merge
Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem
include/my_pthread.h:
Remove merge problem causing "struct timespec" to be declared twice
Add macro "get_timespec_sec" used for retrieving the time in seconds
sql/event_queue.cc:
Use macros for working with "struct timespec"
sql/log_event.cc:
Add casts from "byte*" to "char*"
the UDF
When deleting a user defined function MySQL must remove it from both the
in-memory hash table and the mysql.proc system table.
Finding (and removal therefore) from the internal hash table is case
insensitive (or whatever the default charset is), whereas finding and
removal from the system table is case sensitive.
As a result if you supply a function name that is not in the same character
case to DROP FUNCTION the server will remove the function only from the
in-memory hash table and will keep the row in mysql.proc system table.
This will cause inconsistency between the two structures (that is fixed
only by restarting the server).
Fixed by using the name in the precise case (from the in-memory hash table)
to delete the row in the mysql.proc system table.
mysql-test/r/udf.result:
Bug #15439: UDF name case handling forces DELETE FROM mysql.func to remove
the UDF
- test case
mysql-test/t/udf.test:
Bug #15439: UDF name case handling forces DELETE FROM mysql.func to remove
the UDF
- test case
sql/sql_udf.cc:
Bug #15439: UDF name case handling forces DELETE FROM mysql.func to remove
the UDF
- use the exact function name in deleting from mysql.proc.
