3163 Georgi Kodinov 2010-08-05 [merge]
merge
modified:
include/myisam.h
include/mysql/plugin.h
mysql-test/collections/default.experimental
mysql-test/r/subselect4.result
mysql-test/t/subselect4.test
mysys/my_getopt.c
sql/events.cc
sql/events.h
sql/item_cmpfunc.cc
sql/mysqld.cc
sql/mysqld.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_plugin.cc
sql/sys_vars.h
storage/example/ha_example.cc
storage/myisam/mi_static.c
3162 Alexander Nozdrin 2010-08-04 [merge]
Auto-merge from mysql-5.5.
removed:
include/config-win.h
include/my_trie.h
include/my_vle.h
libmysql/dll.c
mysql-test/r/raid.result
mysys/default_modify.c
mysys/make-conf.c
mysys/mf_wfile.c
mysys/my_append.c
mysys/my_clock.c
mysys/my_dup.c
mysys/my_net.c
mysys/my_vle.c
mysys/test_fn.c
mysys/trie.c
sql/sql_map.cc
sql/sql_map.h
sql/sql_olap.cc
strings/bmove512.c
strings/bmove_upp-sparc.s
strings/r_strinstr.c
strings/strappend-sparc.s
strings/strend-sparc.s
strings/strings-not-used.h
strings/strinstr-sparc.s
strings/strinstr.c
strings/strmake-sparc.s
strings/strmov-sparc.s
strings/strnmov-sparc.s
strings/strstr-sparc.s
strings/strxmov-sparc.s
added:
mysql-test/r/merge_mmap.result
mysql-test/suite/innodb/r/innodb_bug52199.result
mysql-test/suite/innodb/r/innodb_bug54679.result
mysql-test/suite/innodb/t/innodb_bug52199.test
mysql-test/suite/innodb/t/innodb_bug54679.test
mysql-test/suite/perfschema/include/upgrade_check.inc
mysql-test/suite/perfschema/t/selects-master.opt
mysql-test/t/merge_mmap-master.opt
mysql-test/t/merge_mmap.test
packaging/Makefile.am
packaging/WiX/custom_ui.wxs
sql/sql_hset.h
renamed:
BUILD/choose_configure.sh => BUILD/cmake_configure.sh
modified:
.bzr-mysql/default.conf
.bzrignore
BUILD/FINISH.sh
BUILD/Makefile.am
BUILD/SETUP.sh
BUILD/autorun.sh
CMakeLists.txt
Makefile.am
client/Makefile.am
client/mysql.cc
client/mysqltest.cc
cmake/os/WindowsCache.cmake
config.h.cmake
config/ac-macros/character_sets.m4
configure.cmake
configure.in
extra/replace.c
extra/resolve_stack_dump.c
extra/yassl/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt
include/Makefile.am
include/atomic/gcc_builtins.h
include/atomic/nolock.h
include/atomic/solaris.h
include/atomic/x86-gcc.h
include/lf.h
include/m_string.h
include/my_atomic.h
include/my_attribute.h
include/my_bit.h
include/my_bitmap.h
include/my_global.h
include/my_net.h
include/my_nosys.h
include/my_sys.h
include/myisam.h
include/mysql_embed.h
include/thr_lock.h
libmysql/Makefile.am
libmysql/Makefile.shared
libmysql/errmsg.c
libmysql/libmysql.c
libmysql_r/Makefile.am
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
mysql-test/collections/default.experimental
mysql-test/include/handler.inc
mysql-test/lib/v1/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/archive.result
mysql-test/r/handler_innodb.result
mysql-test/r/handler_myisam.result
mysql-test/r/heap_hash.result
mysql-test/r/innodb_mysql_lock.result
mysql-test/r/innodb_mysql_sync.result
mysql-test/r/mdl_sync.result
mysql-test/r/merge.result
mysql-test/r/partition_debug_sync.result
mysql-test/r/schema.result
mysql-test/r/show_check.result
mysql-test/r/signal.result
mysql-test/r/signal_demo3.result
mysql-test/r/sp-big.result
mysql-test/r/sp-bugs.result
mysql-test/r/sp-code.result
mysql-test/r/sp-error.result
mysql-test/r/sp.result
mysql-test/r/sp_trans.result
mysql-test/r/strict.result
mysql-test/r/temp_table.result
mysql-test/r/variables.result
mysql-test/r/view.result
mysql-test/suite/federated/federated_server.result
mysql-test/suite/federated/federated_server.test
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/innodb/r/innodb_information_schema.result
mysql-test/suite/perfschema/r/query_cache.result
mysql-test/suite/perfschema/r/selects.result
mysql-test/suite/perfschema/r/server_init.result
mysql-test/suite/perfschema/t/bad_option_1.test
mysql-test/suite/perfschema/t/bad_option_2.test
mysql-test/suite/perfschema/t/global_read_lock.test
mysql-test/suite/perfschema/t/pfs_upgrade.test
mysql-test/suite/perfschema/t/privilege.test
mysql-test/suite/perfschema/t/query_cache.test
mysql-test/suite/perfschema/t/read_only.test
mysql-test/suite/perfschema/t/selects.test
mysql-test/suite/perfschema/t/server_init.test
mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
mysql-test/suite/rpl/r/rpl_row_sp005.result
mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
mysql-test/suite/rpl/r/rpl_row_trig003.result
mysql-test/suite/rpl/t/rpl_sync-slave.opt
mysql-test/t/alter_table.test
mysql-test/t/archive.test
mysql-test/t/heap_hash.test
mysql-test/t/innodb_mysql_lock.test
mysql-test/t/innodb_mysql_sync.test
mysql-test/t/mdl_sync.test
mysql-test/t/merge-big.test
mysql-test/t/merge.test
mysql-test/t/partition_debug_sync.test
mysql-test/t/schema.test
mysql-test/t/show_check.test
mysql-test/t/signal.test
mysql-test/t/sp-code.test
mysql-test/t/sp-error.test
mysql-test/t/sp.test
mysql-test/t/temp_table.test
mysql-test/t/variables.test
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/checksum.c
mysys/default.c
mysys/lf_alloc-pin.c
mysys/lf_hash.c
mysys/mf_iocache.c
mysys/mf_iocache2.c
mysys/mf_keycache.c
mysys/my_atomic.c
mysys/my_bit.c
mysys/my_bitmap.c
mysys/my_handler.c
mysys/my_init.c
mysys/my_pthread.c
mysys/my_static.c
mysys/my_static.h
mysys/rijndael.c
mysys/test_charset.c
mysys/thr_alarm.c
mysys/thr_lock.c
packaging/WiX/CMakeLists.txt
packaging/WiX/CPackWixConfig.cmake
packaging/WiX/create_msi.cmake.in
packaging/WiX/extra.wxs.in
packaging/WiX/mysql_server.wxs.in
regex/regcomp.c
regex/regcomp.ih
scripts/make_win_bin_dist
sql/CMakeLists.txt
sql/Makefile.am
sql/event_data_objects.cc
sql/event_db_repository.cc
sql/event_db_repository.h
sql/events.cc
sql/field.cc
sql/field.h
sql/field_conv.cc
sql/filesort.cc
sql/gen_lex_hash.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/hostname.cc
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_geofunc.cc
sql/item_subselect.h
sql/lock.cc
sql/lock.h
sql/log.cc
sql/log.h
sql/log_event.cc
sql/mdl.cc
sql/mdl.h
sql/mysqld.cc
sql/mysqld.h
sql/nt_servc.cc
sql/protocol.cc
sql/repl_failsafe.cc
sql/repl_failsafe.h
sql/rpl_record.cc
sql/rpl_rli.cc
sql/set_var.cc
sql/set_var.h
sql/slave.cc
sql/sp.cc
sql/sp_head.cc
sql/sp_head.h
sql/sp_pcontext.h
sql/sp_rcontext.cc
sql/sp_rcontext.h
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_base.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_cursor.cc
sql/sql_cursor.h
sql/sql_db.cc
sql/sql_db.h
sql/sql_delete.cc
sql/sql_do.cc
sql/sql_error.cc
sql/sql_error.h
sql/sql_handler.cc
sql/sql_help.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_parse.h
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_priv.h
sql/sql_rename.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_servers.cc
sql/sql_show.cc
sql/sql_signal.cc
sql/sql_table.cc
sql/sql_table.h
sql/sql_trigger.cc
sql/sql_truncate.cc
sql/sql_udf.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/sys_vars.cc
sql/table.cc
sql/transaction.cc
sql/tztime.cc
sql/udf_example.c
storage/archive/azio.c
storage/archive/ha_archive.cc
storage/archive/ha_archive.h
storage/csv/ha_tina.cc
storage/federated/ha_federated.cc
storage/heap/ha_heap.cc
storage/heap/hp_test2.c
storage/innobase/CMakeLists.txt
storage/innobase/btr/btr0btr.c
storage/innobase/btr/btr0cur.c
storage/innobase/btr/btr0sea.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0flu.c
storage/innobase/buf/buf0lru.c
storage/innobase/data/data0data.c
storage/innobase/data/data0type.c
storage/innobase/dict/dict0boot.c
storage/innobase/dict/dict0crea.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0load.c
storage/innobase/dict/dict0mem.c
storage/innobase/fil/fil0fil.c
storage/innobase/fsp/fsp0fsp.c
storage/innobase/ha/ha0ha.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/i_s.cc
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/btr0btr.h
storage/innobase/include/btr0btr.ic
storage/innobase/include/btr0cur.h
storage/innobase/include/btr0sea.h
storage/innobase/include/buf0buf.h
storage/innobase/include/data0data.h
storage/innobase/include/data0data.ic
storage/innobase/include/data0type.h
storage/innobase/include/data0type.ic
storage/innobase/include/dict0boot.h
storage/innobase/include/dict0boot.ic
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0dict.ic
storage/innobase/include/dict0load.h
storage/innobase/include/dict0mem.h
storage/innobase/include/dict0mem.ic
storage/innobase/include/dict0types.h
storage/innobase/include/fil0fil.h
storage/innobase/include/lock0lock.h
storage/innobase/include/log0log.ic
storage/innobase/include/mach0data.h
storage/innobase/include/mach0data.ic
storage/innobase/include/mtr0log.h
storage/innobase/include/mtr0log.ic
storage/innobase/include/mtr0mtr.h
storage/innobase/include/os0file.h
storage/innobase/include/os0sync.h
storage/innobase/include/os0sync.ic
storage/innobase/include/page0page.h
storage/innobase/include/page0page.ic
storage/innobase/include/pars0pars.h
storage/innobase/include/que0que.h
storage/innobase/include/read0read.h
storage/innobase/include/read0read.ic
storage/innobase/include/rem0rec.h
storage/innobase/include/rem0rec.ic
storage/innobase/include/row0mysql.h
storage/innobase/include/row0upd.h
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0sync.h
storage/innobase/include/trx0i_s.h
storage/innobase/include/trx0rec.h
storage/innobase/include/trx0rec.ic
storage/innobase/include/trx0sys.h
storage/innobase/include/trx0sys.ic
storage/innobase/include/trx0trx.h
storage/innobase/include/trx0trx.ic
storage/innobase/include/trx0types.h
storage/innobase/include/trx0undo.h
storage/innobase/include/trx0undo.ic
storage/innobase/include/univ.i
storage/innobase/include/ut0byte.h
storage/innobase/include/ut0byte.ic
storage/innobase/include/ut0rnd.h
storage/innobase/include/ut0rnd.ic
storage/innobase/lock/lock0lock.c
storage/innobase/log/log0log.c
storage/innobase/log/log0recv.c
storage/innobase/mach/mach0data.c
storage/innobase/mtr/mtr0log.c
storage/innobase/mtr/mtr0mtr.c
storage/innobase/os/os0file.c
storage/innobase/os/os0sync.c
storage/innobase/os/os0thread.c
storage/innobase/page/page0page.c
storage/innobase/page/page0zip.c
storage/innobase/pars/pars0pars.c
storage/innobase/read/read0read.c
storage/innobase/row/row0ins.c
storage/innobase/row/row0merge.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0purge.c
storage/innobase/row/row0row.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0uins.c
storage/innobase/row/row0umod.c
storage/innobase/row/row0undo.c
storage/innobase/row/row0upd.c
storage/innobase/row/row0vers.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0arr.c
storage/innobase/sync/sync0sync.c
storage/innobase/trx/trx0i_s.c
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0rec.c
storage/innobase/trx/trx0roll.c
storage/innobase/trx/trx0rseg.c
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0trx.c
storage/innobase/trx/trx0undo.c
storage/innobase/ut/ut0byte.c
storage/myisam/ft_boolean_search.c
storage/myisam/ft_nlq_search.c
storage/myisam/ft_parser.c
storage/myisam/ft_update.c
storage/myisam/mi_check.c
storage/myisam/mi_create.c
storage/myisam/mi_delete_table.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_key.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_packrec.c
storage/myisam/mi_rename.c
storage/myisam/mi_static.c
storage/myisam/mi_statrec.c
storage/myisam/mi_test1.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/mi_unique.c
storage/myisam/mi_write.c
storage/myisam/myisam_ftdump.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisam/rt_test.c
storage/myisam/sp_key.c
storage/myisam/sp_test.c
storage/myisammrg/ha_myisammrg.cc
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
storage/ndb/include/util/ndb_opts.h
storage/ndb/src/cw/cpcd/main.cpp
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
storage/ndb/src/kernel/vm/Configuration.cpp
storage/ndb/src/mgmclient/main.cpp
storage/ndb/src/mgmsrv/main.cpp
storage/ndb/src/ndbapi/TransporterFacade.hpp
storage/ndb/test/ndbapi/testIndexStat.cpp
storage/ndb/test/ndbapi/test_event_merge.cpp
storage/ndb/test/ndbapi/test_event_multi_table.cpp
storage/ndb/test/run-test/main.cpp
storage/ndb/test/src/NDBT_Test.cpp
storage/ndb/test/tools/connect.cpp
storage/ndb/tools/delete_all.cpp
storage/ndb/tools/desc.cpp
storage/ndb/tools/drop_index.cpp
storage/ndb/tools/drop_tab.cpp
storage/ndb/tools/listTables.cpp
storage/ndb/tools/ndb_config.cpp
storage/ndb/tools/restore/restore_main.cpp
storage/ndb/tools/select_all.cpp
storage/ndb/tools/select_count.cpp
storage/ndb/tools/waiter.cpp
storage/perfschema/pfs_events_waits.cc
strings/CMakeLists.txt
strings/Makefile.am
strings/bfill.c
strings/bmove.c
strings/bmove_upp.c
strings/ctype-simple.c
strings/ctype-ucs2.c
strings/do_ctype.c
strings/str_test.c
strings/strcend.c
strings/strend.c
strings/string.doc
strings/strings-x86.s
strings/strmov.c
tests/mysql_client_test.c
tests/thread_test.c
unittest/mysys/my_atomic-t.c
unittest/mytap/tap.c
=== modified file 'include/myisam.h'
--- a/include/myisam.h 2010-07-23 20:15:07 +0000
+++ b/include/myisam.h 2010-08-05 12:34:19 +0000
@@ -249,7 +249,7 @@ typedef struct st_columndef /* column i
extern char * myisam_log_filename; /* Name of logfile */
extern ulong myisam_block_size;
-extern uint myisam_concurrent_insert;
+extern ulong myisam_concurrent_insert;
extern my_bool myisam_flush,myisam_delay_key_write,myisam_single_user;
extern my_off_t myisam_max_temp_length;
extern ulong myisam_data_pointer_size;
=== modified file 'include/mysql/plugin.h'
--- a/include/mysql/plugin.h 2010-08-03 16:21:13 +0000
+++ b/include/mysql/plugin.h 2010-08-05 12:34:19 +0000
@@ -327,7 +327,7 @@ DECLARE_MYSQL_SYSVAR_SIMPLE(name, unsign
#name, comment, check, update, &varname, def, min, max, blk }
#define MYSQL_SYSVAR_ENUM(name, varname, opt, comment, check, update, def, typelib) \
-DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned int) = { \
+DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned long) = { \
PLUGIN_VAR_ENUM | ((opt) & PLUGIN_VAR_MASK), \
#name, comment, check, update, &varname, def, typelib }
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2010-08-04 08:18:32 +0000
+++ b/mysql-test/collections/default.experimental 2010-08-05 12:34:19 +0000
@@ -19,7 +19,6 @@ main.mysqlbinlog_row @solaris
main.mysqlbinlog_row_innodb @solaris # Bug#52202 2010-03-22 alik mysqlbinlog_row* fail in daily-trunk on Sol10 x86_64 debug_max
main.mysqlbinlog_row_myisam @solaris # Bug#52202 2010-03-22 alik mysqlbinlog_row* fail in daily-trunk on Sol10 x86_64 debug_max
main.outfile_loaddata @solaris # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
-main.plugin* @solaris # Bug#47146 Linking problem with example plugin when dtrace enabled
main.signal_demo3 @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
main.sp @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
main.type_float @freebsd # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
@@ -32,7 +31,6 @@ rpl.rpl_heartbeat_2slaves
rpl.rpl_innodb_bug28430* # Bug#46029
rpl.rpl_innodb_bug30888* @solaris # Bug#47646 2009-09-25 alik rpl.rpl_innodb_bug30888 fails sporadically on Solaris
rpl.rpl_killed_ddl @windows # Bug#47638 2010-01-20 alik The rpl_killed_ddl test fails on Windows
-rpl.rpl_plugin_load* @solaris # Bug#47146
rpl.rpl_row_sp011* @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
=== modified file 'mysql-test/r/subselect4.result'
--- a/mysql-test/r/subselect4.result 2010-06-23 06:13:34 +0000
+++ b/mysql-test/r/subselect4.result 2010-08-05 12:34:19 +0000
@@ -60,6 +60,27 @@ FROM t3 WHERE 1 = 0 GROUP BY 1;
DROP TABLE t1,t2,t3;
End of 5.0 tests.
#
+# Bug#54568: create view cause Assertion failed: 0,
+# file .\item_subselect.cc, line 836
+#
+EXPLAIN SELECT 1 LIKE ( 1 IN ( SELECT 1 ) );
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used
+Warnings:
+Note 1249 Select 2 was reduced during optimization
+DESCRIBE SELECT 1 LIKE ( 1 IN ( SELECT 1 ) );
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used
+Warnings:
+Note 1249 Select 2 was reduced during optimization
+# None of the below should crash
+CREATE VIEW v1 AS SELECT 1 LIKE ( 1 IN ( SELECT 1 ) );
+CREATE VIEW v2 AS SELECT 1 LIKE '%' ESCAPE ( 1 IN ( SELECT 1 ) );
+DROP VIEW v1, v2;
+#
+# End of 5.1 tests.
+#
+#
# Bug#53236 Segfault in DTCollation::set(DTCollation&)
#
CREATE TABLE t1 (
=== modified file 'mysql-test/t/subselect4.test'
--- a/mysql-test/t/subselect4.test 2010-06-23 06:13:34 +0000
+++ b/mysql-test/t/subselect4.test 2010-08-05 12:34:19 +0000
@@ -64,6 +64,22 @@ DROP TABLE t1,t2,t3;
--echo End of 5.0 tests.
--echo #
+--echo # Bug#54568: create view cause Assertion failed: 0,
+--echo # file .\item_subselect.cc, line 836
+--echo #
+EXPLAIN SELECT 1 LIKE ( 1 IN ( SELECT 1 ) );
+DESCRIBE SELECT 1 LIKE ( 1 IN ( SELECT 1 ) );
+--echo # None of the below should crash
+CREATE VIEW v1 AS SELECT 1 LIKE ( 1 IN ( SELECT 1 ) );
+CREATE VIEW v2 AS SELECT 1 LIKE '%' ESCAPE ( 1 IN ( SELECT 1 ) );
+DROP VIEW v1, v2;
+
+
+--echo #
+--echo # End of 5.1 tests.
+--echo #
+
+--echo #
--echo # Bug#53236 Segfault in DTCollation::set(DTCollation&)
--echo #
=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c 2010-08-03 16:21:13 +0000
+++ b/mysys/my_getopt.c 2010-08-05 12:34:19 +0000
@@ -611,16 +611,16 @@ static int setval(const struct my_option
Accept an integer representation of the enumerated item.
*/
char *endptr;
- uint arg= (uint) strtoul(argument, &endptr, 10);
+ ulong arg= strtoul(argument, &endptr, 10);
if (*endptr || arg >= opts->typelib->count)
{
res= EXIT_ARGUMENT_INVALID;
goto ret;
}
- *(uint*)value= arg;
+ *(ulong*)value= arg;
}
else
- *(uint*)value= type - 1;
+ *(ulong*)value= type - 1;
}
break;
case GET_SET:
@@ -1016,7 +1016,7 @@ static void init_one_value(const struct
*((int*) variable)= (int) getopt_ll_limit_value((int) value, option, NULL);
break;
case GET_ENUM:
- *((uint*) variable)= (uint) value;
+ *((ulong*) variable)= (ulong) value;
break;
case GET_UINT:
*((uint*) variable)= (uint) getopt_ull_limit_value((uint) value, option, NULL);
@@ -1292,7 +1292,7 @@ void my_print_variables(const struct my_
printf("\n");
break;
case GET_ENUM:
- printf("%s\n", get_type(optp->typelib, *(uint*) value));
+ printf("%s\n", get_type(optp->typelib, *(ulong*) value));
break;
case GET_STR:
case GET_STR_ALLOC: /* fall through */
=== modified file 'sql/events.cc'
--- a/sql/events.cc 2010-07-27 10:25:53 +0000
+++ b/sql/events.cc 2010-08-05 12:34:19 +0000
@@ -76,7 +76,7 @@
Event_queue *Events::event_queue;
Event_scheduler *Events::scheduler;
Event_db_repository *Events::db_repository;
-uint Events::opt_event_scheduler= Events::EVENTS_OFF;
+ulong Events::opt_event_scheduler= Events::EVENTS_OFF;
mysql_mutex_t Events::LOCK_event_metadata;
bool Events::check_system_tables_error= FALSE;
=== modified file 'sql/events.h'
--- a/sql/events.h 2010-04-12 13:17:37 +0000
+++ b/sql/events.h 2010-08-05 12:34:19 +0000
@@ -91,7 +91,7 @@ public:
*/
enum enum_opt_event_scheduler { EVENTS_OFF, EVENTS_ON, EVENTS_DISABLED };
/* Protected using LOCK_global_system_variables only. */
- static uint opt_event_scheduler;
+ static ulong opt_event_scheduler;
static mysql_mutex_t LOCK_event_metadata;
static bool check_if_system_tables_error();
static bool start();
=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc 2010-07-23 20:16:29 +0000
+++ b/sql/item_cmpfunc.cc 2010-08-05 12:34:19 +0000
@@ -4617,7 +4617,7 @@ bool Item_func_like::fix_fields(THD *thd
return TRUE;
}
- if (escape_item->const_item())
+ if (escape_item->const_item() && !thd->lex->view_prepare_mode)
{
/* If we are on execution stage */
String *escape_str= escape_item->val_str(&cmp.value1);
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2010-07-29 12:32:11 +0000
+++ b/sql/mysqld.cc 2010-08-05 12:34:19 +0000
@@ -439,10 +439,10 @@ static bool calling_initgroups= FALSE; /
#endif
uint mysqld_port, test_flags, select_errors, dropping_tables, ha_open_options;
uint mysqld_port_timeout;
-uint delay_key_write_options;
+ulong delay_key_write_options;
uint protocol_version;
uint lower_case_table_names;
-uint tc_heuristic_recover= 0;
+ulong tc_heuristic_recover= 0;
uint volatile thread_count;
int32 thread_running;
ulong thread_created;
@@ -453,7 +453,7 @@ ulong slow_launch_time, slave_open_temp_
ulong open_files_limit, max_binlog_size, max_relay_log_size;
ulong slave_trans_retries;
uint slave_net_timeout;
-uint slave_exec_mode_options;
+ulong slave_exec_mode_options;
ulonglong slave_type_conversions_options;
ulong thread_cache_size=0, thread_pool_size= 0;
ulong binlog_cache_size=0;
@@ -552,7 +552,7 @@ char *mysql_data_home= const_cast<char*>
const char *mysql_real_data_home_ptr= mysql_real_data_home;
char server_version[SERVER_VERSION_LENGTH];
char *mysqld_unix_port, *opt_mysql_tmpdir;
-uint thread_handling;
+ulong thread_handling;
/** name of reference on left expression in rewritten IN subquery */
const char *in_left_expr_name= "<left expr>";
=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h 2010-07-27 14:32:42 +0000
+++ b/sql/mysqld.h 2010-08-05 12:34:19 +0000
@@ -105,7 +105,7 @@ extern uint connection_count;
extern my_bool opt_safe_user_create;
extern my_bool opt_safe_show_db, opt_local_infile, opt_myisam_use_mmap;
extern my_bool opt_slave_compressed_protocol, use_temp_pool;
-extern uint slave_exec_mode_options;
+extern ulong slave_exec_mode_options;
extern ulonglong slave_type_conversions_options;
extern my_bool opt_readonly, lower_case_file_system;
extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
@@ -136,7 +136,7 @@ extern my_bool relay_log_purge, opt_inno
extern my_bool relay_log_recovery;
extern uint test_flags,select_errors,ha_open_options;
extern uint protocol_version, mysqld_port, dropping_tables;
-extern uint delay_key_write_options;
+extern ulong delay_key_write_options;
extern char *opt_logname, *opt_slow_logname;
extern char *opt_backup_history_logname, *opt_backup_progress_logname,
*opt_backup_settings_name;
@@ -300,7 +300,7 @@ extern ulong specialflag;
extern uint mysql_data_home_len;
extern uint mysql_real_data_home_len;
extern const char *mysql_real_data_home_ptr;
-extern uint thread_handling;
+extern ulong thread_handling;
extern MYSQL_PLUGIN_IMPORT char *mysql_data_home;
extern char server_version[SERVER_VERSION_LENGTH];
extern MYSQL_PLUGIN_IMPORT char mysql_real_data_home[];
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc 2010-07-30 15:28:36 +0000
+++ b/sql/sql_class.cc 2010-08-05 12:34:19 +0000
@@ -3640,7 +3640,7 @@ int THD::decide_logging_format(TABLE_LIS
{
DBUG_ENTER("THD::decide_logging_format");
DBUG_PRINT("info", ("query: %s", query()));
- DBUG_PRINT("info", ("variables.binlog_format: %u",
+ DBUG_PRINT("info", ("variables.binlog_format: %lu",
variables.binlog_format));
DBUG_PRINT("info", ("lex->get_stmt_unsafe_flags(): 0x%x",
lex->get_stmt_unsafe_flags()));
@@ -4000,7 +4000,7 @@ int THD::decide_logging_format(TABLE_LIS
DBUG_PRINT("info", ("decision: no logging since "
"mysql_bin_log.is_open() = %d "
"and (options & OPTION_BIN_LOG) = 0x%llx "
- "and binlog_format = %u "
+ "and binlog_format = %lu "
"and binlog_filter->db_ok(db) = %d",
mysql_bin_log.is_open(),
(variables.option_bits & OPTION_BIN_LOG),
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h 2010-07-30 15:28:36 +0000
+++ b/sql/sql_class.h 2010-08-05 12:34:19 +0000
@@ -114,7 +114,7 @@ extern bool volatile shutdown_in_progres
#define TC_HEURISTIC_RECOVER_COMMIT 1
#define TC_HEURISTIC_RECOVER_ROLLBACK 2
-extern uint tc_heuristic_recover;
+extern ulong tc_heuristic_recover;
typedef struct st_user_var_events
{
@@ -426,13 +426,13 @@ typedef struct system_variables
ulong log_warnings;
ulong group_concat_max_len;
- uint binlog_format; ///< binlog format for this thd (see enum_binlog_format)
+ ulong binlog_format; ///< binlog format for this thd (see enum_binlog_format)
my_bool binlog_direct_non_trans_update;
my_bool sql_log_bin;
- uint completion_type;
- uint query_cache_type;
- uint tx_isolation;
- uint updatable_views_with_limit;
+ ulong completion_type;
+ ulong query_cache_type;
+ ulong tx_isolation;
+ ulong updatable_views_with_limit;
uint max_user_connections;
/**
In slave thread we need to know in behalf of which
=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc 2010-08-04 08:18:32 +0000
+++ b/sql/sql_plugin.cc 2010-08-05 12:34:19 +0000
@@ -3025,11 +3025,11 @@ static int construct_options(MEM_ROOT *m
Allocate temporary space for the value of the tristate.
This option will have a limited lifetime and is not used beyond
server initialization.
- GET_ENUM value is an unsigned integer.
+ GET_ENUM value is an unsigned long integer.
*/
options[0].value= options[1].value=
- (uchar **)alloc_root(mem_root, sizeof(uint));
- *((uint*) options[0].value)= (uint) options[0].def_value;
+ (uchar **)alloc_root(mem_root, sizeof(ulong));
+ *((ulong*) options[0].value)= (ulong) options[0].def_value;
options+= 2;
}
@@ -3328,7 +3328,7 @@ static int test_plugin_options(MEM_ROOT
list is always the <plugin name> option value.
*/
if (!tmp->is_mandatory)
- plugin_load_policy= (enum_plugin_load_policy)*(uint*)opts[0].value;
+ plugin_load_policy= (enum_plugin_load_policy)*(ulong*)opts[0].value;
}
disable_plugin= (plugin_load_policy == PLUGIN_OFF);
=== modified file 'sql/sys_vars.h'
--- a/sql/sys_vars.h 2010-07-15 17:45:08 +0000
+++ b/sql/sys_vars.h 2010-08-05 12:34:19 +0000
@@ -271,28 +271,28 @@ public:
deprecated_version, substitute)
{
option.var_type= GET_ENUM;
- global_var(uint)= def_val;
+ global_var(ulong)= def_val;
DBUG_ASSERT(def_val < typelib.count);
- DBUG_ASSERT(size == sizeof(uint));
+ DBUG_ASSERT(size == sizeof(ulong));
}
bool session_update(THD *thd, set_var *var)
{
- session_var(thd, uint)= var->save_result.ulonglong_value;
+ session_var(thd, ulong)= var->save_result.ulonglong_value;
return false;
}
bool global_update(THD *thd, set_var *var)
{
- global_var(uint)= var->save_result.ulonglong_value;
+ global_var(ulong)= var->save_result.ulonglong_value;
return false;
}
void session_save_default(THD *thd, set_var *var)
- { var->save_result.ulonglong_value= global_var(uint); }
+ { var->save_result.ulonglong_value= global_var(ulong); }
void global_save_default(THD *thd, set_var *var)
{ var->save_result.ulonglong_value= option.def_value; }
uchar *session_value_ptr(THD *thd, LEX_STRING *base)
- { return (uchar*)typelib.type_names[session_var(thd, uint)]; }
+ { return (uchar*)typelib.type_names[session_var(thd, ulong)]; }
uchar *global_value_ptr(THD *thd, LEX_STRING *base)
- { return (uchar*)typelib.type_names[global_var(uint)]; }
+ { return (uchar*)typelib.type_names[global_var(ulong)]; }
};
/**
=== modified file 'storage/example/ha_example.cc'
--- a/storage/example/ha_example.cc 2010-08-03 16:21:13 +0000
+++ b/storage/example/ha_example.cc 2010-08-05 12:34:19 +0000
@@ -912,7 +912,7 @@ int ha_example::create(const char *name,
struct st_mysql_storage_engine example_storage_engine=
{ MYSQL_HANDLERTON_INTERFACE_VERSION };
-static uint srv_enum_var= 0;
+static ulong srv_enum_var= 0;
static ulong srv_ulong_var= 0;
const char *enum_var_names[]=
=== modified file 'storage/myisam/mi_static.c'
--- a/storage/myisam/mi_static.c 2010-07-23 20:13:36 +0000
+++ b/storage/myisam/mi_static.c 2010-08-05 12:34:19 +0000
@@ -33,9 +33,9 @@ uint myisam_quick_table_bits=9;
ulong myisam_block_size= MI_KEY_BLOCK_LENGTH; /* Best by test */
my_bool myisam_flush=0, myisam_delay_key_write=0, myisam_single_user=0;
#if defined(THREAD) && !defined(DONT_USE_RW_LOCKS)
-uint myisam_concurrent_insert= 2;
+ulong myisam_concurrent_insert= 2;
#else
-uint myisam_concurrent_insert= 0;
+ulong myisam_concurrent_insert= 0;
#endif
ulonglong myisam_max_temp_length= MAX_FILE_SIZE;
ulong myisam_data_pointer_size=4;
Attachment: [text/bzr-bundle] bzr/georgi.kodinov@oracle.com-20100805123419-1mw19ctx1ejny1jj.bundle
| Thread |
|---|
| • bzr push into mysql-5.5-merge branch (Georgi.Kodinov:3162 to 3163) | Georgi Kodinov | 5 Aug |
