List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:July 15 2010 3:48pm
Subject:bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3119 to 3120)
View as plain text  
 3120 Georgi Kodinov	2010-07-15 [merge]
      merge

    modified:
      mysql-test/r/information_schema.result
      mysql-test/t/information_schema.test
      sql/sql_show.cc
 3119 Davi Arnaut	2010-07-15 [merge]
      Merge of mysql-trunk-bugfixing into mysql-trunk-merge.

    removed:
      dbug/sanity.c
      include/config-netware.h
      include/help_end.h
      include/help_start.h
      mysql-test/suite/rpl/r/rpl_temp_temporary.result
      mysql-test/suite/rpl/t/rpl_temp_temporary-master.opt
      mysql-test/suite/rpl/t/rpl_temp_temporary.test
      mysql-test/t/mysql-bug45236-master.opt
      mysys/mf_util.c
      mysys/my_netware.c
      mysys/my_realloc.c
      mysys/safemalloc.c
      netware/
      netware/BUILD/
      netware/BUILD/apply-patch
      netware/BUILD/compile-AUTOTOOLS
      netware/BUILD/compile-linux-tools
      netware/BUILD/compile-netware-END
      netware/BUILD/compile-netware-START
      netware/BUILD/compile-netware-all
      netware/BUILD/compile-netware-debug
      netware/BUILD/compile-netware-max
      netware/BUILD/compile-netware-max-debug
      netware/BUILD/compile-netware-src
      netware/BUILD/compile-netware-standard
      netware/BUILD/create-patch
      netware/BUILD/cron-build
      netware/BUILD/crontab
      netware/BUILD/knetware.imp
      netware/BUILD/mwasmnlm
      netware/BUILD/mwccnlm
      netware/BUILD/mwenv
      netware/BUILD/mwldnlm
      netware/BUILD/nwbuild
      netware/BUILD/openssl.imp
      netware/BUILD/save-patch
      netware/Makefile.am
      netware/comp_err.def
      netware/install_test_db.ncf
      netware/libmysql.def
      netware/libmysqlmain.c
      netware/my_manage.c
      netware/my_manage.h
      netware/my_print_defaults.def
      netware/myisam_ftdump.def
      netware/myisamchk.def
      netware/myisamlog.def
      netware/myisampack.def
      netware/mysql.def
      netware/mysql.xdc
      netware/mysql_client_test.def
      netware/mysql_fix_privilege_tables.pl
      netware/mysql_install_db.c
      netware/mysql_install_db.def
      netware/mysql_secure_installation.pl
      netware/mysql_test_run.c
      netware/mysql_test_run.def
      netware/mysql_upgrade.def
      netware/mysql_waitpid.def
      netware/mysqladmin.def
      netware/mysqlbinlog.def
      netware/mysqlcheck.def
      netware/mysqld.def
      netware/mysqld_safe.c
      netware/mysqld_safe.def
      netware/mysqldump.def
      netware/mysqlimport.def
      netware/mysqlshow.def
      netware/mysqlslap.def
      netware/mysqltest.def
      netware/perror.def
      netware/replace.def
      netware/resolve_stack_dump.def
      netware/resolveip.def
      netware/static_init_db.sql
      sql/my_lock.c
    added:
      mysql-test/collections/disabled-per-push.list
      mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc
      mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test
      mysql-test/r/single_delete_update.result
      mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_savepoint.result
      mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
      mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test
      mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test
      mysql-test/suite/rpl/t/rpl_savepoint.test
      mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
      mysql-test/t/single_delete_update.test
      unittest/mysys/my_malloc-t.c
    renamed:
      mysql-test/r/analyse.result => mysql-test/r/func_analyse.result
      mysql-test/t/analyse.test => mysql-test/t/func_analyse.test
    modified:
      .bzr-mysql/default.conf
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/compile-ia64-debug-max
      CMakeLists.txt
      Makefile.am
      client/client_priv.h
      client/completion_hash.cc
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/mysqltest.cc
      client/readline.cc
      client/sql_string.h
      cmake/install_macros.cmake
      cmake/os/FreeBSD.cmake
      cmake/os/Windows.cmake
      cmake/package_name.cmake
      config/ac-macros/misc.m4
      configure.in
      dbug/CMakeLists.txt
      dbug/Makefile.am
      dbug/dbug.c
      dbug/dbug_analyze.c
      dbug/user.r
      extra/comp_err.c
      extra/my_print_defaults.c
      extra/mysql_waitpid.c
      extra/perror.c
      extra/replace.c
      extra/resolve_stack_dump.c
      extra/resolveip.c
      extra/yassl/include/yassl_int.hpp
      extra/yassl/src/socket_wrapper.cpp
      extra/yassl/taocrypt/include/misc.hpp
      extra/yassl/taocrypt/src/random.cpp
      extra/yassl/testsuite/test.hpp
      include/Makefile.am
      include/config-win.h
      include/hash.h
      include/lf.h
      include/m_string.h
      include/my_dbug.h
      include/my_global.h
      include/my_list.h
      include/my_net.h
      include/my_nosys.h
      include/my_pthread.h
      include/my_stacktrace.h
      include/my_sys.h
      include/my_time.h
      include/mysql.h
      include/mysql.h.pp
      include/mysql/psi/mysql_file.h
      include/mysql/psi/mysql_thread.h
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql/psi/psi_abi_v2.h
      include/mysql/psi/psi_abi_v2.h.pp
      include/mysys_err.h
      include/typelib.h
      libmysql/Makefile.am
      libmysql/Makefile.shared
      libmysql/dll.c
      libmysql/get_password.c
      libmysql/libmysql.c
      libmysqld/Makefile.am
      libmysqld/lib_sql.cc
      libmysqld/libmysqld.c
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/collections/default.push
      mysql-test/collections/mysql-next-mr.push
      mysql-test/collections/mysql-trunk.push
      mysql-test/extra/binlog_tests/drop_temp_table.test
      mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
      mysql-test/include/ctype_numconv.inc
      mysql-test/include/mysqld--help.inc
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/v1/mtr_misc.pl
      mysql-test/lib/v1/mtr_report.pl
      mysql-test/lib/v1/mysql-test-run.pl
      mysql-test/mysql-stress-test.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/func_digest.result
      mysql-test/r/information_schema.result
      mysql-test/r/log_state.result
      mysql-test/r/lowercase_table2.result
      mysql-test/r/merge.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/select.result
      mysql-test/r/sp_trans_log.result
      mysql-test/r/subselect4.result
      mysql-test/r/update.result
      mysql-test/suite/binlog/r/binlog_multi_engine.result
      mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/funcs_1/r/is_engines_myisam.result
      mysql-test/suite/ndb/r/ndb_binlog_format.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_concurrency_error.result
      mysql-test/suite/rpl/r/rpl_drop_temp.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
      mysql-test/suite/rpl/t/rpl_drop_temp.test
      mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
      mysql-test/suite/rpl_ndb/t/disabled.def
      mysql-test/suite/sys_vars/r/large_files_support_basic.result
      mysql-test/suite/sys_vars/r/sql_select_limit_func.result
      mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
      mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test
      mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test
      mysql-test/suite/sys_vars/t/sql_select_limit_func.test
      mysql-test/t/bug46080-master.opt
      mysql-test/t/disabled.def
      mysql-test/t/func_digest.test
      mysql-test/t/innodb_mysql_lock2.test
      mysql-test/t/lowercase_table2.test
      mysql-test/t/merge.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/select.test
      mysql-test/t/sp_trans_log.test
      mysql-test/t/subselect4.test
      mysys/CMakeLists.txt
      mysys/Makefile.am
      mysys/array.c
      mysys/charset.c
      mysys/default.c
      mysys/default_modify.c
      mysys/errors.c
      mysys/hash.c
      mysys/lf_alloc-pin.c
      mysys/lf_dynarray.c
      mysys/lf_hash.c
      mysys/list.c
      mysys/mf_cache.c
      mysys/mf_dirname.c
      mysys/mf_fn_ext.c
      mysys/mf_iocache.c
      mysys/mf_keycache.c
      mysys/mf_keycaches.c
      mysys/mf_pack.c
      mysys/mf_path.c
      mysys/mf_sort.c
      mysys/mf_tempdir.c
      mysys/mf_tempfile.c
      mysys/mf_unixpath.c
      mysys/mf_wfile.c
      mysys/my_alloc.c
      mysys/my_bitmap.c
      mysys/my_clock.c
      mysys/my_compress.c
      mysys/my_copy.c
      mysys/my_delete.c
      mysys/my_error.c
      mysys/my_file.c
      mysys/my_fopen.c
      mysys/my_gethwaddr.c
      mysys/my_getopt.c
      mysys/my_getsystime.c
      mysys/my_getwd.c
      mysys/my_init.c
      mysys/my_largepage.c
      mysys/my_lib.c
      mysys/my_lock.c
      mysys/my_lockmem.c
      mysys/my_malloc.c
      mysys/my_mess.c
      mysys/my_mmap.c
      mysys/my_once.c
      mysys/my_open.c
      mysys/my_pthread.c
      mysys/my_rdtsc.c
      mysys/my_redel.c
      mysys/my_rename.c
      mysys/my_sleep.c
      mysys/my_static.c
      mysys/my_static.h
      mysys/my_windac.c
      mysys/queues.c
      mysys/stacktrace.c
      mysys/string.c
      mysys/test_charset.c
      mysys/testhash.c
      mysys/thr_alarm.c
      mysys/tree.c
      mysys/trie.c
      packaging/WiX/CPackWixConfig.cmake
      plugin/daemon_example/daemon_example.cc
      plugin/semisync/semisync_master.h
      scripts/make_binary_distribution.sh
      scripts/mysql_config.pl.in
      scripts/mysql_config.sh
      scripts/mysqlhotcopy.sh
      sql-common/client.c
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/debug_sync.cc
      sql/derror.cc
      sql/event_data_objects.cc
      sql/event_scheduler.cc
      sql/examples/CMakeLists.txt
      sql/filesort.cc
      sql/gstream.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/item.h
      sql/item_func.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/keycaches.cc
      sql/lock.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/mdl.cc
      sql/mysqld.cc
      sql/net_serv.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/records.cc
      sql/records.h
      sql/repl_failsafe.cc
      sql/rpl_filter.cc
      sql/rpl_handler.cc
      sql/rpl_injector.cc
      sql/rpl_mi.cc
      sql/rpl_rli.cc
      sql/rpl_utility.cc
      sql/slave.cc
      sql/sp_pcontext.cc
      sql/sp_rcontext.cc
      sql/sql_base.cc
      sql/sql_binlog.cc
      sql/sql_bitmap.h
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_db.cc
      sql/sql_delete.cc
      sql/sql_handler.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_list.h
      sql/sql_load.cc
      sql/sql_locale.cc
      sql/sql_manager.cc
      sql/sql_map.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_profile.cc
      sql/sql_profile.h
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_test.cc
      sql/sql_truncate.cc
      sql/sql_update.cc
      sql/sys_vars.cc
      sql/sys_vars.h
      sql/table.cc
      sql/table.h
      sql/transaction.cc
      sql/tztime.cc
      sql/uniques.cc
      sql/unireg.cc
      storage/archive/archive_reader.c
      storage/archive/ha_archive.cc
      storage/blackhole/ha_blackhole.cc
      storage/csv/ha_tina.cc
      storage/csv/ha_tina.h
      storage/csv/transparent_file.cc
      storage/example/ha_example.cc
      storage/heap/ha_heap.cc
      storage/heap/hp_block.c
      storage/heap/hp_close.c
      storage/heap/hp_create.c
      storage/heap/hp_open.c
      storage/heap/hp_rename.c
      storage/ibmdb2i/db2i_constraints.cc
      storage/ibmdb2i/db2i_conversion.cc
      storage/ibmdb2i/db2i_file.cc
      storage/ibmdb2i/db2i_file.h
      storage/ibmdb2i/db2i_global.h
      storage/ibmdb2i/db2i_ileBridge.cc
      storage/ibmdb2i/db2i_ileBridge.h
      storage/ibmdb2i/ha_ibmdb2i.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/os0file.h
      storage/innobase/include/os0file.ic
      storage/innobase/include/srv0start.h
      storage/innobase/include/sync0rw.ic
      storage/innobase/include/sync0sync.ic
      storage/innobase/include/univ.i
      storage/innobase/include/ut0dbg.h
      storage/innobase/os/os0file.c
      storage/innobase/os/os0proc.c
      storage/innobase/os/os0thread.c
      storage/innobase/row/row0merge.c
      storage/innobase/srv/srv0start.c
      storage/innobase/ut/ut0dbg.c
      storage/innobase/ut/ut0mem.c
      storage/myisam/ft_boolean_search.c
      storage/myisam/ft_nlq_search.c
      storage/myisam/ft_stopwords.c
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_check.c
      storage/myisam/mi_close.c
      storage/myisam/mi_create.c
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_log.c
      storage/myisam/mi_open.c
      storage/myisam/mi_packrec.c
      storage/myisam/mi_preload.c
      storage/myisam/mi_static.c
      storage/myisam/mi_test2.c
      storage/myisam/mi_test3.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_index.c
      storage/myisam/sort.c
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/myrg_close.c
      storage/myisammrg/myrg_open.c
      storage/ndb/config/win-lib.am
      storage/ndb/config/win-prg.am
      storage/ndb/include/util/NdbAutoPtr.hpp
      storage/ndb/src/mgmapi/mgmapi.cpp
      storage/ndb/src/mgmapi/ndb_logevent.cpp
      storage/ndb/src/mgmclient/main.cpp
      storage/ndb/src/mgmsrv/main.cpp
      storage/ndb/test/ndbapi/testIndexStat.cpp
      storage/ndb/tools/restore/consumer_restore.cpp
      storage/perfschema/pfs.cc
      storage/perfschema/unittest/pfs-t.cc
      strings/ctype-big5.c
      strings/ctype-cp932.c
      strings/ctype-czech.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-simple.c
      strings/ctype-sjis.c
      strings/ctype-tis620.c
      strings/ctype-ujis.c
      strings/ctype-win1250ch.c
      strings/do_ctype.c
      strings/int2str.c
      strings/my_strtoll10.c
      strings/strtol.c
      strings/strtoul.c
      tests/mysql_client_test.c
      tests/thread_test.c
      unittest/mysys/CMakeLists.txt
      unittest/mysys/Makefile.am
      vio/test-ssl.c
      vio/test-sslclient.c
      vio/test-sslserver.c
      vio/vio.c
      vio/viossl.c
      vio/viosslfactories.c
      vio/viotest-ssl.c
=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result	2010-07-15 13:47:50 +0000
+++ b/mysql-test/r/information_schema.result	2010-07-15 15:46:41 +0000
@@ -1691,6 +1691,23 @@ WHERE INFORMATION_SCHEMA.COLUMNS.TABLE_N
 COLUMN_DEFAULT	TABLE_NAME
 NULL	variables
 DROP TABLE variables;
+#
+# Bug #53814: NUMERIC_PRECISION for unsigned bigint field is 19, 
+# should be 20
+#
+CREATE TABLE ubig (a BIGINT, b BIGINT UNSIGNED);
+SELECT TABLE_NAME, COLUMN_NAME, NUMERIC_PRECISION 
+FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='ubig';
+TABLE_NAME	COLUMN_NAME	NUMERIC_PRECISION
+ubig	a	19
+ubig	b	20
+INSERT INTO ubig VALUES (0xFFFFFFFFFFFFFFFF,0xFFFFFFFFFFFFFFFF);
+Warnings:
+Warning	1264	Out of range value for column 'a' at row 1
+SELECT length(CAST(b AS CHAR)) FROM ubig;
+length(CAST(b AS CHAR))
+20
+DROP TABLE ubig;
 End of 5.1 tests.
 #
 # Additional test for WL#3726 "DDL locking for all metadata objects"

=== modified file 'mysql-test/t/information_schema.test'
--- a/mysql-test/t/information_schema.test	2010-06-25 08:08:54 +0000
+++ b/mysql-test/t/information_schema.test	2010-07-15 15:46:41 +0000
@@ -1426,6 +1426,22 @@ FROM INFORMATION_SCHEMA.COLUMNS
 WHERE INFORMATION_SCHEMA.COLUMNS.TABLE_NAME = 'variables';
 DROP TABLE variables;
 
+--echo #
+--echo # Bug #53814: NUMERIC_PRECISION for unsigned bigint field is 19, 
+--echo # should be 20
+--echo #
+
+CREATE TABLE ubig (a BIGINT, b BIGINT UNSIGNED);
+
+SELECT TABLE_NAME, COLUMN_NAME, NUMERIC_PRECISION 
+  FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='ubig';
+
+INSERT INTO ubig VALUES (0xFFFFFFFFFFFFFFFF,0xFFFFFFFFFFFFFFFF);
+SELECT length(CAST(b AS CHAR)) FROM ubig;
+
+DROP TABLE ubig;
+
+
 --echo End of 5.1 tests.
 
 --echo #

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-07-15 13:47:50 +0000
+++ b/sql/sql_show.cc	2010-07-15 15:46:41 +0000
@@ -4022,10 +4022,13 @@ void store_column_type(TABLE *table, Fie
   case MYSQL_TYPE_TINY:
   case MYSQL_TYPE_SHORT:
   case MYSQL_TYPE_LONG:
-  case MYSQL_TYPE_LONGLONG:
   case MYSQL_TYPE_INT24:
     field_length= field->max_display_length() - 1;
     break;
+  case MYSQL_TYPE_LONGLONG:
+    field_length= field->max_display_length() - 
+      ((field->flags & UNSIGNED_FLAG) ? 0 : 1);
+    break;
   case MYSQL_TYPE_BIT:
     field_length= field->max_display_length();
     decimals= -1;                             // return NULL


Attachment: [text/bzr-bundle] bzr/georgi.kodinov@oracle.com-20100715154641-2qobg3hcg5x6ypr5.bundle
Thread
bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3119 to 3120) Georgi Kodinov15 Jul