into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/binary.result:
Auto merged
mysql-test/r/case.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/events.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_02myisam.result:
Auto merged
mysql-test/r/partition_mgm_err.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/archive_gis.result:
Merge bug10460
mysql-test/r/bdb_gis.result:
Merge bug10460
mysql-test/r/func_system.result:
Merge bug10460
mysql-test/r/innodb_gis.result:
Merge bug10460
mysql-test/r/ndb_gis.result:
Merge bug10460
The update log itself was removed back in 5.0. Recommit
with post-review fixes.
sql/log.cc:
OPTION_UPDATE_LOG was set in all threads but replication ones.
So, it seems that the check filtered out slow log records from
replication threads. Now we do it with explicit check.
sql/mysql_priv.h:
remove unused define
sql/mysqld.cc:
Do not set OPTION_UPDATE_LOG. It is not used anymore.
sql/set_var.cc:
We never check for OPTION_UPDATE_LOG. So, we should not bother setting it.
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
VC++Files/mysql.sln:
Manual merge (use local).
configure.in:
Manual merge.
sql/table.cc:
Manual merge.
(ASCII space). For Bug#16857.
sql/field_conv.cc:
Bug#16857: Do not expand BINARY fields as if they are strings (which
presumably /should/ be filled with spaces). Instead, fill BINARY fields
with 0x00 bytes.
time per connection
Removed const_string() method from Item_string (it was only used in one
place, in a bad way). Defer possible SP variable, and access data directly
instead, in date_format item.
mysql-test/r/sp.result:
Updated results for new test (BUG#17476).
mysql-test/t/sp.test:
New test case (BUG#17476)
sql/item.h:
Removed const_string() from Item_string.
It was only used in one place, and we can just use str_value in Item directly.
sql/item_timefunc.cc:
Must defer a (possible) local SP variable to use max_length and str_value
in Item_func_date_format::fix_length_and_dec(), and refer to str_value
directly without the const_string() method (now removed); the cast didn't
work in all cases anyway.
xml.result, xml.test:
Adding test case.
item_xmlfunc.cc:
Fixed that Item_nodeset_func derived classes
didn't take into account charset of the XML value
and always worked using "binary" charset.
sql/item_xmlfunc.cc:
Bug#16316: XML: extractvalue() is case-sensitive with contains()
Fixed that Item_nodeset_func derived classes
didn't take into account charset of the XML value
and always worked using "binary" charset.
mysql-test/t/xml.test:
Adding test case.
mysql-test/r/xml.result:
Adding test case.
sql_partition.cc:
Changeing THD charset to utf8 when parsing a frm file.
partition_charset.test, partition_charset.result:
new file
sql/sql_partition.cc:
Bug#14527: Partitions: table unreadable if partition name = c-cedilla
Changering THD charset to utf8 when parsing
a frm file.
into mysql.com:/usr/home/bar/mysql-5.1-new.16315
sql/item_xmlfunc.cc:
Auto merged
mysql-test/r/xml.result:
After merge fix
mysql-test/t/xml.test:
After merge fix
- redo log table query for log, split into separate entries per rename, to avoid duplicates, also to only log renames that relate to ndb tables
sql/ha_ndbcluster_binlog.h:
Bug #17827 cluster: rename of several tables in one statement, gets multiply logged
WL#1034
mysql-test/t/events_logs_tests-master.opt:
Rename: mysql-test/t/events_slow_query-master.opt -> mysql-test/t/events_logs_tests-master.opt
sql/event_timed.cc:
ask the anonymous SP to log general statements
sql/sp_head.cc:
save the OPTION_LOG_OFF and restore it after execution
sql/sp_head.h:
add a new flag for general log
mysql-test/r/events_logs_tests.result:
update result file
mysql-test/t/events_logs_tests.test:
add test for general log
Bug #17806 Update on NDB table with list partition causes mysqld to core
- modified complemented_pk_read to be complemented_read, and handle also hidden key
mysql-test/r/ndb_partition_range.result:
Bug #16385 Partitions: crash when updating a range partitioned NDB table
Bug #17806 Update on NDB table with list partition causes mysqld to core
mysql-test/t/ndb_partition_range.test:
Bug #16385 Partitions: crash when updating a range partitioned NDB table
Bug #17806 Update on NDB table with list partition causes mysqld to core
sql/ha_ndbcluster.h:
Bug #16385 Partitions: crash when updating a range partitioned NDB table
Bug #17806 Update on NDB table with list partition causes mysqld to core
- Change to use non blocking read to empty channel in case of too large sd number
- Don't check for too large socket number on Windows.
sql/net_serv.cc:
Windows does not need protection from sd >= FD_SETSIZE, it uses an array to store the sd's it should read from.
Change the handler for when "net_data_is_ready" returns -1 to perform nonblocking read to empty the net.
Only include that handler if HAVE_POLL is not defined and not windows
mysql-test/r/bigint.result:
test result
mysql-test/t/bigint.test:
testcase
sql/item.h:
unsigned_arg is a separate parameter now
sql/item_cmpfunc.cc:
we can get unsigned field from the signed Item - from string
like '1234'
xml.result, xml.test:
Adding test case.
item_xmlfunc.cc:
Adding a special function to handle "self" axis.
Previously "child" and "self" were handled the same.
sql/item_xmlfunc.cc:
Bug#16315 XML: extractvalue() handles self badly
Adding a special function to handle "self" axis.
Previously "child" and "self" were handled the same.
mysql-test/t/xml.test:
Adding test case.
mysql-test/r/xml.result:
Adding test case.
store copy of partition function string
mysql-test/r/partition.result:
Fix for bug#14363 Partitions: failure if create in stored procedure
test case
mysql-test/t/partition.test:
Fix for bug#14363 Partitions: failure if create in stored procedure
test case
