into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
sql/sql_acl.cc:
Auto merged
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
- Fix test case for systems with "lowercase names"
mysql-test/r/grant2.result:
Update test result
mysql-test/t/grant2.test:
Fix for system with "lowercase names", allow erro 1007 to be returned
This test is being performed by:
1. ctype_cp932_binlog_row.test and 2. ctype_cp932_binlog_stm.test
Both of these source the file extra/binlog_tests/ctype_cp932_binlog.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
Delete: mysql-test/t/ctype_cp932_notembedded.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3:
Delete: mysql-test/r/ctype_cp932_notembedded.result
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
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
added '_' to allowed tag body symbols
mysql-test/r/xml.result:
Bug#16320 XML: extractvalue() won't accept names containing underscores
test case
mysql-test/t/xml.test:
Bug#16320 XML: extractvalue() won't accept names containing underscores
test case
mysql-test/r/events_slow_query.result:
fix result
mysql-test/t/events_slow_query.test:
create different event because the executor is buggy and won't catch the difference if
the memory address does not change (will be reported as bug separately)
sql/sp_head.cc:
this was an error which passed code review. thd->enable_slow_log could be
changed and it should not be relied
Events: Event-caused statements don't appear in the slow query log
WL#1034
sql/event_executor.cc:
enable slow logging
sql/event_timed.cc:
enable slow logging for the anonymous SP
sql/sp_head.cc:
allow thd->enable_slow_log to be TRUE if only
m_flags & sp_head::LOG_SLOW_STATEMENTS
Because usually enable_slow_log is 1 in user mode, this second
check is needed backup the mode otherwise.
sql/sp_head.h:
add a new constant for slow queries. SP by default does not log slow queries in the
body just the whole CALL could be considered as slow if taking too much time and
called directly from the user
sql/sql_parse.cc:
let us see in the the trace log
configure.in:
Auto merged
client/mysqlimport.c:
Auto merged
include/config-win.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.h:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/mysqldump.test:
SCCS merged
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
Fix URLs.
README:
Fix URL.
mysqltest.result:
Update test result for real_sleep error message.
mysqltest.c:
Fix do_sleep() to print correct command name for real_sleep.
client/mysqltest.c:
Fix do_sleep() to print correct command name for real_sleep.
mysql-test/r/mysqltest.result:
Update test result for real_sleep error message.
mysql-test/README:
Fix URL.
mysql-test/mysql-test-run.sh:
Fix URLs.
- moved initialization of used_partitions
- more tests
+ removed reference to fixed bugs
mysql-test/r/ndb_partition_range.result:
Bug #17499 continued
- more testing
mysql-test/t/disabled.def:
removed reference to fixed bugs
mysql-test/t/ndb_partition_range.test:
Bug #17499 continued
- more testing
sql/ha_ndbcluster.cc:
Bug #17499 continued
- moved initialization of used_partitions
sql/sql_partition.cc:
Bug #17499 continued
- moved initialization of used_partitions
(post-review pre-push changes)
coding style (mostly trailing spaces removed)
mysql-test/r/events.result:
fix result file
sql/event.cc:
- remove trailing spaces
- add a missing initializer (gcc warning)
- C++ to C comments
sql/event_executor.cc:
- fix coding style (C++ to C comments, remove trailing spaces)
- fix wrong indexing buggie not found till now (queue indexing is 0 based,
not 1 based)
sql/event_timed.cc:
- fix coding style
- too little space was allocated for receiving events, partition uses extra column in table
mysql-test/r/ndb_partition_range.result:
Bug#16385, Partitions: crash when updating a range partitioned NDB table
mysql-test/t/ndb_partition_range.test:
Bug#16385, Partitions: crash when updating a range partitioned NDB table
- error string wrongly formatted
mysql-test/r/ndb_partition_error.result:
Bug #17763 mysqld cores with list partitioning if update to missing partition
mysql-test/t/ndb_partition_error.test:
Bug #17763 mysqld cores with list partitioning if update to missing partition
mysql-test/r/events.result:
Auto merged
mysql-test/t/events.test:
Auto merged
sql/event.cc:
Auto merged
sql/event.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
