into mysql.com:/usr/home/bar/mysql-5.0
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
sql/sql_string.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
include/m_ctype.h:
After merge fix.
mysql-test/r/ctype_ujis.result:
After merge fix
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
sql/parse_file.cc:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/50-work
mysql-test/lib/mtr_timer.pl:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/Makefile.am:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge
ndb/src/ndbapi/Ndbif.cpp:
merge
ndb/src/ndbapi/TransporterFacade.cpp:
merge
ndb/test/ndbapi/testTimeout.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
ndb/tools/desc.cpp:
merge
After review fix.
Thanks to Gluh for suggestion.
Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error
sql/item_xmlfunc.cc:
After review fix.
Thanks to Gluh for suggestion.
Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error
into mysql.com:/home/bk/b18293-mysql-5.1-new
sql/item.cc:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
Merge with mysql-5.0
- Add protection so that 'show_ssl_get_cipher_list' does not write after end of "buff"
sql/mysqld.cc:
Add check to not write after the end of "buff" when listing the available ciphers
- in ndb_binlog_thread_handle_schema_event make sure to postpone "slock achnowledgement" until event has been put into the binlog
+ some cleanup, Cluster_replication_schem -> Cluster_schema, indentation
Generating character set-independent quoting of strings for the
binary log when executing statements from inside stored procedure.
mysql-test/r/ctype_cp932_binlog.result:
Result change
mysql-test/t/ctype_cp932_binlog.test:
Adding check that string literals are written correctly for multi-byte
character sets.
sql/item.cc:
Cutting out character set-independent string escaping code and putting it
in a separate function.
sql/log_event.cc:
Adding characters set-independent code to separate function.
sql/mysql_priv.h:
Adding new function.
sql/sp_head.cc:
Escaping string value representing a string item.
configure.in:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/information_schema_db.result:
Auto merged
mysql-test/r/query_cache_notembedded.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/query_cache_notembedded.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
sql/ha_innodb.cc:
manual merge
sql/sql_insert.cc:
manual merge
- Update for 5.1
- Add "have_dlopen"
- Remove requirement to load udf's only in "opt_plugin_dir"
include/my_global.h:
Remove duplicate defines
mysql-test/include/have_udf.inc:
Use "have_dlopen" to check if we "have udf"
mysql-test/r/have_udf.require:
Use "have_dlopen" to check if we "have udf"
mysql-test/r/udf.result:
Update for new error message "function"->"symbol"
sql/item_func.cc:
Remove "evil" dbug printour that checks args[0] even if arg_count is 0
sql/mysql_priv.h:
Add "have_dlopen"
sql/mysqld.cc:
Add "have_dlopen"
Move HAVE_DLOPEN defined to only surround "udf_free" and "udf_init"
sql/set_var.cc:
Add "have_dlopen"
sql/sql_plugin.cc:
Surround 'dlclose' with HAVE_DLOPEN
sql/sql_udf.cc:
Remove the requirement to load udf's only from "opt_plugin_dir".
Fix spelling error
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_partition.cc:
manual merge
into neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
into neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/ndb_partition_key.result:
manual merge
mysql-test/t/ndb_partition_key.test:
manual merge
Added new syntax ALTER TABLE t1 REMOVE PARTITIONING,
changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning
Fix a number of mix engine bugs in partitioning
mysql-test/r/ndb_partition_key.result:
Added a number of new test cases
mysql-test/r/partition.result:
Added a number of new test cases
mysql-test/t/ndb_partition_key.test:
Added a number of new test cases
mysql-test/t/partition.test:
Added a number of new test cases
sql/lex.h:
REMOVE and PARTITIONING added as keywords in parser
sql/sql_lex.h:
Added flag to alter_info flag
sql/sql_partition.cc:
Fixes for the new syntax, changes of the current semantics of the syntax.
Fixes for errors in handling mixes of table handlers in partitioning syntax
for ALTER TABLE
sql/sql_table.cc:
Bug fix
sql/sql_yacc.yy:
New syntax for REMOVE PARTITIONING
into neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/Makefile.am:
Merge
sql/share/errmsg.txt:
Merge
sql/sql_udf.cc:
Merge
added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()
mysql-test/r/partition.result:
Fix for bug#15336 Partitions: crash if create table as select
test case
mysql-test/t/partition.test:
Fix for bug#15336 Partitions: crash if create table as select
test case
use part_info->item_free_list instead of thd->free_list during partition function parsing
mysql-test/r/partition.result:
Bug#14367 Partitions: crash if utf8 column
test case
mysql-test/t/partition.test:
Bug#14367 Partitions: crash if utf8 column
test case
sql/item.cc:
Bug#14367 Partitions: crash if utf8 column
create copy of string in current mem_root to avoid memory leak
XPath without a XPath syntax error
item_xmlfunc.cc:
Error message didn't happen because after
a failing attempt to parse RelativeLocationPath,
my_xpath_parse_AbsoluteLocationPath() returned success.
Changeing logic a bit:
- Try to parse EOF first, return success if true.
- Then try to parse RelativeLocationPath(), return success if true.
- Otherwise return failure.
xml.result:
Adding test case.
Also, this change made it possible to generate
an error message earlier in the case of another
bad XPATH syntax.
xml.test:
Adding test case.
sql/item_xmlfunc.cc:
Bug #18172 XML: Extractvalue() accepts mallformed XPath without a XPath syntax error
Error message didn't happen because after
a failing attempt to parse RelativeLocationPath(),
my_xpath_parse_AbsoluteLocationPath() returned with 1.
Changeing logic a bit: check for EOF first.
Then try to parse RelativeLocationPath().
If the latter fails, return failure.
mysql-test/t/xml.test:
Adding test case.
mysql-test/r/xml.result:
Adding test case.
Also, this change makes error message
to be generated earlier in the case of another
bad XPATH syntax.
table.cc:
Fixing to use system_charset_info instead of default_charset_info.
Crash happened because the "ctype" array is empty in UCS2,
and thus cannot be used with my_isspace().
The reason why UCS2 appeared in this context was because of
of default_charset_info variable incorrectly substituted to my_isspace().
As functions check_db_name(), check_table_name() and check_column_name()
always get values in utf8, system_charset_info must be used instead.
ctype_ucs2_def.test, ctype_ucs2_def-master.opt, ctype_ucs2_def.result:
new file
sql/table.cc:
Bug#18004 Connecting crashes server when default charset is UCS2
Use of default_charset_info was wrong.
Functions check_db_name, check_table_name and check_column_name
get values of system_charset_info character set (utf8).
additional check for subselect
mysql-test/r/information_schema.result:
Fix for bug#18224 VIEW on information_schema crashes the server
test case
mysql-test/t/information_schema.test:
Fix for bug#18224 VIEW on information_schema crashes the server
test case
Crash happened when one selected data from one of INFORMATION_SCHEMA
tables and in order to build its contents server had to open view which
used stored function and table or view on which one had not global or
database-level privileges (e.g. had only table-level or had no
privileges at all).
The crash was caused by usage of check_grant() function, which assumes
that either number of tables to be inspected by it is limited explicitly
or table list used and thd->lex->query_tables_own_last value correspond
to each other (the latter should be either 0 or point to next_global
member of one of elements of this table list), in conditions when
above assumptions were not true. This fix just explicitly limits
number of tables to be inspected. Other negative effects which are
caused by the fact that thd->lex->query_tables_own_last might not
be set properly during processing of I_S tables are less disastrous
and will be reported and fixed separetely.
mysql-test/r/information_schema_db.result:
Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
test case
mysql-test/t/information_schema_db.test:
Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
test case
sql/sql_acl.cc:
added note
