From: Jan Wedvik Date: March 30 2012 1:20pm Subject: bzr push into mysql-5.5-cluster-7.3 branch (jan.wedvik:3873 to 3874) List-Archive: http://lists.mysql.com/commits/143382 Message-Id: <20120330132023.D56082F75@atum17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3874 Jan Wedvik 2012-03-30 [merge] Merged from mysql-5.5-cluster-7.2. added: mysql-test/suite/ndb/backups/wl946_pre/ mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1-0.1.Data mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1-0.2.Data mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.1.ctl mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.1.log mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.2.ctl mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.2.log mysql-test/suite/ndb/data/wl946_pre.dat mysql-test/suite/ndb/r/ndb_wl946_pre.result mysql-test/suite/ndb/t/ndb_wl946_create.inc mysql-test/suite/ndb/t/ndb_wl946_pre.test mysql-test/suite/ndb/t/ndb_wl946_pre_query.inc mysql-test/suite/ndb/t/show_indexes.inc modified: sql/ha_ndbcluster.cc storage/ndb/src/ndbapi/NdbQueryBuilder.cpp storage/ndb/src/ndbapi/NdbQueryBuilder.hpp storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp 3873 Jonas Oreland 2012-03-30 [merge] ndb - merge 72 to 73 added: extra/yassl/certs/ca-key.pem extra/yassl/certs/client-keyEnc.pem extra/yassl/certs/client-keyEnc3.pem extra/yassl/certs/server-keyEnc.pem extra/yassl/taocrypt/certs/ extra/yassl/taocrypt/certs/client-cert.der extra/yassl/taocrypt/certs/client-key.der extra/yassl/taocrypt/certs/dh1024.dat extra/yassl/taocrypt/certs/dsa512.der extra/yassl/taocrypt/include/hc128.hpp extra/yassl/taocrypt/include/rabbit.hpp extra/yassl/taocrypt/src/hc128.cpp extra/yassl/taocrypt/src/rabbit.cpp mysql-test/include/libdaemon_example.ini mysql-test/r/bug13633383.result mysql-test/suite/innodb/r/innodb-blob.result mysql-test/suite/innodb/r/innodb_bug11754376.result mysql-test/suite/innodb/r/innodb_bug12400341.result mysql-test/suite/innodb/r/innodb_bug13510739.result mysql-test/suite/innodb/t/innodb-blob.test mysql-test/suite/innodb/t/innodb_bug11754376.test mysql-test/suite/innodb/t/innodb_bug12400341-master.opt mysql-test/suite/innodb/t/innodb_bug12400341.test mysql-test/suite/innodb/t/innodb_bug13510739.test mysql-test/suite/rpl/r/rpl_start_stop_slave.result mysql-test/suite/rpl/t/rpl_start_stop_slave.test mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result mysql-test/suite/sys_vars/r/innodb_trx_rseg_n_slots_debug_basic.result mysql-test/suite/sys_vars/r/stored_program_cache_basic.result mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test mysql-test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test mysql-test/suite/sys_vars/t/stored_program_cache_basic.test mysql-test/t/bug13633383.test modified: CMakeLists.txt README VERSION client/CMakeLists.txt client/mysql_plugin.c client/mysql_upgrade.c client/mysqldump.c client/sql_string.cc cmake/build_configurations/mysql_release.cmake cmake/install_macros.cmake extra/yassl/INSTALL extra/yassl/README extra/yassl/certs/ca-cert.pem extra/yassl/certs/client-cert.der extra/yassl/certs/client-cert.pem extra/yassl/certs/client-key.der extra/yassl/certs/client-key.pem extra/yassl/certs/dsa-cert.pem extra/yassl/certs/dsa512.der extra/yassl/certs/server-cert.pem extra/yassl/certs/server-key.pem extra/yassl/certs/taoCert.txt extra/yassl/examples/client/client.cpp extra/yassl/examples/echoclient/echoclient.cpp extra/yassl/examples/echoserver/echoserver.cpp extra/yassl/examples/server/server.cpp extra/yassl/include/buffer.hpp extra/yassl/include/openssl/ssl.h extra/yassl/include/socket_wrapper.hpp extra/yassl/include/yassl_int.hpp extra/yassl/include/yassl_types.hpp extra/yassl/src/buffer.cpp extra/yassl/src/cert_wrapper.cpp extra/yassl/src/crypto_wrapper.cpp extra/yassl/src/handshake.cpp extra/yassl/src/make.bat* extra/yassl/src/socket_wrapper.cpp extra/yassl/src/ssl.cpp extra/yassl/src/yassl.cpp extra/yassl/src/yassl_error.cpp extra/yassl/src/yassl_imp.cpp extra/yassl/src/yassl_int.cpp extra/yassl/taocrypt/CMakeLists.txt extra/yassl/taocrypt/README extra/yassl/taocrypt/benchmark/benchmark.cpp extra/yassl/taocrypt/benchmark/benchmark.dsp extra/yassl/taocrypt/benchmark/dh1024.der extra/yassl/taocrypt/benchmark/dsa1024.der extra/yassl/taocrypt/benchmark/make.bat* extra/yassl/taocrypt/benchmark/rsa1024.der extra/yassl/taocrypt/include/asn.hpp extra/yassl/taocrypt/include/block.hpp extra/yassl/taocrypt/include/blowfish.hpp extra/yassl/taocrypt/include/des.hpp extra/yassl/taocrypt/include/file.hpp extra/yassl/taocrypt/include/hash.hpp extra/yassl/taocrypt/include/integer.hpp extra/yassl/taocrypt/include/kernelc.hpp extra/yassl/taocrypt/include/misc.hpp extra/yassl/taocrypt/include/modes.hpp extra/yassl/taocrypt/include/pwdbased.hpp extra/yassl/taocrypt/include/rsa.hpp extra/yassl/taocrypt/include/runtime.hpp extra/yassl/taocrypt/include/types.hpp extra/yassl/taocrypt/mySTL/stdexcept.hpp extra/yassl/taocrypt/mySTL/vector.hpp extra/yassl/taocrypt/src/aes.cpp extra/yassl/taocrypt/src/aestables.cpp extra/yassl/taocrypt/src/algebra.cpp extra/yassl/taocrypt/src/arc4.cpp extra/yassl/taocrypt/src/asn.cpp extra/yassl/taocrypt/src/blowfish.cpp extra/yassl/taocrypt/src/coding.cpp extra/yassl/taocrypt/src/dsa.cpp extra/yassl/taocrypt/src/hash.cpp extra/yassl/taocrypt/src/integer.cpp extra/yassl/taocrypt/src/make.bat* extra/yassl/taocrypt/src/md4.cpp extra/yassl/taocrypt/src/md5.cpp extra/yassl/taocrypt/src/misc.cpp extra/yassl/taocrypt/src/random.cpp extra/yassl/taocrypt/src/ripemd.cpp extra/yassl/taocrypt/src/rsa.cpp extra/yassl/taocrypt/src/sha.cpp extra/yassl/taocrypt/src/template_instnt.cpp extra/yassl/taocrypt/src/twofish.cpp extra/yassl/taocrypt/taocrypt.dsp extra/yassl/taocrypt/test/make.bat* extra/yassl/taocrypt/test/memory.cpp extra/yassl/taocrypt/test/test.cpp extra/yassl/testsuite/make.bat* extra/yassl/testsuite/test.hpp extra/yassl/testsuite/testsuite.cpp include/m_ctype.h include/m_string.h include/my_global.h include/myisam.h include/mysql/plugin.h include/welcome_copyright_notice.h libmysql/CMakeLists.txt libmysqld/CMakeLists.txt libmysqld/examples/CMakeLists.txt mysql-test/CMakeLists.txt mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/extra/rpl_tests/rpl_insert_id_pk.test mysql-test/extra/rpl_tests/rpl_multi_update.test mysql-test/extra/rpl_tests/rpl_multi_update2.test mysql-test/extra/rpl_tests/rpl_multi_update3.test mysql-test/extra/rpl_tests/rpl_start_stop_slave.test mysql-test/include/have_32bit.inc mysql-test/include/have_example_plugin.inc mysql-test/include/have_semisync_plugin.inc mysql-test/include/have_simple_parser.inc mysql-test/include/have_udf.inc mysql-test/include/mtr_check.sql mysql-test/include/show_slave_status.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/mysql-stress-test.pl mysql-test/mysql-test-run.pl mysql-test/r/bigint.result mysql-test/r/ctype_utf8.result mysql-test/r/func_in.result mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/init_connect.result mysql-test/r/join_outer.result mysql-test/r/multi_update.result mysql-test/r/myisam.result mysql-test/r/mysql_plugin.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqldump.result mysql-test/r/partition.result mysql-test/r/partition_binlog_stmt.result mysql-test/r/partition_error.result mysql-test/r/ps.result mysql-test/r/range.result mysql-test/r/sp-bugs.result mysql-test/r/sp.result mysql-test/r/xa.result mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb_bug34300.test mysql-test/suite/innodb/t/innodb_bug53756.test mysql-test/suite/rpl/r/rpl_auto_increment_11932.result mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_insert_id_pk.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_multi_update.result mysql-test/suite/rpl/r/rpl_multi_update2.result mysql-test/suite/rpl/r/rpl_multi_update3.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result mysql-test/suite/rpl/t/rpl_auto_increment_11932.test mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/suite/rpl/t/rpl_log_pos.test mysql-test/suite/rpl/t/rpl_manual_change_index_file.test mysql-test/suite/rpl/t/rpl_multi_update2.test mysql-test/suite/rpl/t/rpl_multi_update3.test mysql-test/suite/rpl/t/rpl_optimize.test mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_semi_sync_event.test mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test mysql-test/suite/rpl/t/rpl_timezone.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/character_sets_dir_basic.result mysql-test/suite/sys_vars/r/plugin_dir_basic.result mysql-test/suite/sys_vars/t/all_vars.test mysql-test/suite/sys_vars/t/character_sets_dir_basic.test mysql-test/suite/sys_vars/t/disabled.def mysql-test/t/bigint.test mysql-test/t/ctype_utf8.test mysql-test/t/events_restart.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/init_connect.test mysql-test/t/join_outer.test mysql-test/t/multi_update.test mysql-test/t/myisam.test mysql-test/t/mysql_plugin.test mysql-test/t/mysqldump.test mysql-test/t/partition.test mysql-test/t/partition_binlog_stmt.test mysql-test/t/partition_error.test mysql-test/t/ps.test mysql-test/t/range.test mysql-test/t/sp-bugs.test mysql-test/t/sp.test mysql-test/t/udf_skip_grants-master.opt mysql-test/t/xa.test mysql-test/valgrind.supp mysys/charset-def.c mysys/my_init.c mysys/my_symlink.c packaging/WiX/custom_ui.wxs plugin/auth/dialog.c plugin/auth/qa_auth_interface.c plugin/auth/qa_auth_server.c plugin/daemon_example/CMakeLists.txt plugin/daemon_example/daemon_example.cc scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh scripts/mysqld_safe.sh sql-common/my_time.c sql/filesort.cc sql/ha_partition.cc sql/item.cc sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_timefunc.cc sql/item_xmlfunc.cc sql/log.h sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/rpl_handler.h sql/rpl_injector.cc sql/rpl_mi.cc sql/rpl_mi.h sql/rpl_rli.cc sql/rpl_rli.h sql/set_var.h sql/share/errmsg-utf8.txt sql/slave.cc sql/slave.h sql/sp_cache.cc sql/sp_cache.h sql/sp_head.cc sql/sp_head.h sql/sql_admin.cc sql/sql_base.cc sql/sql_cache.cc sql/sql_class.cc sql/sql_connect.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_parse.cc sql/sql_partition.cc sql/sql_partition.h sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_profile.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/sql_udf.cc sql/sql_yacc.yy sql/sys_vars.cc sql/sys_vars.h sql/table.h storage/archive/ha_archive.cc storage/blackhole/ha_blackhole.cc storage/csv/ha_tina.cc storage/example/ha_example.cc storage/federated/ha_federated.cc storage/heap/hp_info.c storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0pcur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/dict/dict0load.c storage/innobase/fil/fil0fil.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0btr.h storage/innobase/include/btr0btr.ic storage/innobase/include/btr0cur.h storage/innobase/include/btr0cur.ic storage/innobase/include/btr0pcur.h storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/data0data.h storage/innobase/include/data0data.ic storage/innobase/include/fsp0fsp.h storage/innobase/include/log0log.h storage/innobase/include/mem0mem.ic storage/innobase/include/mtr0log.ic storage/innobase/include/mtr0mtr.h storage/innobase/include/mtr0mtr.ic storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/row0mysql.h storage/innobase/include/row0sel.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0rec.ic storage/innobase/include/trx0rseg.ic storage/innobase/include/trx0sys.h storage/innobase/include/trx0undo.h storage/innobase/include/univ.i storage/innobase/include/ut0mem.h storage/innobase/include/ut0rnd.ic storage/innobase/lock/lock0lock.c storage/innobase/log/log0log.c storage/innobase/mem/mem0pool.c storage/innobase/mtr/mtr0mtr.c storage/innobase/os/os0file.c storage/innobase/os/os0proc.c storage/innobase/page/page0cur.c storage/innobase/page/page0page.c storage/innobase/pars/pars0pars.c storage/innobase/row/row0ins.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0row.c storage/innobase/row/row0sel.c storage/innobase/row/row0umod.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0rec.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/innobase/trx/trx0undo.c storage/innobase/ut/ut0mem.c storage/myisam/ft_boolean_search.c storage/myisam/ft_nlq_search.c storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.h storage/myisam/mi_check.c storage/myisam/mi_packrec.c storage/myisam/mi_preload.c storage/myisam/myisamchk.c storage/myisam/myisamdef.h storage/myisam/sort.c storage/ndb/clusterj/clusterj-api/pom.xml storage/ndb/clusterj/clusterj-bindings/pom.xml storage/ndb/clusterj/clusterj-core/pom.xml storage/ndb/clusterj/clusterj-jdbc/pom.xml storage/ndb/clusterj/clusterj-jpatest/pom.xml storage/ndb/clusterj/clusterj-openjpa/pom.xml storage/ndb/clusterj/clusterj-test/pom.xml storage/ndb/clusterj/clusterj-tie/pom.xml storage/ndb/clusterj/pom.xml storage/perfschema/ha_perfschema.cc storage/perfschema/pfs.cc storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.h strings/ctype-uca.c strings/ctype-ucs2.c strings/ctype-utf8.c strings/dtoa.c support-files/compiler_warnings.supp unittest/mysys/bitmap-t.c unittest/mysys/my_atomic-t.c unittest/strings/strings-t.c === added directory 'mysql-test/suite/ndb/backups/wl946_pre' === added file 'mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1-0.1.Data' Binary files a/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1-0.1.Data 1970-01-01 00:00:00 +0000 and b/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1-0.1.Data 2012-03-26 13:32:38 +0000 differ === added file 'mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1-0.2.Data' Binary files a/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1-0.2.Data 1970-01-01 00:00:00 +0000 and b/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1-0.2.Data 2012-03-26 13:32:38 +0000 differ === added file 'mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.1.ctl' Binary files a/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.1.ctl 1970-01-01 00:00:00 +0000 and b/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.1.ctl 2012-03-26 13:32:38 +0000 differ === added file 'mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.1.log' Binary files a/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.1.log 1970-01-01 00:00:00 +0000 and b/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.1.log 2012-03-26 13:32:38 +0000 differ === added file 'mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.2.ctl' Binary files a/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.2.ctl 1970-01-01 00:00:00 +0000 and b/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.2.ctl 2012-03-26 13:32:38 +0000 differ === added file 'mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.2.log' Binary files a/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.2.log 1970-01-01 00:00:00 +0000 and b/mysql-test/suite/ndb/backups/wl946_pre/BACKUP-1.2.log 2012-03-26 13:32:38 +0000 differ === added file 'mysql-test/suite/ndb/data/wl946_pre.dat' --- a/mysql-test/suite/ndb/data/wl946_pre.dat 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb/data/wl946_pre.dat 2012-03-26 13:32:38 +0000 @@ -0,0 +1,500 @@ +0,1901,1000-01-01,-838:59:59,1000-01-01 00:00:00,1970-01-01 00:00:01 +1,2155,9999-12-31,838:59:59,9999-12-31 23:59:59,2038-01-19 03:14:07 +2,2000,2000-01-01,00:00:00,2000-01-01 00:00:00,2000-01-01 00:00:00 +3,2099,1937-03-24,-707:33:48,2091-03-01 03:03:19,1992-01-22 11:53:09 +4,2150,2029-06-22,-10:16:40,1969-04-06 16:14:50,1983-04-25 20:14:41 +5,2016,2039-01-22,02:46:15,3199-04-22 05:08:41,1979-04-19 04:35:11 +6,2053,2017-04-16,-02:31:51,2034-08-16 03:59:58,2012-05-16 05:59:23 +7,2015,2024-03-23,-03:33:33,2066-07-19 18:39:59,2023-07-05 14:27:08 +8,2153,4958-01-01,19:42:21,2006-11-20 06:28:10,2014-02-03 03:49:13 +9,2108,2038-12-23,-00:26:53,2083-08-14 18:59:29,2026-06-01 10:09:13 +10,2085,1947-06-27,-20:53:46,1981-08-21 03:12:04,2019-12-26 04:13:40 +11,1901,2009-07-17,09:46:09,2009-02-12 01:18:52,1982-07-23 10:10:48 +12,1929,1945-01-02,00:03:09,1919-06-04 20:58:38,2028-02-28 08:30:54 +13,2155,1471-05-14,00:01:13,2078-06-15 00:10:44,1985-01-03 20:09:46 +14,2032,2048-01-04,-20:07:48,2004-05-31 03:26:28,2032-03-01 22:15:46 +15,2155,2100-01-02,02:45:31,2089-06-18 12:31:37,1989-10-12 08:58:09 +16,1930,2085-01-07,13:34:29,2100-10-22 23:39:01,2038-01-19 03:14:07 +17,1955,2032-03-27,-08:12:22,1900-08-11 19:39:36,1979-12-28 07:31:41 +18,1997,2037-11-27,03:30:30,2024-08-06 08:59:45,1999-01-04 22:59:45 +19,2066,2062-06-12,23:39:00,2049-10-20 23:06:03,1981-03-01 19:14:18 +20,1945,1933-08-25,-16:32:56,1987-12-31 17:13:29,1985-10-31 08:03:47 +21,2048,1983-10-10,-14:02:25,2079-12-12 02:58:08,1972-01-16 15:19:37 +22,1986,1741-12-17,-06:03:55,2042-07-12 06:18:00,1995-04-30 10:30:48 +23,2099,2089-09-10,-00:26:40,1959-01-11 16:31:00,1983-10-13 23:13:35 +24,1992,1942-10-05,-14:20:34,1910-08-26 00:33:57,2001-06-08 10:45:23 +25,2074,2031-06-11,00:41:46,1944-10-10 10:39:40,2030-09-29 23:53:45 +26,2153,1991-06-19,-12:17:59,2071-09-18 08:11:17,2028-12-17 17:59:22 +27,2114,2031-06-07,-03:39:39,1907-10-27 14:53:10,2011-07-02 16:47:05 +28,2102,8574-03-13,-21:12:24,9105-03-09 13:12:48,2027-04-01 05:45:00 +29,2091,2006-07-19,21:51:43,1915-03-25 08:29:41,1997-10-15 06:49:13 +30,2024,5904-03-22,-20:59:26,1902-09-14 07:04:23,2019-12-26 06:10:19 +31,2100,2035-06-22,-23:49:00,1918-11-12 12:17:42,1987-10-03 17:46:35 +32,1973,1970-01-30,-23:59:16,2100-12-25 23:26:05,1997-01-30 13:52:47 +33,2010,1953-05-01,00:29:49,1937-04-07 16:01:34,2037-04-17 01:30:40 +34,2076,2062-02-21,17:42:49,2083-12-02 23:21:04,1974-09-19 10:00:50 +35,2136,2066-07-04,-17:13:39,2041-03-13 23:23:57,1977-11-02 15:01:11 +36,1923,1971-01-19,02:03:30,4759-02-28 09:16:34,2016-09-30 02:46:30 +37,2052,2000-11-21,-02:18:30,2066-01-24 16:29:48,2011-02-02 06:59:50 +38,2152,1969-02-14,216:04:22,1917-08-11 08:46:59,2009-08-08 00:35:19 +39,1978,1952-08-23,07:30:24,1945-01-31 22:43:46,2023-01-30 16:24:05 +40,1939,1984-11-28,01:56:07,1909-06-21 02:57:01,1970-08-19 06:35:00 +41,1935,5140-01-16,15:27:48,2040-07-07 02:32:31,1993-12-26 12:55:17 +42,2095,1957-05-26,-17:04:50,1963-09-22 15:54:47,2025-04-21 04:23:09 +43,1968,2100-12-31,-07:54:47,2028-10-17 02:48:56,2024-04-01 09:33:53 +44,2044,1944-07-31,18:00:52,1900-05-06 01:33:19,2006-09-04 14:08:38 +45,2043,1906-05-08,-20:37:29,2100-01-08 16:42:41,2005-07-31 16:19:38 +46,2074,2078-08-08,-23:40:55,1918-08-31 06:50:59,1995-12-31 15:29:03 +47,2128,2325-10-31,-19:03:57,9437-09-12 04:07:53,2001-10-20 08:04:08 +48,2073,2028-09-30,11:10:00,6359-12-17 00:08:57,1973-08-25 01:29:47 +49,1983,2089-07-13,23:52:03,8687-04-06 05:18:17,2021-05-19 08:03:59 +50,1943,2098-10-21,-185:55:55,2004-07-27 05:05:46,1994-01-11 08:22:00 +51,2009,2095-08-18,03:21:49,1936-10-08 21:05:59,2038-01-19 03:14:07 +52,2104,1981-05-16,17:04:30,1908-09-01 20:34:27,1974-09-09 19:32:28 +53,2080,4388-07-27,19:11:06,2004-02-14 04:52:48,1995-07-25 00:27:17 +54,1963,2097-10-08,68:17:38,1969-08-09 21:23:54,2020-09-30 13:04:51 +55,2103,2854-02-14,-18:01:19,2095-03-21 21:13:21,2004-06-01 15:33:01 +56,2009,1951-11-24,-04:42:15,2006-03-23 18:49:50,2025-02-09 05:04:57 +57,2039,1974-01-08,-17:57:45,1947-07-07 00:47:32,2025-04-27 07:50:59 +58,2103,2028-10-09,-14:15:00,2065-12-11 06:00:50,2021-01-07 10:57:23 +59,2155,1949-04-01,14:39:38,2018-02-13 06:51:09,1972-06-24 00:05:26 +60,1960,1904-01-21,69:27:00,2016-12-27 23:17:27,1978-02-17 18:12:31 +61,1966,1979-05-23,-20:25:59,2005-10-26 14:46:51,1976-04-18 15:32:23 +62,1905,1982-06-13,10:14:02,2004-09-27 23:53:14,2016-06-08 12:19:59 +63,1931,2067-12-31,726:07:22,1981-11-04 21:19:40,1973-01-20 15:54:06 +64,2095,1961-04-19,439:51:24,2077-10-16 06:58:22,1992-01-23 01:15:13 +65,1984,2047-04-30,-02:24:08,1974-06-17 03:59:11,1995-09-03 14:59:00 +66,1935,1938-03-31,22:52:54,1980-05-19 02:39:30,2012-11-13 23:21:15 +67,1989,2078-06-01,-08:19:08,1981-03-07 09:55:59,2030-12-02 00:09:00 +68,2017,1959-07-13,-10:49:14,1955-12-04 11:57:38,2036-07-21 01:46:00 +69,2117,2085-02-27,17:29:49,1924-11-23 09:29:11,2011-12-15 19:09:01 +70,1916,2031-08-10,23:58:06,2059-04-16 09:00:14,1987-09-18 08:29:52 +71,2037,2020-07-27,-22:44:54,2100-07-06 23:37:51,2034-02-07 17:19:56 +72,1952,1949-02-01,-13:36:55,2053-07-25 20:08:46,1999-06-24 19:08:59 +73,2075,1999-01-16,07:47:46,2004-04-02 01:00:30,2034-03-13 23:00:36 +74,2082,1960-06-26,-10:54:16,2053-10-01 20:00:42,1980-04-11 16:46:51 +75,2049,2043-02-16,-14:04:34,2048-05-07 23:21:50,2016-03-05 00:02:32 +76,2090,8875-02-10,21:58:39,2065-06-16 23:18:52,2034-07-26 14:45:50 +77,2145,1986-12-24,-03:03:17,2084-09-15 08:26:32,2000-10-31 03:42:57 +78,1930,1905-01-25,-731:36:40,2031-04-16 04:23:41,1993-05-30 17:01:44 +79,1930,1920-10-22,757:20:55,4289-10-25 23:47:07,2035-11-14 00:47:55 +80,1975,1954-06-13,-680:19:15,1950-02-10 14:05:05,2006-09-18 18:00:43 +81,2107,4868-09-21,15:19:09,2035-08-28 11:37:31,1983-04-14 11:23:34 +82,1925,1932-10-04,01:37:58,2049-09-18 01:24:59,2003-10-18 08:59:11 +83,1942,2058-04-01,19:56:14,1987-03-10 00:39:45,2010-10-29 21:21:14 +84,2153,1978-01-19,06:43:42,2000-10-28 17:38:34,2030-05-25 08:55:26 +85,2155,2018-12-22,183:47:28,2076-09-10 12:58:29,1998-02-24 10:21:08 +86,2024,1921-09-03,18:02:59,1929-02-27 21:35:29,2019-09-01 14:05:02 +87,2035,2057-05-25,12:41:14,1930-11-16 18:42:58,2007-09-03 16:18:43 +88,1935,1957-05-07,18:46:53,2084-01-05 04:45:51,2003-06-30 22:35:53 +89,2042,1949-05-22,-03:09:58,1907-01-17 03:25:05,2016-02-03 09:15:04 +90,1935,1967-10-09,19:37:59,1964-10-01 20:53:23,2022-12-29 19:15:59 +91,2037,2075-01-07,07:56:03,1910-06-21 23:24:07,2028-10-08 11:09:24 +92,2086,1936-09-28,21:40:53,8141-12-03 19:23:27,2004-11-27 20:16:45 +93,2008,1912-11-01,10:30:09,2052-10-04 21:34:25,2028-11-16 10:15:41 +94,2117,2094-12-15,20:36:21,2031-06-04 17:11:29,2036-12-26 09:00:13 +95,2037,2080-11-12,03:46:15,2024-09-20 03:59:15,1996-05-07 04:30:57 +96,1909,1903-02-12,-320:59:25,1983-04-03 03:06:30,2020-07-04 07:07:34 +97,2026,1986-07-11,-05:35:26,2046-04-08 01:47:50,2004-07-26 11:38:52 +98,1993,1972-08-17,07:21:38,2096-08-10 09:00:07,1971-05-24 10:11:00 +99,2131,1902-11-18,-09:27:11,7184-01-07 22:39:33,2038-01-19 03:14:07 +100,2066,1937-05-20,06:00:52,2081-05-26 19:42:29,2031-09-24 01:16:43 +101,2073,2040-03-16,-19:01:01,2071-01-17 02:40:58,2018-03-07 07:49:12 +102,2088,2072-12-31,-03:38:46,2052-12-04 12:57:23,2012-11-14 05:27:04 +103,1934,1975-01-26,-10:32:56,1994-07-20 03:20:18,2035-08-26 04:19:55 +104,2023,1939-01-30,-03:51:20,1943-04-29 19:30:32,1982-05-07 20:13:47 +105,1959,2073-08-24,-10:17:00,1984-10-25 10:36:37,1998-02-07 05:46:45 +106,2064,1945-02-04,-17:59:01,2038-04-03 03:00:10,2020-07-11 09:48:00 +107,1956,1919-05-30,05:45:33,1909-06-12 13:16:16,2021-04-18 01:57:03 +108,2146,2020-09-14,19:24:55,2038-09-14 20:27:39,2014-02-21 17:46:52 +109,2072,2002-01-04,-15:30:43,1952-12-05 21:05:33,2021-05-12 11:34:00 +110,2093,2076-02-16,23:06:43,2022-09-24 15:59:23,2019-01-30 09:04:44 +111,2151,1943-09-09,-09:20:11,1900-08-23 04:01:21,1995-09-23 07:57:00 +112,1962,2100-12-22,248:42:18,2008-05-22 08:53:40,1970-04-10 06:57:35 +113,2045,2002-03-26,12:35:41,1968-03-14 21:29:56,2018-01-15 05:00:12 +114,1999,2064-05-25,13:50:43,2093-05-06 08:53:17,2010-06-28 18:25:09 +115,1980,2100-12-31,18:10:08,1958-08-10 11:39:06,2012-04-11 00:18:58 +116,1923,2060-01-01,03:28:50,9807-06-19 06:37:12,1994-01-05 10:39:59 +117,1986,2068-01-23,-10:15:11,4396-03-27 17:39:42,2018-01-15 23:50:08 +118,1943,2045-07-29,05:21:41,2069-05-23 21:44:00,2005-03-01 00:35:25 +119,2148,1979-02-25,00:18:18,1968-11-23 08:05:18,2014-04-04 00:24:00 +120,1942,2083-03-19,-03:09:17,1972-12-10 23:19:59,1993-11-15 05:46:12 +121,1912,2041-01-14,-51:14:54,2190-09-27 04:34:44,2003-12-10 20:21:42 +122,2066,1988-09-04,-14:00:16,2040-01-07 04:33:23,2003-10-24 08:36:13 +123,2098,8698-09-04,11:25:20,1900-03-12 15:22:46,1974-02-24 06:16:31 +124,1972,1908-02-06,02:40:53,2085-02-15 11:38:16,2004-05-13 09:49:55 +125,1988,2070-08-19,-01:48:34,2021-11-15 08:55:33,2005-09-28 14:00:29 +126,2065,2090-12-17,08:20:53,2090-12-05 16:36:33,1990-10-11 18:00:08 +127,2112,2792-11-12,07:24:06,1924-07-01 16:16:24,1985-02-05 14:29:54 +128,2077,2045-01-23,01:59:46,1957-03-13 07:09:37,2023-10-28 08:08:42 +129,2055,2043-01-31,15:01:59,1967-06-26 23:12:18,2038-01-19 03:14:07 +130,1964,1920-01-17,-11:49:40,9999-09-21 19:52:32,2007-03-13 11:04:07 +131,1931,1978-11-26,01:21:00,1969-10-30 13:30:05,2019-01-26 00:36:43 +132,1941,1995-04-19,20:08:41,2082-01-15 22:54:44,1976-01-20 03:48:23 +133,2125,1917-04-13,18:43:33,1961-02-03 18:34:13,2030-11-21 14:26:41 +134,2142,1952-02-27,-06:23:01,2033-11-24 04:11:02,2033-09-08 19:01:41 +135,2058,2003-11-24,-12:17:24,2084-06-30 15:27:00,1997-05-01 19:00:29 +136,1934,1954-06-02,14:56:00,1968-11-02 11:04:36,2019-12-30 18:10:12 +137,2099,2086-12-08,-08:52:56,1975-04-18 12:27:57,2033-10-07 15:38:50 +138,1947,2074-12-31,20:51:25,2053-12-13 02:20:59,2028-09-27 21:14:44 +139,2091,1900-02-26,-94:59:58,1926-12-24 03:16:59,2013-07-25 17:30:22 +140,2050,1900-01-31,19:08:23,1906-11-09 04:23:41,1994-02-22 11:53:27 +141,2112,5102-08-25,-20:46:19,2093-02-14 23:42:04,2012-04-09 23:44:07 +142,2127,1928-11-13,-06:22:39,2071-11-11 11:21:10,2006-12-17 13:36:17 +143,2006,1900-06-13,-658:19:19,1951-07-23 09:41:40,1991-04-30 05:49:26 +144,2095,1981-06-16,00:07:55,1354-07-12 20:17:31,2038-01-19 03:14:07 +145,2084,1915-08-23,09:42:47,1961-01-22 02:36:48,1981-11-19 17:48:21 +146,1952,1929-12-31,06:00:48,1997-09-27 18:48:59,1990-02-19 14:33:56 +147,2115,2023-11-11,-00:45:02,1908-12-09 11:39:42,2007-01-11 00:21:15 +148,2066,2100-11-23,-637:30:00,2020-12-29 04:39:46,1983-01-23 18:01:15 +149,2147,3631-05-10,06:01:00,1962-07-25 02:44:19,2007-09-15 11:43:58 +150,2143,1992-08-14,01:57:34,2025-03-10 11:27:08,2029-02-24 08:42:22 +151,1920,1975-04-13,838:04:09,1929-05-07 06:13:59,1998-11-21 05:27:36 +152,2101,2031-01-17,06:56:50,1971-08-01 02:11:52,1999-10-18 05:41:07 +153,1901,2098-05-07,-22:30:47,1914-09-05 01:14:01,2028-02-17 01:00:14 +154,1937,1919-01-11,-12:40:08,2035-01-11 14:15:18,2006-05-08 03:48:14 +155,2025,1941-04-13,23:11:38,2049-01-22 00:45:23,1990-08-02 01:50:21 +156,1980,1949-06-16,-13:35:50,2056-03-05 15:02:11,2017-06-12 12:45:26 +157,2038,1989-08-14,-17:32:49,1966-11-01 08:20:20,2034-01-02 03:33:10 +158,2035,2017-06-14,-10:12:05,1977-01-03 15:24:07,1985-08-29 18:59:40 +159,1996,2016-12-15,-09:45:11,1965-07-01 13:51:44,2023-10-31 17:17:18 +160,2146,1970-12-05,-18:00:49,2070-04-01 13:21:49,1986-10-24 19:20:41 +161,1930,2041-04-15,-07:13:12,2044-01-11 13:17:52,2021-03-16 09:55:38 +162,2057,2015-03-12,16:08:22,2094-02-15 04:12:42,1972-05-18 23:04:10 +163,1963,2064-05-01,-12:59:00,2072-05-16 04:54:33,1985-01-25 06:21:25 +164,2024,1932-10-06,11:15:03,1992-03-29 06:32:32,1981-06-26 23:04:56 +165,1901,1966-05-18,02:32:28,2090-03-12 22:39:17,2002-11-20 16:38:51 +166,1920,2048-01-20,293:57:55,1914-08-08 08:07:21,1997-01-10 06:59:35 +167,1953,7102-12-18,-18:55:50,2065-08-31 15:34:35,2032-02-23 10:17:48 +168,1980,4094-06-30,17:57:56,2058-04-16 03:13:02,2011-11-01 07:11:38 +169,2081,2065-09-03,00:12:41,1994-03-08 14:08:23,1988-06-18 19:25:41 +170,1982,2058-01-14,-10:31:13,1964-06-15 15:07:06,2032-01-04 10:44:00 +171,2130,2050-05-16,-56:57:45,2080-01-22 01:47:08,2013-11-20 02:01:34 +172,2143,2004-01-30,19:19:00,1984-01-13 01:33:54,1993-11-01 11:20:56 +173,2025,1929-01-03,06:36:22,1941-01-02 16:04:53,2030-07-16 07:36:16 +174,2081,1944-07-01,-539:38:19,1964-11-05 07:54:33,2014-10-29 00:14:03 +175,2134,2041-07-07,02:29:39,2086-11-27 04:44:40,2002-05-08 22:24:40 +176,1961,1901-12-26,-06:38:42,1976-03-13 23:49:49,2006-10-16 01:47:00 +177,2083,9826-06-12,-08:03:05,2038-08-01 10:48:04,2006-09-07 02:10:13 +178,2106,2040-03-01,-03:54:36,2038-06-14 11:48:08,2027-01-01 02:31:38 +179,1974,2073-04-19,14:58:36,1927-06-16 06:22:59,1984-01-09 00:01:48 +180,1991,1901-10-14,05:15:29,2064-09-23 03:33:44,1998-11-12 15:57:07 +181,2014,2058-07-31,02:06:29,2033-01-22 19:42:01,1971-06-28 06:27:40 +182,2038,2055-07-28,-23:24:39,2037-05-17 05:39:33,1985-07-08 16:05:55 +183,2086,2041-12-06,-11:32:07,2003-01-23 12:19:09,2035-05-28 00:09:10 +184,2074,1933-12-12,-05:05:00,2006-02-28 10:26:00,2038-01-19 03:14:07 +185,1947,1293-09-19,18:06:35,2098-06-24 15:56:35,1970-07-20 08:37:51 +186,1958,9402-05-15,07:46:00,1972-06-28 13:49:00,1975-04-17 13:12:24 +187,1911,4832-10-16,438:38:51,2014-03-28 00:29:34,2030-01-22 16:50:59 +188,1901,1939-03-24,-312:51:53,1965-03-22 15:45:36,2000-08-07 09:51:53 +189,2151,1923-01-24,135:14:09,1937-12-14 16:17:09,1998-01-10 03:00:52 +190,2008,1912-08-17,17:42:56,1933-06-21 09:33:45,2013-06-20 12:25:29 +191,2031,2008-10-12,-06:40:23,1964-07-22 00:41:52,2007-11-07 11:50:58 +192,1927,9782-12-31,-22:00:44,2100-01-14 00:14:14,1970-08-05 08:40:29 +193,2054,1025-10-17,-16:53:46,1972-11-01 18:04:41,2021-11-09 11:50:18 +194,2045,1935-04-05,02:54:39,2002-12-04 00:09:25,1981-02-28 00:38:23 +195,1972,2066-12-28,-02:45:00,2059-12-27 03:37:09,1995-12-25 01:27:09 +196,1928,1925-03-02,14:02:38,2033-03-24 06:39:57,2023-04-13 07:40:59 +197,1901,2100-09-19,01:57:10,2020-01-25 20:17:01,2025-07-23 07:35:28 +198,1968,1901-05-03,14:28:32,1941-10-04 00:42:47,1994-01-13 10:34:48 +199,2148,1928-02-04,-09:46:53,2100-09-14 09:34:31,2029-09-06 00:11:41 +200,1933,2093-05-17,01:07:00,1943-11-16 15:14:59,1997-03-01 07:17:09 +201,1941,1946-06-06,-04:15:35,2065-07-26 08:00:40,1982-03-24 00:12:08 +202,2114,2003-07-24,-16:29:49,2091-08-01 07:34:48,1973-03-27 21:52:09 +203,2079,2010-06-12,-06:48:35,1924-10-03 04:43:31,1993-09-26 09:11:15 +204,2049,2003-04-04,07:07:30,1983-02-07 21:27:55,1973-08-30 01:15:53 +205,1922,1968-07-17,-22:18:22,2068-06-10 06:53:24,2011-04-01 07:50:00 +206,2137,2041-09-23,-744:18:01,2054-08-02 11:52:56,2029-03-01 13:57:45 +207,1930,2042-02-24,-21:45:54,2007-12-12 06:50:14,1985-04-30 05:16:59 +208,2071,1962-12-17,-01:48:17,5669-10-31 00:00:03,1973-11-18 14:14:06 +209,2153,3554-11-13,-21:37:03,1999-02-09 16:49:17,2004-06-26 18:40:22 +210,2001,2065-02-27,-06:47:46,2038-01-19 07:11:47,2029-11-27 22:03:08 +211,1992,1963-11-14,23:17:12,2029-10-31 11:30:39,2024-09-27 06:43:06 +212,2150,1977-01-07,-04:12:43,1913-12-26 14:13:11,2026-02-18 06:20:48 +213,1922,2001-03-03,-04:17:26,1916-02-25 06:31:27,1995-10-16 18:17:34 +214,2144,2088-03-06,-03:42:10,1154-03-15 12:24:54,2030-01-12 01:07:58 +215,2144,1907-08-31,-20:18:19,1999-09-17 12:47:31,2038-01-19 03:14:07 +216,1996,1929-09-20,-00:15:57,1980-03-30 01:05:38,2030-02-08 11:36:26 +217,1931,2080-12-19,-315:31:42,1648-08-11 16:21:32,2017-12-28 10:44:16 +218,2135,2100-05-23,-13:48:44,2006-06-01 11:47:41,2025-08-05 07:00:48 +219,1959,1983-01-17,-11:20:55,6350-07-26 12:36:35,2038-01-19 03:14:07 +220,2133,1949-11-18,16:22:14,2013-11-07 11:28:21,2026-01-28 22:00:38 +221,1942,2041-08-24,-16:31:00,2047-02-19 13:24:47,2016-11-14 04:05:06 +222,1907,2035-12-07,05:44:08,1951-12-21 19:31:08,1973-12-02 22:04:35 +223,1974,1942-02-20,-13:12:57,1932-08-21 20:24:03,2030-04-30 02:15:05 +224,1986,2066-10-31,21:35:00,1956-11-07 20:10:01,2005-10-04 22:41:38 +225,2007,1960-02-12,-10:29:40,2094-01-26 13:41:52,1970-08-09 17:44:05 +226,2098,2035-07-07,20:02:42,2096-06-27 16:12:35,1980-11-20 12:09:14 +227,2112,1966-09-11,23:22:25,1935-09-30 19:07:08,2023-01-27 02:23:26 +228,1923,1904-03-19,-21:30:10,1919-04-15 23:05:28,1990-07-21 00:05:12 +229,2042,1927-07-04,-00:24:22,1285-10-30 23:35:28,1980-08-14 00:29:26 +230,1944,2038-09-15,16:48:20,1983-11-21 15:02:32,1977-11-07 16:51:40 +231,2096,2000-04-14,-03:03:40,1990-07-30 15:19:21,2019-08-28 21:33:22 +232,2078,1956-07-14,-22:21:47,1935-03-17 20:08:31,2009-12-22 01:49:33 +233,1969,2017-03-21,17:50:30,2014-03-19 18:41:26,1999-05-23 10:45:42 +234,2135,2083-06-12,-10:20:06,2044-04-04 19:36:24,1977-11-07 10:51:27 +235,2149,1907-12-07,03:58:42,2024-02-09 02:23:30,2016-01-13 19:41:14 +236,2079,2100-12-12,03:16:48,2057-01-04 19:00:03,1980-12-03 07:01:45 +237,2064,1989-06-11,-17:20:19,1919-09-30 04:10:59,2012-01-03 00:43:54 +238,2046,1939-09-29,01:30:33,2040-11-28 22:01:16,2030-01-11 01:04:08 +239,1915,1919-01-22,-07:31:25,8137-01-03 05:44:48,1979-06-06 12:40:15 +240,2059,2100-07-27,-22:10:37,1982-03-23 14:31:00,1984-02-22 02:51:34 +241,2117,2066-04-12,-18:14:32,2001-01-02 06:24:25,1998-08-13 23:52:45 +242,2051,2045-06-08,-04:27:45,9719-06-03 03:14:50,1999-01-21 04:35:24 +243,2119,1986-07-26,04:44:46,1902-11-19 20:03:38,2037-11-15 22:51:36 +244,2065,9596-12-27,-02:12:02,1900-02-25 02:33:27,1987-05-21 00:43:08 +245,2155,1984-06-16,07:26:32,1923-09-22 11:33:01,2015-04-15 04:34:21 +246,2045,1915-12-22,14:24:24,1918-01-01 19:11:35,1970-09-15 15:59:47 +247,2088,2010-12-01,14:40:08,1966-01-07 21:44:50,1993-11-15 10:40:35 +248,2142,2032-06-12,-19:43:56,4592-06-05 00:17:03,2012-03-19 17:59:04 +249,1951,2005-10-23,-02:21:15,2091-04-21 06:28:38,2010-08-06 17:59:21 +250,2089,3021-02-27,-15:52:30,2205-01-29 01:33:24,2020-11-08 23:59:21 +251,1907,1900-10-18,23:58:53,2089-03-05 16:53:59,2034-10-29 19:00:45 +252,1951,2077-04-09,-20:00:27,7323-01-07 17:31:47,1988-10-01 21:04:57 +253,2122,8321-03-14,16:25:04,1954-12-14 06:35:02,1980-03-01 22:42:21 +254,2080,2040-07-06,-21:32:39,1945-07-21 09:07:09,2034-11-13 21:42:58 +255,1927,2039-01-13,02:48:18,1943-12-21 19:23:23,1988-09-10 13:23:51 +256,1981,2010-11-05,17:33:06,1929-02-01 03:35:53,2020-12-15 07:15:59 +257,1956,1986-05-11,10:48:00,1957-08-31 20:34:06,2009-10-01 00:10:47 +258,1901,1988-06-07,17:05:29,1900-06-01 15:42:56,2004-10-01 07:49:21 +259,1974,1917-10-02,23:04:02,2093-02-07 11:26:09,1981-11-07 16:04:40 +260,1968,1968-03-01,-07:14:49,1957-11-14 09:19:58,2029-10-19 03:10:32 +261,1946,1968-09-26,-01:19:14,2023-09-17 02:10:45,2011-01-20 13:39:45 +262,1981,2043-12-01,-04:43:33,2100-09-18 06:59:47,2012-02-09 03:54:19 +263,2101,1962-08-02,03:37:56,2061-01-21 15:26:34,1981-10-03 13:00:16 +264,1924,2020-11-03,-11:44:06,2036-02-22 03:30:43,1998-03-21 19:03:53 +265,2063,2015-03-02,-07:53:33,1946-12-24 17:08:36,2029-12-23 11:06:09 +266,2091,2008-12-15,-14:32:46,7560-01-05 06:20:58,2026-04-27 00:19:09 +267,1958,1906-05-12,370:48:37,1941-06-30 19:12:33,2001-05-31 11:47:29 +268,1950,2083-12-25,16:24:15,2084-10-09 06:22:30,2018-10-09 23:17:42 +269,2062,2068-01-01,03:27:12,1900-10-11 00:24:14,2003-02-26 07:30:55 +270,1963,2069-12-22,00:12:24,1954-11-11 09:59:59,2001-07-22 13:54:17 +271,1942,2058-01-01,-20:26:55,2013-07-09 23:03:25,2011-03-31 17:08:56 +272,2140,2047-06-28,22:23:18,1975-09-13 23:57:27,1988-12-03 01:18:01 +273,2047,2047-08-23,-21:35:04,2059-06-26 00:31:12,2031-12-01 15:23:29 +274,2119,4964-03-20,-23:16:22,1957-06-02 07:36:32,2011-05-22 20:11:11 +275,2133,1995-02-07,-12:53:58,3820-03-07 00:26:22,1998-02-17 09:19:08 +276,2086,2019-02-11,17:07:47,2032-03-09 05:47:52,1987-09-02 22:58:09 +277,2048,6127-03-16,06:41:04,2024-04-26 10:04:37,2012-11-17 02:27:48 +278,2138,1937-09-24,-00:23:36,2055-07-18 23:32:03,2029-08-02 04:49:36 +279,2071,2008-01-08,-07:58:17,2029-08-07 00:21:44,2029-03-05 07:25:26 +280,1955,2053-05-02,07:01:00,1969-04-06 00:45:11,1982-06-09 15:03:55 +281,2095,2059-10-01,00:25:36,2012-09-13 17:27:26,1992-11-29 15:49:38 +282,2074,2063-06-06,09:03:20,2022-12-12 19:45:29,2025-05-03 11:11:57 +283,2027,2091-05-31,10:28:28,2035-11-18 22:47:52,2006-11-03 14:46:45 +284,2144,1901-10-14,03:47:50,2087-08-02 21:26:46,1988-12-01 16:55:55 +285,2134,8566-04-26,110:23:19,2046-11-01 20:35:44,2004-12-27 02:39:57 +286,1956,2084-06-18,20:02:26,2013-04-30 22:20:17,2003-11-06 16:13:23 +287,2084,2041-02-13,04:53:21,1900-12-07 22:03:29,2012-11-16 23:55:53 +288,2053,1992-12-02,15:09:12,1913-01-05 15:07:04,1975-03-18 08:33:24 +289,1902,1925-12-25,628:43:37,1906-08-03 14:00:38,1970-10-13 16:41:10 +290,1961,8254-02-22,-07:51:03,1981-04-18 18:04:32,1979-09-29 13:29:16 +291,2106,1911-10-09,-00:59:32,2022-05-31 11:22:18,2003-07-25 20:10:00 +292,1924,2073-01-18,-389:17:44,2071-12-31 00:21:35,2018-07-27 07:52:40 +293,2082,2055-04-10,15:59:48,1989-06-29 18:34:34,1986-02-07 13:51:35 +294,2154,6898-08-21,02:54:35,1971-05-05 01:29:36,2031-12-24 16:25:36 +295,1976,1953-03-08,01:24:39,2081-09-12 20:48:08,2007-10-30 05:53:38 +296,1922,2008-05-31,00:47:27,1989-10-27 09:29:36,2018-08-22 03:37:42 +297,1962,1957-03-14,14:06:04,1994-10-31 04:59:28,2003-04-30 22:26:08 +298,1940,2088-08-01,08:37:27,1934-11-29 07:00:31,2000-06-15 11:00:20 +299,1968,1965-12-19,-21:00:43,2078-01-03 05:39:45,2024-06-27 20:19:04 +300,2077,1915-02-22,21:53:49,2083-11-01 05:32:30,2017-03-17 19:42:00 +301,1976,1917-04-30,-766:02:52,2092-12-19 01:13:50,2035-02-25 22:31:20 +302,2013,2096-01-07,-08:53:49,1971-08-02 00:39:02,2038-01-19 03:14:07 +303,2026,2082-07-06,01:17:52,2086-11-03 01:08:59,2022-03-31 18:50:30 +304,1901,1932-07-16,00:17:21,2068-06-27 23:43:27,2015-03-16 22:13:57 +305,2048,2061-03-01,-09:40:54,2030-02-10 11:26:12,2002-09-12 09:07:49 +306,2077,1905-09-02,-08:33:27,5866-01-31 02:06:07,2002-07-20 17:05:51 +307,2072,1987-04-19,-19:35:00,2047-03-28 14:59:32,2015-07-11 03:41:46 +308,1927,2100-12-15,04:53:04,1963-08-23 07:01:34,2009-05-29 00:34:24 +309,2069,2096-01-17,11:59:00,2036-09-14 17:52:55,1982-12-31 01:01:36 +310,2056,1913-06-01,-12:07:19,2088-08-15 11:02:35,2030-09-07 17:04:02 +311,2105,1901-04-18,02:18:19,9541-02-07 05:43:15,1971-09-14 02:56:08 +312,2049,1999-06-01,03:26:08,1969-05-30 02:24:23,2000-04-16 17:36:59 +313,1944,1912-05-27,596:23:36,1952-08-15 23:39:49,1999-10-10 20:00:25 +314,2129,2042-07-13,-595:41:45,1967-01-16 14:01:00,2001-09-07 21:55:35 +315,2153,1919-01-12,656:12:59,2096-05-08 18:06:39,1974-09-03 14:43:00 +316,2035,1975-09-09,-01:17:56,1939-06-21 18:30:59,1988-12-21 22:35:19 +317,1995,2039-12-18,-21:12:43,1907-12-09 09:52:58,2018-04-01 21:27:19 +318,1916,2028-05-25,-00:03:22,1937-11-10 21:25:49,2033-09-20 12:09:46 +319,2101,1913-09-13,-14:21:03,1906-09-14 01:42:27,1997-09-17 16:40:27 +320,1982,2025-09-27,-01:21:23,1983-09-21 21:17:58,2025-01-31 14:49:23 +321,2013,1943-01-31,-04:56:54,1921-04-03 01:37:32,2003-07-17 05:36:41 +322,2123,2069-07-21,19:21:14,1914-12-22 17:13:45,1999-02-17 20:43:42 +323,2054,2077-01-05,-597:21:37,1958-07-14 21:24:37,2026-02-27 18:11:16 +324,1972,1967-10-09,-14:21:01,1982-05-16 09:27:22,1998-09-26 07:06:36 +325,2085,1917-07-21,-06:55:36,1944-10-03 23:14:11,1979-01-05 02:08:13 +326,1967,1997-01-01,20:36:12,2088-04-13 21:16:58,1995-05-03 01:53:17 +327,2119,1938-11-03,-12:33:35,2033-04-16 13:16:01,2031-12-25 13:02:59 +328,2094,2079-02-17,-08:23:07,2061-01-10 10:58:31,2027-05-09 06:58:16 +329,2101,2033-03-24,05:25:21,2053-08-31 12:32:05,1981-06-23 14:02:44 +330,1981,1903-10-14,19:48:30,1964-04-03 05:30:23,2001-11-04 06:02:18 +331,1936,3166-07-07,00:12:27,1977-05-23 04:02:36,2038-01-07 21:50:52 +332,2121,1966-01-22,06:25:28,1912-03-30 21:04:38,1998-10-07 08:43:49 +333,2123,1972-04-06,09:37:41,7220-07-11 11:35:29,2023-02-21 04:26:00 +334,2086,1909-08-01,-14:29:18,1953-03-02 13:57:12,2038-01-11 23:46:55 +335,2000,1951-08-05,-06:42:56,5539-10-27 03:48:59,2025-10-11 21:58:09 +336,2061,2057-11-10,23:37:28,1999-04-24 19:59:21,2029-01-14 00:36:29 +337,1914,1944-03-25,-04:14:17,2070-09-01 11:53:10,1971-09-29 17:17:51 +338,2068,2015-01-20,17:46:24,2079-01-04 15:38:00,2018-12-27 18:44:42 +339,2154,1911-10-17,-06:59:03,1916-12-17 15:33:11,1973-07-04 20:59:00 +340,2020,1963-04-22,-19:23:25,2099-01-03 23:24:20,1988-09-26 09:00:25 +341,1951,2053-05-11,-19:12:23,2049-10-30 16:54:49,1974-08-01 01:54:17 +342,1973,2007-12-05,23:02:59,1973-08-25 05:07:21,1996-05-31 17:04:25 +343,2078,1936-09-21,-09:03:28,1999-06-06 23:01:35,2026-12-15 22:17:09 +344,2107,2074-09-09,628:49:23,1916-04-15 05:19:50,1984-10-15 11:01:55 +345,2144,1994-06-07,21:03:54,1904-06-03 15:35:40,2010-04-21 00:55:32 +346,1979,1986-01-12,-141:17:38,2073-09-12 10:10:06,1974-01-20 00:03:02 +347,2087,2020-02-16,-04:47:02,1910-09-03 12:02:02,2025-07-02 18:06:23 +348,2116,2032-03-28,05:27:36,2027-08-12 02:43:32,2019-03-12 16:50:51 +349,1913,1905-07-01,-23:37:50,2086-02-02 19:19:21,2036-04-10 03:10:25 +350,2132,1913-09-24,-18:45:45,2026-10-03 12:56:13,1987-10-03 23:00:25 +351,1943,1989-01-27,-160:50:25,1900-08-25 15:00:14,2011-01-30 23:05:54 +352,2150,2945-04-27,-00:09:45,7108-11-09 05:59:34,1997-07-05 10:54:12 +353,2038,1924-01-23,07:10:29,2006-03-14 10:32:11,2003-11-17 18:25:09 +354,2013,1863-10-03,18:53:13,1936-02-07 10:47:36,2016-04-10 01:35:13 +355,1908,1935-09-06,02:29:20,1957-10-14 15:40:34,1974-07-05 05:25:31 +356,2087,2043-08-30,15:25:26,1981-12-23 05:49:48,1982-08-24 03:54:13 +357,2077,2096-09-07,-50:51:52,1978-11-20 05:02:30,1998-08-10 11:16:10 +358,2057,1931-08-01,16:26:01,2098-02-20 05:59:22,1994-05-31 00:27:07 +359,2020,2018-06-25,15:44:35,1957-01-03 20:26:52,2036-02-22 12:59:39 +360,2102,2010-11-24,-12:49:59,2094-01-24 12:20:01,1997-04-02 10:44:51 +361,2127,1946-05-02,-788:36:39,2043-09-13 22:42:18,2032-10-25 08:48:19 +362,1903,1966-10-29,08:12:30,1926-10-11 07:02:15,2031-12-03 08:03:56 +363,2093,2050-02-28,00:59:24,2077-05-06 23:51:32,2029-12-24 07:15:34 +364,1965,2011-10-22,07:59:18,1973-09-29 20:12:31,2015-05-19 10:25:04 +365,2006,2017-01-17,09:43:59,2020-05-30 05:04:26,1983-11-10 16:02:40 +366,1918,1964-09-07,21:39:16,1954-04-18 16:42:48,1982-09-29 02:34:04 +367,2046,1933-05-09,04:56:30,2067-12-04 18:09:48,2013-11-21 04:49:56 +368,2086,2019-01-01,10:35:45,1935-02-15 21:09:50,1988-11-23 08:02:05 +369,2110,2012-06-30,09:08:20,1976-12-31 17:34:25,2002-12-18 19:26:23 +370,1901,2024-11-29,11:40:43,2100-08-24 20:40:14,2013-06-04 04:59:19 +371,2021,1976-05-13,22:59:02,2000-12-13 13:24:27,2021-02-07 18:19:38 +372,2006,2098-12-17,01:22:51,1994-12-12 07:09:37,2026-10-01 15:56:06 +373,1923,2040-10-25,00:28:11,2089-10-26 05:34:46,1978-02-27 18:19:59 +374,2057,2091-02-06,17:27:59,1936-07-07 07:17:19,1998-05-02 18:44:03 +375,1953,1975-12-21,15:12:14,1990-03-28 07:56:36,2016-12-17 21:56:49 +376,2079,2082-11-30,368:34:31,9733-01-17 00:33:38,1997-10-31 00:24:57 +377,1904,2087-11-02,-14:55:14,5269-07-14 16:39:02,1970-11-25 12:44:33 +378,1901,1907-10-12,13:35:14,1964-08-04 11:01:23,2006-05-06 17:53:12 +379,1916,2091-02-06,17:00:25,2022-12-23 15:25:44,1978-11-25 10:54:00 +380,1950,2023-10-09,-09:59:20,1920-06-25 04:25:54,2009-05-05 17:50:21 +381,1907,1988-02-16,-14:24:15,2053-08-02 04:55:00,2023-09-11 03:02:03 +382,1949,2019-06-23,-18:17:52,2004-08-28 23:01:01,2027-05-11 05:00:46 +383,1930,2059-12-05,-790:21:56,1903-06-29 18:55:47,2038-01-19 03:14:07 +384,2083,2008-01-01,-247:02:24,2074-09-01 21:10:16,2008-03-03 01:00:54 +385,2133,1978-12-03,-16:55:00,1909-04-27 10:20:49,2006-02-17 00:08:02 +386,1944,1990-03-15,-00:06:54,1963-04-12 05:36:05,1992-10-22 01:02:07 +387,2039,2083-03-02,15:10:13,1992-10-17 16:40:57,1988-01-01 18:35:35 +388,2101,9858-07-01,-04:59:54,2029-05-02 00:55:14,1972-09-11 04:07:41 +389,2113,4177-08-12,-05:06:06,2066-11-05 14:00:20,2028-09-07 10:30:46 +390,2148,2100-11-15,09:44:28,2045-05-15 21:04:54,1972-06-07 04:29:01 +391,2103,2097-08-28,-05:02:26,2098-02-06 02:59:10,2011-11-26 03:06:02 +392,2010,2072-06-15,-03:24:52,1987-03-14 18:42:08,1978-07-05 23:35:18 +393,1930,2060-05-26,-19:13:59,2046-11-08 15:07:56,1982-07-13 00:54:15 +394,2154,1990-11-23,10:13:35,2087-02-27 08:54:52,1997-01-11 23:35:00 +395,1981,2038-07-24,49:34:03,5972-07-15 04:44:30,2010-11-08 14:00:57 +396,1988,1930-11-03,-16:16:30,2017-08-25 12:59:59,2013-11-03 21:27:04 +397,2053,1900-12-20,02:29:02,1940-10-28 15:56:43,2002-09-01 08:27:00 +398,1959,1993-11-27,-18:07:49,2003-09-21 00:31:43,2018-03-16 08:59:58 +399,1961,1983-05-28,187:32:15,2079-04-11 03:01:38,2035-09-04 02:24:21 +400,2124,2070-02-17,08:16:39,1953-12-06 18:26:05,2033-02-01 15:46:07 +401,2057,2043-02-17,20:43:49,1982-09-12 02:45:22,2006-06-13 15:43:09 +402,2053,1924-09-28,10:02:37,2084-09-27 06:32:44,1979-03-28 03:53:59 +403,2058,2055-03-24,-21:09:44,1999-08-29 10:34:16,2018-07-21 14:06:36 +404,2144,2100-03-01,-23:59:20,1932-01-26 07:01:08,1970-10-09 19:21:36 +405,1953,2032-04-08,-23:37:08,1902-02-11 18:23:58,1989-05-10 09:07:59 +406,2086,1924-07-25,-18:14:53,2039-03-21 20:02:30,1971-01-24 22:22:56 +407,2105,1939-12-19,04:37:00,2035-09-15 00:59:39,1987-05-03 10:46:19 +408,1940,2019-04-28,-18:24:00,2100-07-31 14:09:22,2038-01-19 03:14:07 +409,1936,1986-10-01,-15:18:36,2018-09-04 05:13:20,1974-02-10 08:36:57 +410,1991,1997-06-12,23:52:55,2059-11-05 22:49:07,2028-03-14 10:18:43 +411,2007,2000-10-08,-09:48:32,1900-10-24 07:07:59,1993-01-22 19:01:00 +412,1962,2074-09-27,-23:05:42,1934-05-29 23:02:47,1974-03-13 22:05:30 +413,1975,3579-12-09,-23:08:21,1989-08-05 09:01:47,1981-10-05 13:49:46 +414,1918,1908-12-12,14:25:22,2026-09-03 06:57:10,1981-01-21 09:13:23 +415,2049,1947-12-13,-00:55:00,1925-12-08 20:41:15,1978-08-28 05:30:36 +416,1958,2061-08-18,15:32:08,1941-05-29 09:16:17,2023-10-17 18:25:42 +417,2084,1931-02-28,01:18:41,2010-10-25 19:10:59,2026-07-25 19:34:03 +418,2033,1900-06-16,09:39:50,2092-10-24 17:35:00,2000-12-25 12:48:16 +419,2066,1992-02-22,-13:31:40,1998-10-22 02:00:06,1971-04-02 10:53:39 +420,2118,2089-06-02,00:59:40,2033-03-01 05:02:33,1978-07-08 17:02:37 +421,2130,1953-07-27,603:59:39,1918-01-17 19:09:33,2002-03-20 05:59:53 +422,2016,2022-03-18,-04:14:30,2044-02-01 03:16:59,1972-06-20 02:48:03 +423,2112,1941-08-31,15:57:59,2012-04-23 10:45:53,2029-08-21 00:44:19 +424,2079,1942-02-08,20:21:48,2063-11-25 14:42:57,1996-11-09 09:36:35 +425,1991,1922-03-31,11:54:07,2020-06-01 23:45:48,2007-10-12 03:46:09 +426,2101,2076-04-08,17:20:09,1976-10-20 11:26:00,1970-10-19 00:08:53 +427,2126,1963-02-21,-09:14:15,1942-06-19 19:06:11,2024-07-28 17:39:27 +428,2132,2088-02-26,-00:39:08,2076-03-16 10:02:57,1989-12-27 16:50:52 +429,1927,2095-03-21,-05:26:48,2098-09-22 03:06:09,2038-01-19 03:14:07 +430,2094,2036-12-18,20:34:33,2071-11-27 18:09:41,1988-04-04 19:26:16 +431,1944,1998-06-16,-04:31:11,2848-01-05 21:59:45,1977-03-19 02:29:19 +432,1907,1968-07-20,16:17:40,1908-08-26 17:38:00,2032-07-09 12:20:18 +433,1990,2092-08-27,-22:38:47,2061-06-15 12:21:35,1979-08-16 00:58:39 +434,2107,1978-01-28,-01:33:22,1941-01-02 13:52:40,2013-04-04 21:38:17 +435,2150,1963-08-10,06:42:20,2041-01-06 02:54:13,1970-01-04 00:49:26 +436,1905,1955-12-06,09:00:47,1956-07-29 13:18:59,1993-03-13 01:54:39 +437,2072,1957-03-21,-18:36:42,1976-03-23 07:24:33,1981-08-08 19:18:34 +438,2041,1991-09-01,-03:20:17,1929-04-12 00:27:57,1974-10-24 16:08:53 +439,1922,2019-10-03,07:47:48,2063-04-30 13:59:10,2018-12-02 21:29:55 +440,2040,2044-09-29,15:17:52,2005-12-04 13:05:02,1994-05-17 14:35:14 +441,2059,1946-06-16,20:08:09,1908-12-22 14:02:11,1979-06-12 21:59:30 +442,1940,1913-11-29,17:34:16,1916-04-05 03:37:46,1983-07-21 15:21:17 +443,1913,7118-01-02,09:00:08,2011-10-21 19:16:11,2003-02-04 22:49:20 +444,1915,1977-05-09,-22:16:49,1970-02-05 14:21:01,2004-05-11 11:57:54 +445,2084,2011-02-19,-12:31:13,1913-10-16 23:25:21,1991-03-17 11:55:08 +446,1912,2033-09-14,17:51:13,1909-09-05 02:43:18,1999-07-08 17:08:16 +447,2045,1994-07-03,-10:27:54,2061-03-25 00:06:51,2015-03-17 17:37:20 +448,1904,1906-04-30,-00:50:52,2031-12-16 09:15:47,1982-01-01 21:00:48 +449,2102,5565-03-31,-08:37:34,2015-12-12 17:47:43,2014-01-13 18:20:17 +450,1985,2072-06-07,-22:39:30,1997-04-12 13:26:24,2005-10-24 11:23:20 +451,1982,1000-01-01,15:39:38,2086-03-23 12:00:27,1975-02-27 05:37:27 +452,2108,2087-02-06,-20:59:21,1982-10-02 09:26:33,2029-01-06 14:59:46 +453,1902,2067-10-19,-00:08:59,1963-08-01 03:45:02,1978-04-12 05:16:02 +454,1901,8509-09-15,13:45:22,1984-03-21 22:48:11,2012-03-30 01:31:49 +455,2135,1088-12-23,-98:01:07,2033-05-03 13:00:05,2025-09-13 06:24:15 +456,2021,2100-08-10,142:43:20,2030-01-12 20:12:34,2028-06-22 09:48:00 +457,1924,2079-03-24,02:59:49,2028-09-05 09:38:51,1979-02-22 00:18:59 +458,2025,2053-06-21,-17:09:09,1914-04-07 02:33:10,2036-03-25 19:47:10 +459,1987,3160-03-29,-125:38:00,1000-11-22 09:01:34,1975-01-01 18:16:45 +460,2083,2040-12-17,08:57:19,2046-01-02 23:15:33,2000-01-29 23:45:51 +461,1956,2012-10-01,-18:00:50,2025-01-29 10:30:53,2035-02-25 21:12:13 +462,2089,2046-12-30,19:59:12,1981-03-01 17:26:18,2011-06-14 23:08:08 +463,1908,2020-05-03,-16:00:55,1985-09-10 08:52:56,2025-10-13 22:02:03 +464,1906,1918-02-10,-11:07:23,1931-04-24 21:57:39,2013-12-31 23:13:52 +465,1933,2039-12-03,-08:00:03,7420-04-08 15:59:35,2032-10-01 05:32:51 +466,2003,1982-09-30,-21:01:26,2088-01-26 02:07:49,1976-03-22 10:46:05 +467,2071,2010-06-09,09:48:58,2070-10-10 19:00:00,1984-04-15 10:58:10 +468,2155,1989-12-29,-15:48:34,1913-10-19 10:46:24,2025-05-30 01:06:03 +469,1967,1935-10-29,-23:14:34,2088-02-18 00:04:58,1981-03-28 00:44:04 +470,2038,2081-07-04,07:02:32,1989-08-07 22:17:02,1980-11-10 11:16:22 +471,2077,1984-06-29,-23:37:52,4959-03-13 03:06:10,2032-02-06 23:44:25 +472,2076,2018-01-30,05:11:07,2016-08-23 01:02:54,2030-07-31 20:10:19 +473,1967,2047-01-21,07:40:44,1951-02-18 07:14:45,1986-10-09 02:27:13 +474,2089,1926-04-01,-13:06:00,2048-07-12 18:13:42,1971-09-27 21:00:51 +475,1944,2027-11-24,-08:00:29,6946-05-23 20:16:29,2038-01-19 03:14:07 +476,1955,1997-05-24,-20:29:39,2004-10-27 13:21:23,2013-06-02 00:28:54 +477,2065,1942-08-31,-07:14:15,2013-11-05 19:41:34,1999-12-08 04:34:58 +478,2155,2091-05-16,14:56:34,1993-08-04 23:00:28,2025-07-11 18:50:25 +479,2067,1985-04-09,-08:52:17,2031-03-31 21:55:37,2038-01-19 03:14:07 +480,1984,2077-07-07,00:05:49,1956-02-06 13:40:17,1973-11-04 18:52:37 +481,1920,1948-06-19,-03:02:55,1954-05-28 13:45:30,2030-01-01 08:47:14 +482,2099,2058-02-03,-09:09:36,1131-12-31 19:52:51,1985-05-08 01:42:24 +483,1954,1912-10-21,16:46:00,1976-07-21 08:58:11,2038-01-19 03:14:07 +484,2103,1981-10-21,-18:04:21,1958-12-10 06:48:29,2010-07-28 12:54:45 +485,1906,1908-02-15,-666:39:23,2062-05-06 03:10:56,1974-12-03 22:39:57 +486,1921,2044-08-25,-17:28:41,1940-10-17 07:49:58,2025-06-21 05:13:58 +487,2032,1925-05-07,02:13:41,1949-05-14 23:34:21,1977-12-29 09:15:21 +488,1905,2042-01-25,-21:29:42,2062-10-11 23:30:10,2025-11-07 08:16:07 +489,1995,2011-05-01,00:15:35,2022-10-30 04:04:00,1971-12-15 14:56:23 +490,2046,2077-03-21,15:02:38,2075-04-16 22:15:15,1974-12-01 17:55:43 +491,1910,1937-01-07,-13:25:30,1973-01-28 05:53:00,1998-08-11 03:18:54 +492,2019,1923-04-25,-07:20:38,4846-04-22 21:51:07,1989-12-07 00:56:16 +493,1985,9875-02-15,-209:20:26,2100-11-01 22:46:19,2010-10-02 02:41:07 +494,2063,1942-01-15,-02:08:49,2384-07-15 03:11:13,1982-06-01 07:54:44 +495,2048,2031-04-24,00:10:00,1943-09-07 03:20:47,2007-11-22 19:54:37 +496,2025,1919-02-19,22:02:45,2016-09-02 18:07:52,2036-01-29 21:54:37 +497,2091,9766-03-20,-03:36:08,2012-09-16 22:25:47,1978-06-06 13:59:54 +498,2060,3570-09-04,04:26:50,2018-10-03 11:40:09,1979-03-02 14:21:40 +499,2059,1914-08-31,21:56:57,4487-12-04 21:36:51,2036-12-17 05:16:25 === added file 'mysql-test/suite/ndb/r/ndb_wl946_pre.result' --- a/mysql-test/suite/ndb/r/ndb_wl946_pre.result 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb/r/ndb_wl946_pre.result 2012-03-29 11:30:18 +0000 @@ -0,0 +1,231 @@ +drop table if exists t1; +select @@session.time_zone; +@@session.time_zone +SYSTEM +set time_zone = '+00:00'; +select @@session.time_zone; +@@session.time_zone ++00:00 +# create table +create table t1 ( +a int not null, +b year not null default '2000', +c date not null default '2000-01-02', +d time not null default '10:11:12', +e datetime not null default '2000-01-02 10:11:12', +f timestamp not null default '2000-01-02 10:11:12', +primary key using hash (a), +index bx (b), +index cx (c), +index dx (d), +index ex (e), +index fx (f) +) engine=ndb; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL, + `b` year(4) NOT NULL DEFAULT '2000', + `c` date NOT NULL DEFAULT '2000-01-02', + `d` time NOT NULL DEFAULT '10:11:12', + `e` datetime NOT NULL DEFAULT '2000-01-02 10:11:12', + `f` timestamp NOT NULL DEFAULT '2000-01-02 10:11:12', + PRIMARY KEY (`a`) USING HASH, + KEY `bx` (`b`), + KEY `cx` (`c`), + KEY `dx` (`d`), + KEY `ex` (`e`), + KEY `fx` (`f`) +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 +# test defaults +insert into t1 (a) values (0); +select * from t1; +a b c d e f +0 2000 2000-01-02 10:11:12 2000-01-02 10:11:12 2000-01-02 10:11:12 +delete from t1; +# load data +load data local infile 'suite/ndb/data/wl946_pre.dat' + into table t1 fields terminated by ',' lines terminated by '\n'; +# check contents +select count(*), sum(crc32(concat(a,b,c,d,e,f))) from t1; +count(*) sum(crc32(concat(a,b,c,d,e,f))) +500 1105949732775 +# run backup +# index queries +select * from t1 where b = '1969'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where c = '2017-03-21'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where d = '17:50:30'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where e = '2014-03-19 18:41:26'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where f = '1999-05-23 10:45:42'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select count(*) from t1 +where b between '2000' and 2010; +count(*) +15 +select count(*) from t1 +where c between '2000-01-01' and '2010-01-01'; +count(*) +20 +select count(*) from t1 +where d between '-20:30:40' and '20:30:40'; +count(*) +381 +select count(*) from t1 +where e between '2000-01-01 20:30:40' and '2010-01-01 20:30:40'; +count(*) +23 +select count(*) from t1 +where f between '2000-01-01 20:30:40' and '2010-01-01 20:30:40'; +count(*) +67 +# check results via myisam +alter table t1 engine=myisam; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL, + `b` year(4) NOT NULL DEFAULT '2000', + `c` date NOT NULL DEFAULT '2000-01-02', + `d` time NOT NULL DEFAULT '10:11:12', + `e` datetime NOT NULL DEFAULT '2000-01-02 10:11:12', + `f` timestamp NOT NULL DEFAULT '2000-01-02 10:11:12', + PRIMARY KEY (`a`) USING HASH, + KEY `bx` (`b`), + KEY `cx` (`c`), + KEY `dx` (`d`), + KEY `ex` (`e`), + KEY `fx` (`f`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +select count(*), sum(crc32(concat(a,b,c,d,e,f))) from t1; +count(*) sum(crc32(concat(a,b,c,d,e,f))) +500 1105949732775 +select * from t1 where b = '1969'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where c = '2017-03-21'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where d = '17:50:30'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where e = '2014-03-19 18:41:26'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where f = '1999-05-23 10:45:42'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select count(*) from t1 +where b between '2000' and 2010; +count(*) +15 +select count(*) from t1 +where c between '2000-01-01' and '2010-01-01'; +count(*) +20 +select count(*) from t1 +where d between '-20:30:40' and '20:30:40'; +count(*) +381 +select count(*) from t1 +where e between '2000-01-01 20:30:40' and '2010-01-01 20:30:40'; +count(*) +23 +select count(*) from t1 +where f between '2000-01-01 20:30:40' and '2010-01-01 20:30:40'; +count(*) +67 +# drop table +drop table t1; +# restore meta from backup +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL, + `b` year(4) NOT NULL DEFAULT '2000', + `c` date NOT NULL DEFAULT '2000-01-02', + `d` time NOT NULL DEFAULT '10:11:12', + `e` datetime NOT NULL DEFAULT '2000-01-02 10:11:12', + `f` timestamp NOT NULL DEFAULT '2000-01-02 10:11:12', + PRIMARY KEY (`a`) USING HASH, + KEY `bx` (`b`), + KEY `cx` (`c`), + KEY `dx` (`d`), + KEY `ex` (`e`), + KEY `fx` (`f`) +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 +# restore data from backup +# check contents +select count(*), sum(crc32(concat(a,b,c,d,e,f))) from t1; +count(*) sum(crc32(concat(a,b,c,d,e,f))) +500 1105949732775 +# drop table +drop table t1; +# restore meta from wl946_pre +Attributes: +a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY +b Year NOT NULL AT=FIXED ST=MEMORY DEFAULT 2000 +c Date NOT NULL AT=FIXED ST=MEMORY DEFAULT 2000-01-02 +d Time NOT NULL AT=FIXED ST=MEMORY DEFAULT 10:11:12 +e Datetime NOT NULL AT=FIXED ST=MEMORY DEFAULT 2000-01-02/10:11:12 +f Timestamp NOT NULL AT=FIXED ST=MEMORY DEFAULT 946807872 +Indexes: +bx(b) - OrderedIndex +cx(c) - OrderedIndex +dx(d) - OrderedIndex +ex(e) - OrderedIndex +fx(f) - OrderedIndex +# restore data from wl946_pre +# check contents +select count(*), sum(crc32(concat(a,b,c,d,e,f))) from t1; +count(*) sum(crc32(concat(a,b,c,d,e,f))) +500 1105949732775 +# index queries +select * from t1 where b = '1969'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where c = '2017-03-21'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where d = '17:50:30'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where e = '2014-03-19 18:41:26'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select * from t1 where f = '1999-05-23 10:45:42'; +a b c d e f +233 1969 2017-03-21 17:50:30 2014-03-19 18:41:26 1999-05-23 10:45:42 +select count(*) from t1 +where b between '2000' and 2010; +count(*) +15 +select count(*) from t1 +where c between '2000-01-01' and '2010-01-01'; +count(*) +20 +select count(*) from t1 +where d between '-20:30:40' and '20:30:40'; +count(*) +381 +select count(*) from t1 +where e between '2000-01-01 20:30:40' and '2010-01-01 20:30:40'; +count(*) +23 +select count(*) from t1 +where f between '2000-01-01 20:30:40' and '2010-01-01 20:30:40'; +count(*) +67 +set time_zone = default; +select @@session.time_zone; +@@session.time_zone +SYSTEM +drop table t1; === added file 'mysql-test/suite/ndb/t/ndb_wl946_create.inc' --- a/mysql-test/suite/ndb/t/ndb_wl946_create.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb/t/ndb_wl946_create.inc 2012-03-26 13:32:38 +0000 @@ -0,0 +1,19 @@ +# create table for ndb_946 tests + +eval +create table t1 ( + a int not null, + b year not null default '2000', + c date not null default '2000-01-02', + d time$prec not null default '10:11:12$frac', + e datetime$prec not null default '2000-01-02 10:11:12$frac', + f timestamp$prec not null default '2000-01-02 10:11:12$frac', + primary key using hash (a), + index bx (b), + index cx (c), + index dx (d), + index ex (e), + index fx (f) +) engine=ndb; + + === added file 'mysql-test/suite/ndb/t/ndb_wl946_pre.test' --- a/mysql-test/suite/ndb/t/ndb_wl946_pre.test 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb/t/ndb_wl946_pre.test 2012-03-29 11:30:18 +0000 @@ -0,0 +1,84 @@ +--source include/have_ndb.inc +--source include/not_embedded.inc + +--disable_warnings +drop table if exists t1; +--enable_warnings + +# runs before and after wl#946 / wl#6231 +# result file is same (avoid ndb_desc if new types are possible) +# also creates a backup used in ndb_wl946_post.test + +select @@session.time_zone; +set time_zone = '+00:00'; +select @@session.time_zone; + +--echo # create table +--let $prec= +--let $frac= +--source ndb_wl946_create.inc +show create table t1; + +--echo # test defaults +insert into t1 (a) values (0); +select * from t1; +delete from t1; + +--echo # load data +load data local infile 'suite/ndb/data/wl946_pre.dat' + into table t1 fields terminated by ',' lines terminated by '\n'; + +--echo # check contents +select count(*), sum(crc32(concat(a,b,c,d,e,f))) from t1; + +--echo # run backup +--source include/ndb_backup.inc + +--echo # index queries +--source ndb_wl946_pre_query.inc + +--echo # check results via myisam +alter table t1 engine=myisam; +show create table t1; +select count(*), sum(crc32(concat(a,b,c,d,e,f))) from t1; +--source ndb_wl946_pre_query.inc + +--echo # drop table +drop table t1; + +--echo # restore meta from backup +--exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 1 -m --print-meta $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT +show create table t1; + +--echo # restore data from backup +--exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 1 -r $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 2 -r $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT + +--echo # check contents +select count(*), sum(crc32(concat(a,b,c,d,e,f))) from t1; + +--echo # drop table +drop table t1; + +--echo # restore meta from wl946_pre +--exec $NDB_RESTORE --no-defaults -b 1 -n 1 -m --print-meta $MYSQL_TEST_DIR/suite/ndb/backups/wl946_pre >> $NDB_TOOLS_OUTPUT +# datetime,timestamp default wrong on solaris (probably bug#53818) +# show create table t1; +# ndb_restore creates old types +--source show_attributes.inc +--source show_indexes.inc + +--echo # restore data from wl946_pre +--exec $NDB_RESTORE --no-defaults -b 1 -n 1 -r $MYSQL_TEST_DIR/suite/ndb/backups/wl946_pre >> $NDB_TOOLS_OUTPUT +--exec $NDB_RESTORE --no-defaults -b 1 -n 2 -r $MYSQL_TEST_DIR/suite/ndb/backups/wl946_pre >> $NDB_TOOLS_OUTPUT + +--echo # check contents +select count(*), sum(crc32(concat(a,b,c,d,e,f))) from t1; + +--echo # index queries +--source ndb_wl946_pre_query.inc + +set time_zone = default; +select @@session.time_zone; + +drop table t1; === added file 'mysql-test/suite/ndb/t/ndb_wl946_pre_query.inc' --- a/mysql-test/suite/ndb/t/ndb_wl946_pre_query.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb/t/ndb_wl946_pre_query.inc 2012-03-26 13:32:38 +0000 @@ -0,0 +1,15 @@ +select * from t1 where b = '1969'; +select * from t1 where c = '2017-03-21'; +select * from t1 where d = '17:50:30'; +select * from t1 where e = '2014-03-19 18:41:26'; +select * from t1 where f = '1999-05-23 10:45:42'; +select count(*) from t1 +where b between '2000' and 2010; +select count(*) from t1 +where c between '2000-01-01' and '2010-01-01'; +select count(*) from t1 +where d between '-20:30:40' and '20:30:40'; +select count(*) from t1 +where e between '2000-01-01 20:30:40' and '2010-01-01 20:30:40'; +select count(*) from t1 +where f between '2000-01-01 20:30:40' and '2010-01-01 20:30:40'; === added file 'mysql-test/suite/ndb/t/show_indexes.inc' --- a/mysql-test/suite/ndb/t/show_indexes.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb/t/show_indexes.inc 2012-03-26 13:32:38 +0000 @@ -0,0 +1,23 @@ +--disable_query_log +let $dump_file = $MYSQLTEST_VARDIR/tmp/desc.txt; + +# Dump the output of ndb_desc to file +--exec $NDB_DESC --no-defaults -d test t1 > $dump_file + +# Load the file into a temporary table +CREATE TEMPORARY TABLE test.desc (a varchar(512)) ENGINE = HEAP; + +# needed for embedded +--chmod 0777 $dump_file +--replace_result $dump_file DUMP_FILE +eval LOAD DATA INFILE '$dump_file' INTO TABLE test.desc; +--remove_file $dump_file + +# Query the temporary table +SELECT TRIM(TRAILING "\r" FROM a) as 'Indexes:' FROM test.desc + WHERE a REGEXP BINARY "- (UniqueHashIndex|OrderedIndex)" + AND a NOT LIKE "PRIMARY KEY%" + ORDER BY a; + +DROP TABLE test.desc; +--enable_query_log === modified file 'sql/ha_ndbcluster.cc' --- a/sql/ha_ndbcluster.cc 2012-03-28 17:03:26 +0000 +++ b/sql/ha_ndbcluster.cc 2012-03-30 13:18:59 +0000 @@ -14675,7 +14675,7 @@ ha_ndbcluster::parent_of_pushed_join() c uint parent_ix= m_pushed_join_member ->get_query_def().getQueryOperation(m_pushed_join_operation) ->getParentOperation(0) - ->getQueryOperationIx(); + ->getOpNo(); return m_pushed_join_member->get_table(parent_ix); } return NULL; === modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.cpp' --- a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp 2012-03-22 14:18:01 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp 2012-03-30 13:18:59 +0000 @@ -181,8 +181,8 @@ protected: const NdbQueryOperand* const keys[], const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error); virtual const NdbQueryLookupOperationDef& getInterface() const @@ -214,10 +214,11 @@ private: const NdbQueryOperand* const keys[], const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error) - : NdbQueryLookupOperationDefImpl(table,keys,options,ident,ix,id,error) + : NdbQueryLookupOperationDefImpl(table, keys, options, ident, opNo, + internalOpNo, error) {} virtual NdbQueryOperationDef::Type getType() const @@ -244,11 +245,12 @@ private: const NdbQueryOperand* const keys[], const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error) // Add 1 to 'id' since index lookup is serialized as two operations. - : NdbQueryLookupOperationDefImpl(table,keys,options,ident,ix,id+1,error), + : NdbQueryLookupOperationDefImpl(table, keys, options, ident, opNo, + internalOpNo+1, error), m_index(index) {} @@ -280,10 +282,11 @@ private: const NdbTableImpl& table, const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error) - : NdbQueryScanOperationDefImpl(table,options,ident,ix,id,error), + : NdbQueryScanOperationDefImpl(table, options, ident, opNo, + internalOpNo, error), m_interface(*this) {} @@ -626,9 +629,9 @@ NdbQueryIndexScanOperationDefImpl& getIm Uint32 -NdbQueryOperationDef::getQueryOperationIx() const +NdbQueryOperationDef::getOpNo() const { - return ::getImpl(*this).getQueryOperationIx(); + return ::getImpl(*this).getOpNo(); } Uint32 @@ -884,7 +887,7 @@ NdbQueryBuilder::readTuple(const NdbDict options ? options->getImpl() : defaultOptions, ident, m_impl.m_operations.size(), - m_impl.getNextId(), + m_impl.getNextInternalOpNo(), error); returnErrIf(m_impl.takeOwnership(op)!=0, Err_MemoryAlloc); @@ -958,7 +961,7 @@ NdbQueryBuilder::readTuple(const NdbDict options ? options->getImpl() : defaultOptions, ident, m_impl.m_operations.size(), - m_impl.getNextId(), + m_impl.getNextInternalOpNo(), error); returnErrIf(m_impl.takeOwnership(op)!=0, Err_MemoryAlloc); @@ -999,7 +1002,7 @@ NdbQueryBuilder::scanTable(const NdbDict options ? options->getImpl() : defaultOptions, ident, m_impl.m_operations.size(), - m_impl.getNextId(), + m_impl.getNextInternalOpNo(), error); returnErrIf(m_impl.takeOwnership(op)!=0, Err_MemoryAlloc); @@ -1065,7 +1068,7 @@ NdbQueryBuilder::scanIndex(const NdbDict options ? options->getImpl() : defaultOptions, ident, m_impl.m_operations.size(), - m_impl.getNextId(), + m_impl.getNextInternalOpNo(), error); returnErrIf(m_impl.takeOwnership(op)!=0, Err_MemoryAlloc); @@ -1264,7 +1267,7 @@ NdbQueryDefImpl(const VectorgetQueryOperationId()+1, + m_operations[m_operations.size()-1]->getInternalOpNo()+1, m_serializedDef.getSize()); m_serializedDef.put(0,cntLen); @@ -1629,10 +1632,11 @@ NdbQueryLookupOperationDefImpl::NdbQuery const NdbQueryOperand* const keys[], const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error) - : NdbQueryOperationDefImpl(table,options,ident,ix,id,error), + : NdbQueryOperationDefImpl(table, options, ident, opNo, + internalOpNo, error), m_interface(*this) { int i; @@ -1652,10 +1656,11 @@ NdbQueryIndexScanOperationDefImpl::NdbQu const NdbQueryIndexBound* bound, const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error) - : NdbQueryScanOperationDefImpl(table,options,ident,ix,id,error), + : NdbQueryScanOperationDefImpl(table, options, ident, opNo, internalOpNo, + error), m_interface(*this), m_index(index), m_paramInPruneKey(false) @@ -1894,14 +1899,14 @@ NdbQueryOperationDefImpl::NdbQueryOperat const NdbTableImpl& table, const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error) :m_isPrepared(false), m_diskInChildProjection(false), m_table(table), m_ident(ident), - m_ix(ix), m_id(id), + m_opNo(opNo), m_internalOpNo(internalOpNo), m_options(options), m_parent(NULL), m_children(), @@ -1914,7 +1919,7 @@ NdbQueryOperationDefImpl::NdbQueryOperat error = Err_MemoryAlloc; return; } - if (unlikely(m_id >= NDB_SPJ_MAX_TREE_NODES)) + if (unlikely(m_internalOpNo >= NDB_SPJ_MAX_TREE_NODES)) { error = QRY_DEFINITION_TOO_LARGE; return; @@ -2120,8 +2125,8 @@ NdbQueryOperationDefImpl::appendParentLi if (getParentOperation() != NULL) { Uint16Sequence parentSeq(serializedDef, 1); - assert (getParentOperation()->getQueryOperationId() < getQueryOperationId()); - parentSeq.append(getParentOperation()->getQueryOperationId()); + assert (getParentOperation()->getInternalOpNo() < getInternalOpNo()); + parentSeq.append(getParentOperation()->getInternalOpNo()); parentSeq.finish(); return DABits::NI_HAS_PARENT; } @@ -2205,7 +2210,7 @@ NdbQueryOperationDefImpl::printTree(Uint ndbout << NdbQueryOperationDef::getTypeName(getType()) << endl; printMargin(depth, hasMoreSiblingsMask, false); // Print attributes. - ndbout << " opNo: " << getQueryOperationIx() << endl; + ndbout << " opNo: " << getOpNo() << endl; printMargin(depth, hasMoreSiblingsMask, false); ndbout << " table: " << getTable().getName() << endl; if (getIndex() != NULL) @@ -2244,7 +2249,7 @@ NdbQueryLookupOperationDefImpl::appendKe * Key value for root operation is constructed when query is instantiated with * NdbQueryOperationImpl::prepareIndexKeyInfo() */ - if (getQueryOperationIx() == 0) + if (getOpNo() == 0) return 0; if (m_keys[0]!=NULL) @@ -2321,7 +2326,7 @@ NdbQueryIndexScanOperationDefImpl::appen * Bound value for root operation is constructed when query is instantiated with * NdbQueryOperationImpl::prepareIndexKeyInfo() */ - if (getQueryOperationIx() == 0) + if (getOpNo() == 0) return 0; if (m_bound.lowKeys>0 || m_bound.highKeys>0) @@ -2505,7 +2510,7 @@ NdbQueryIndexScanOperationDefImpl::appen * Bound value for root operation is constructed when query is instantiated with * NdbQueryOperationImpl::prepareIndexKeyInfo() */ - if (getQueryOperationIx() == 0) + if (getOpNo() == 0) return 0; if (m_bound.lowKeys>0 || m_bound.highKeys>0) @@ -2614,7 +2619,7 @@ NdbQueryPKLookupOperationDefImpl } #ifdef __TRACE_SERIALIZATION - ndbout << "Serialized node " << getQueryOperationId() << " : "; + ndbout << "Serialized node " << getInternalOpNo() << " : "; for (Uint32 i = startPos; i < serializedDef.getSize(); i++) { char buf[12]; sprintf(buf, "%.8x", serializedDef.get(i)); @@ -2647,7 +2652,7 @@ NdbQueryIndexOperationDefImpl Uint32 requestInfo = QN_LookupNode::L_UNIQUE_INDEX; // Optional part1: Make list of parent nodes. - assert (getQueryOperationId() > 0); + assert (getInternalOpNo() > 0); requestInfo |= appendParentList (serializedDef); // Part2: m_keys[] are the keys to be used for index @@ -2679,7 +2684,7 @@ NdbQueryIndexOperationDefImpl } #ifdef __TRACE_SERIALIZATION - ndbout << "Serialized index " << getQueryOperationId()-1 << " : "; + ndbout << "Serialized index " << getInternalOpNo()-1 << " : "; for (Uint32 i = startPos; i < serializedDef.getSize(); i++){ char buf[12]; sprintf(buf, "%.8x", serializedDef.get(i)); @@ -2705,7 +2710,7 @@ NdbQueryIndexOperationDefImpl // Optional part1: Append index as (single) parent op.. { requestInfo |= DABits::NI_HAS_PARENT; Uint16Sequence parentSeq(serializedDef,1); - parentSeq.append(getQueryOperationId()-1); + parentSeq.append(getInternalOpNo()-1); parentSeq.finish(); } @@ -2735,7 +2740,7 @@ NdbQueryIndexOperationDefImpl } #ifdef __TRACE_SERIALIZATION - ndbout << "Serialized node " << getQueryOperationId() << " : "; + ndbout << "Serialized node " << getInternalOpNo() << " : "; for (Uint32 i = startPos; i < serializedDef.getSize(); i++) { char buf[12]; sprintf(buf, "%.8x", serializedDef.get(i)); @@ -2752,17 +2757,17 @@ NdbQueryScanOperationDefImpl::NdbQuerySc const NdbTableImpl& table, const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error) - : NdbQueryOperationDefImpl(table,options,ident,ix,id,error) + : NdbQueryOperationDefImpl(table, options, ident, opNo, internalOpNo, error) {} int NdbQueryScanOperationDefImpl::serialize(Uint32Buffer& serializedDef, const NdbTableImpl& tableOrIndex) { - bool isRoot = (getQueryOperationIx()==0); + bool isRoot = (getOpNo()==0); // This method should only be invoked once. assert (!m_isPrepared); @@ -2817,7 +2822,7 @@ NdbQueryScanOperationDefImpl::serialize( } #ifdef __TRACE_SERIALIZATION - ndbout << "Serialized node " << getQueryOperationId() << " : "; + ndbout << "Serialized node " << getInternalOpNo() << " : "; for(Uint32 i = startPos; i < serializedDef.getSize(); i++){ char buf[12]; sprintf(buf, "%.8x", serializedDef.get(i)); === modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.hpp' --- a/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp 2011-09-29 09:23:04 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp 2012-03-30 12:25:43 +0000 @@ -225,7 +225,7 @@ public: /** * Get the ordinal position of this operation within the QueryDef. */ - Uint32 getQueryOperationIx() const; + Uint32 getOpNo() const; Uint32 getNoOfParentOperations() const; const NdbQueryOperationDef* getParentOperation(Uint32 i) const; === modified file 'storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp' --- a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp 2011-10-20 19:52:11 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp 2012-03-30 12:25:43 +0000 @@ -423,17 +423,17 @@ protected: explicit NdbQueryOperationDefImpl (const NdbTableImpl& table, const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error); public: // Get the ordinal position of this operation within the query def. - Uint32 getQueryOperationIx() const - { return m_ix; } + Uint32 getOpNo() const + { return m_opNo; } // Get id of node as known inside queryTree - Uint32 getQueryOperationId() const - { return m_id; } + Uint32 getInternalOpNo() const + { return m_internalOpNo; } // Get type of query operation virtual NdbQueryOperationDef::Type getType() const = 0; @@ -487,9 +487,9 @@ private: private: const NdbTableImpl& m_table; const char* const m_ident; // Optional name specified by aplication - const Uint32 m_ix; // Index of this operation within operation array - const Uint32 m_id; // Operation id when materialized into queryTree. - // If op has index, index id is 'm_id-1'. + const Uint32 m_opNo; // Index of this operation within operation array + const Uint32 m_internalOpNo;// Operation id when materialized into queryTree. + // If op has index, index opNo is 'm_internalOpNo-1'. // Optional (or default) options specified when building query: // - Scan order which may specify ascending or descending scan order @@ -517,8 +517,8 @@ public: const NdbTableImpl& table, const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error); virtual bool isScanOperation() const @@ -581,8 +581,8 @@ private: const NdbQueryIndexBound* bound, const NdbQueryOptionsImpl& options, const char* ident, - Uint32 ix, - Uint32 id, + Uint32 opNo, + Uint32 internalOpNo, int& error); // Append pattern for creating a single bound value to serialized code @@ -693,10 +693,10 @@ private: bool contains(const NdbQueryOperationDefImpl*); // Get interal operation number of the next operation. - Uint32 getNextId() const + Uint32 getNextInternalOpNo() const { return m_operations.size() == 0 ? 0 : - m_operations[m_operations.size()-1]->getQueryOperationId()+1; + m_operations[m_operations.size()-1]->getInternalOpNo()+1; } NdbQueryBuilder m_interface; === modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp' --- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2012-03-22 14:18:01 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2012-03-30 13:18:59 +0000 @@ -274,7 +274,7 @@ public: NdbResultStream& getResultStream(Uint32 operationNo) const; NdbResultStream& getResultStream(const NdbQueryOperationImpl& op) const - { return getResultStream(op.getQueryOperationDef().getQueryOperationIx()); } + { return getResultStream(op.getQueryOperationDef().getOpNo()); } Uint32 getReceiverId() const; Uint32 getReceiverTcPtrI() const; @@ -509,7 +509,7 @@ public: * operation will have two distincts nodes in the tree used by the * SPJ block, this number may be different from 'opNo'. */ - const Uint32 internalOpNo = m_operation.getQueryOperationDef().getQueryOperationId(); + const Uint32 internalOpNo = m_operation.getInternalOpNo(); const bool complete = !((remainingScans >> internalOpNo) & 1); return complete; @@ -1005,7 +1005,7 @@ NdbResultStream::prepareResultSet(Uint32 NdbResultStream& childStream = m_rootFrag.getResultStream(child); const bool allSubScansComplete = childStream.prepareResultSet(remainingScans); - Uint32 childId = child.getQueryOperationDef().getQueryOperationIx(); + Uint32 childId = child.getQueryOperationDef().getOpNo(); /* Condition 1) & 2) calc'ed outside loop, see comments further below: */ const bool skipNonMatches = !allSubScansComplete || // 1) @@ -3801,7 +3801,7 @@ NdbQueryOperationImpl::NdbQueryOperation m_ordering(NdbQueryOptions::ScanOrdering_unordered), m_interpretedCode(NULL), m_diskInUserProjection(false), - m_parallelism(def.getQueryOperationIx() == 0 + m_parallelism(def.getOpNo() == 0 ? Parallelism_max : Parallelism_adaptive), m_rowSize(0xffffffff) { @@ -3815,7 +3815,7 @@ NdbQueryOperationImpl::NdbQueryOperation const NdbQueryOperationDefImpl* parent = def.getParentOperation(); if (parent != NULL) { - const Uint32 ix = parent->getQueryOperationIx(); + const Uint32 ix = parent->getOpNo(); assert (ix < m_queryImpl.getNoOfOperations()); m_parent = &m_queryImpl.getQueryOperation(ix); const int res = m_parent->m_children.push_back(this); @@ -4488,7 +4488,7 @@ NdbQueryOperationImpl::prepareAttrInfo(U #ifdef __TRACE_SERIALIZATION ndbout << "Serialized params for index node " - << m_operationDef.getQueryOperationId()-1 << " : "; + << getInternalOpNo()-1 << " : "; for(Uint32 i = startPos; i < attrInfo.getSize(); i++){ char buf[12]; sprintf(buf, "%.8x", attrInfo.get(i)); @@ -4502,7 +4502,7 @@ NdbQueryOperationImpl::prepareAttrInfo(U // 'length' and 'requestInfo' has been calculated. Uint32 startPos = attrInfo.getSize(); Uint32 requestInfo = 0; - bool isRoot = (def.getQueryOperationIx()==0); + bool isRoot = (def.getOpNo()==0); QueryNodeParameters::OpType paramType = !def.isScanOperation() ? QueryNodeParameters::QN_LOOKUP @@ -4622,7 +4622,7 @@ NdbQueryOperationImpl::prepareAttrInfo(U #ifdef __TRACE_SERIALIZATION ndbout << "Serialized params for node " - << m_operationDef.getQueryOperationId() << " : "; + << getInternalOpNo() << " : "; for(Uint32 i = startPos; i < attrInfo.getSize(); i++){ char buf[12]; sprintf(buf, "%.8x", attrInfo.get(i)); @@ -4948,7 +4948,7 @@ NdbQueryOperationImpl::execTRANSID_AI(co if (traceSignals) { ndbout << "NdbQueryOperationImpl::execTRANSID_AI()" << ", fragment no: " << rootFrag->getFragNo() - << ", operation no: " << getQueryOperationDef().getQueryOperationIx() + << ", operation no: " << getQueryOperationDef().getOpNo() << endl; } @@ -5185,7 +5185,7 @@ int NdbQueryOperationImpl::setParallelis getQuery().setErrorCode(QRY_SEQUENTIAL_SCAN_SORTED); return -1; } - else if (getQueryOperationDef().getQueryOperationIx() > 0) + else if (getQueryOperationDef().getOpNo() > 0) { getQuery().setErrorCode(Err_FunctionNotImplemented); return -1; @@ -5215,7 +5215,7 @@ int NdbQueryOperationImpl::setAdaptivePa getQuery().setErrorCode(QRY_WRONG_OPERATION_TYPE); return -1; } - else if (getQueryOperationDef().getQueryOperationIx() == 0) + else if (getQueryOperationDef().getOpNo() == 0) { getQuery().setErrorCode(Err_FunctionNotImplemented); return -1; @@ -5299,8 +5299,8 @@ Uint32 NdbQueryOperationImpl::getRowSize NdbOut& operator<<(NdbOut& out, const NdbQueryOperationImpl& op){ out << "[ this: " << &op << " m_magic: " << op.m_magic; - out << " op.operationDef.getQueryOperationIx()" - << op.m_operationDef.getQueryOperationIx(); + out << " op.operationDef.getOpNo()" + << op.m_operationDef.getOpNo(); if (op.getParentOperation()){ out << " m_parent: " << op.getParentOperation(); } === modified file 'storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp' --- a/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp 2011-09-13 13:40:30 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp 2012-03-30 12:25:43 +0000 @@ -603,6 +603,12 @@ public: NdbQueryOperationImpl& getRoot() const { return m_queryImpl.getRoot(); } + // A shorthand method. + Uint32 getInternalOpNo() const + { + return m_operationDef.getInternalOpNo(); + } + const NdbQueryDefImpl& getQueryDef() const { return m_queryImpl.getQueryDef(); } No bundle (reason: useless for push emails).