Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420

Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
83b1d82a · matthias@three.local.lan · 48bc6d47 · 00cc3cbf · 83b1d82a · 83b1d82a
Commit 83b1d82a authored Feb 09, 2005 by matthias@three.local.lan
10 changed files
--- a/.bzrignore
+++ b/.bzrignore
@@ -254,11 +254,14 @@ bkpush.log
 bkpush.log*
 build.log
 build_tags.sh
+client/decimal.c
 client/insert_test
 client/log_event.cc
 client/log_event.h
 client/mf_iocache.c
 client/mf_iocache.cc
+client/my_decimal.cc
+client/my_decimal.h
 client/mysql
 client/mysqladmin
 client/mysqladmin.c
@@ -328,9 +331,12 @@ help.h
 include/my_config.h
 include/my_global.h
 include/mysql_version.h
+include/mysqld_ername.h
+include/mysqld_error.h
 include/readline
 include/readline/*.h
 include/readline/readline.h
+include/sql_state.h
 include/widec.h
 innobase/autom4te-2.53.cache/*
 innobase/autom4te-2.53.cache/output.0
@@ -432,6 +438,7 @@ libmysqld/log_event.cc
 libmysqld/md5.c
 libmysqld/mf_iocache.cc
 libmysqld/mini_client.cc
+libmysqld/my_decimal.cc
 libmysqld/my_time.c
 libmysqld/net_pkg.cc
 libmysqld/net_serv.cc
@@ -985,6 +992,7 @@ support-files/mysql-3.23.29-gamma.spec
 support-files/mysql-log-rotate
 support-files/mysql.server
 support-files/mysql.spec
+support-files/ndb-config-2-node.ini
 tags
 test/ndbapi/bank/bankCreator
 test/ndbapi/bank/bankMakeGL
@@ -1052,11 +1060,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-include/mysqld_ername.h
-include/mysqld_error.h
-include/sql_state.h
-support-files/ndb-config-2-node.ini
-client/decimal.c
-client/my_decimal.cc
-client/my_decimal.h
-libmysqld/my_decimal.cc
--- a/BitKeeper/etc/gone
+++ b/BitKeeper/etc/gone
@@ -457,6 +457,398 @@ ccarkner@nslinuxw10.bedford.progress.com|mysql-test/r/isolation.result|200103271
 ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145543|39049|6a39e4138dd4a456
 jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec
 jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554
+magnus@neptunus.(none)|ndb/src/client/Makefile|20040414084436|02010|6c2778d2bf4954a2
+magnus@neptunus.(none)|ndb/src/client/odbc/Extra.mk|20040414082358|47442|eabbb28986ca817d
+magnus@neptunus.(none)|ndb/src/client/odbc/Makefile|20040414084435|33394|9bc928a18aa88d66
+magnus@neptunus.(none)|ndb/src/client/odbc/NdbOdbc.cpp|20040414082358|49599|aa491b06c9172d11
+magnus@neptunus.(none)|ndb/src/client/odbc/NdbOdbc.def|20040414082358|51708|cd3eed2c4a0121e9
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/CodeGen.cpp|20040414082358|53823|170c83c0765b9160
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/CodeGen.hpp|20040414082358|56074|738f834f80cceba8
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_base.cpp|20040414082358|58196|96f8ceaac8138bfe
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_base.hpp|20040414082358|60340|794baaed32588409
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_column.cpp|20040414082358|62566|5dd0e5c1215bd8bf
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_column.hpp|20040414082358|64739|5d5816d1c496e588
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_comp_op.cpp|20040414082358|01507|6ab02cc3b1e08985
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_comp_op.hpp|20040414082358|03757|37cf1e4cee3a6bf1
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_create_index.cpp|20040414082358|06374|d1f95c5917afab9
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_create_index.hpp|20040414082358|08625|12bcb33350fc35c1
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_create_row.cpp|20040414082358|11036|33f73454f8ddf2d5
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_create_row.hpp|20040414082358|13441|38cb00cc1baa9ee7
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_create_table.cpp|20040414082358|15724|c25e7cc06414a927
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_create_table.hpp|20040414082358|18032|9648f467f3f0418e
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_data_type.cpp|20040414082358|20759|9e46a7ef85345d4
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_data_type.hpp|20040414082358|23055|5e8928968d3c0107
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_ddl.cpp|20040414082358|25484|c38ee5368efaf688
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_ddl.hpp|20040414082358|27775|75482ddd87b65036
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_ddl_column.cpp|20040414082358|32443|c524862773dd9f38
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_ddl_column.hpp|20040414082358|33650|c9e534e381b21599
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_ddl_constr.cpp|20040414082359|02893|80ae32f83a6c2f00
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_ddl_constr.hpp|20040414082359|05185|bca16806c57bc97e
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_ddl_row.cpp|20040414082359|07481|ec2fbc3b8ab08a52
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_ddl_row.hpp|20040414082359|09844|c18a43b3770ad25a
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_delete.cpp|20040414082359|12149|feac77b440d04327
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_delete.hpp|20040414082359|14544|c852ee069a761aab
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_delete_index.cpp|20040414082359|17020|17ed96eca90fe4e7
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_delete_index.hpp|20040414082359|19336|18a9bb119b04636
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_delete_lookup.cpp|20040414082359|23008|1a3728f8c896684
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_delete_lookup.hpp|20040414082359|26530|1be71525ed9ee69
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_delete_scan.cpp|20040414082359|29062|b040ad7670c24eb5
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_delete_scan.hpp|20040414082359|31380|b9a11b4ec895d159
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_dml.cpp|20040414082359|33830|6826ad60f0f566e7
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_dml.hpp|20040414082359|36167|8fdbf19ad3174ca2
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_dml_column.cpp|20040414082359|38509|b71ce6186edf1655
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_dml_column.hpp|20040414082359|40901|a843b3418b30b7a3
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_dml_row.cpp|20040414082359|43239|17c791507b36cc06
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_dml_row.hpp|20040414082359|46942|33c4cffdd238728d
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_drop_index.cpp|20040414082359|54231|fc5cab67ae58d9f6
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_drop_index.hpp|20040414082359|55474|377c9eb280ec2ee2
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_drop_table.cpp|20040414082359|57899|9637d93efa68996a
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_drop_table.hpp|20040414082359|60249|d671379125e4bbbe
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr.cpp|20040414082359|64572|fafd271880c70cf3
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr.hpp|20040414082359|01410|9e8243e99e0ec84
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_column.cpp|20040414082359|03836|4c4fbcd5741cc8cf
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_column.hpp|20040414082359|06355|9c4cbbdf432dc475
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_const.cpp|20040414082359|08702|bdb29dcd94ac5e73
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_const.hpp|20040414082359|12473|9c8789cff376b832
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_conv.cpp|20040414082359|15160|d252fbfe8ef55fff
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_conv.hpp|20040414082359|18741|5cbea39eecb92a43
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_func.cpp|20040414082359|21099|5d3996f062fa3f52
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_func.hpp|20040414082359|23589|22aee1e4f92c49b9
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_op.cpp|20040414082359|25965|e1aaa0244f2efa4
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_op.hpp|20040414082359|28432|4eb8c02dd0602f
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_param.cpp|20040414082359|30810|a5e94ee7c5821611
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_param.hpp|20040414082359|33263|ec441ad8ef21aa2b
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_row.cpp|20040414082400|01179|bc73d8f9c681d418
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_expr_row.hpp|20040414082400|03567|c541c49ea8c0c4f2
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_idx_column.cpp|20040414082400|06012|7d4d074ce5daea0a
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_idx_column.hpp|20040414082400|08377|caabaafa34722be7
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_insert.cpp|20040414082400|10799|7d0ef7cc8f657fd5
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_insert.hpp|20040414082400|14354|cc96fa9b81169471
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_pred.cpp|20040414082400|16798|56faa755aa42ddfa
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_pred.hpp|20040414082400|19159|eada43753e8b1e6c
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_pred_op.cpp|20040414082400|21533|47d693dde1a6d907
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_pred_op.hpp|20040414082400|23992|b42256983d2bda7b
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query.cpp|20040414082400|26355|4ac293821c9b4602
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query.hpp|20040414082400|28888|f86fbd9a108206c0
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_count.cpp|20040414082400|31247|9fa96a57d2dde660
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_count.hpp|20040414082400|33607|bdbe6e4734abc0c5
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_distinct.cpp|20040414082400|37150|3ba18528aa67b9dd
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_distinct.hpp|20040414082400|39517|c12b2b7ff6b2e7b3
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_filter.cpp|20040414082400|41984|a3d067d5d8fb40c
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_filter.hpp|20040414082400|44363|d0a341f2e40f0183
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_group.cpp|20040414082400|46860|4443c844308f9a98
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_group.hpp|20040414082400|49266|ba4691be942c6e2a
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_index.cpp|20040414082400|51663|f0312c9e2f22daf6
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_index.hpp|20040414082400|54471|6baaf1abbb704bb1
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_join.cpp|20040414082400|56943|36e07422c67d6838
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_join.hpp|20040414082400|59419|c4d17d18c4e3b4a0
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_lookup.cpp|20040414082400|61998|3d80e3ddbdae531d
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_lookup.hpp|20040414082400|00081|73332533e5196630
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_project.cpp|20040414082400|01373|ebc22f71bb7ec98c
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_project.hpp|20040414082400|03788|2734cdf1f907e0a4
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_range.cpp|20040414082400|06316|62ddafd2d17063cc
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_range.hpp|20040414082400|09865|81546843616efefa
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_repeat.cpp|20040414082400|11154|ce8f2a065897d6e3
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_repeat.hpp|20040414082400|13697|c20e10d0db9ad53c
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_scan.cpp|20040414082400|16320|855e56d6f56de938
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_scan.hpp|20040414082400|20784|b93c277da5b2509b
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_sort.cpp|20040414082400|24684|c08fc07f739de097
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_sort.hpp|20040414082400|25997|84edb5e128eda962
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_sys.cpp|20040414082400|28427|1d6a4a1cec789001
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_query_sys.hpp|20040414082400|31003|f5182823da25f097
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_root.cpp|20040414082400|33423|4c26a01ced583e41
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_root.hpp|20040414082401|01466|de1fd878505d9e26
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_select.cpp|20040414082401|04049|75b2a39f282d8ef5
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_select.hpp|20040414082401|06512|f9fadc322d78033a
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_set_row.cpp|20040414082401|08991|1bda7e6f86f18aef
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_set_row.hpp|20040414082401|12465|32ac3de384b91229
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_stmt.cpp|20040414082401|13817|c0e9903aa90df90b
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_stmt.hpp|20040414082401|17310|fab11fc487e74d05
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_table.cpp|20040414082401|20990|c46b7a6e2ecf4f61
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_table.hpp|20040414082401|22331|a48d57a0375a6d56
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_table_list.cpp|20040414082402|33460|40948eccedfae7bb
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_table_list.hpp|20040414082402|34739|c1e880e9949d3a
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_update.cpp|20040414082402|37093|ed36f4a7a928a91b
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_update.hpp|20040414082402|39546|c1de760c7b580b0c
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_update_index.cpp|20040414082402|42086|a0c6ad33ffbbc00e
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_update_index.hpp|20040414082402|44472|b57bbe5c8d927df9
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_update_lookup.cpp|20040414082402|46928|3491782088e97384
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_update_lookup.hpp|20040414082402|49343|ee335822c3496863
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_update_scan.cpp|20040414082402|51785|35e5b7d4619b3e09
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Code_update_scan.hpp|20040414082402|54180|287f193ad48fbefd
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/Makefile|20040414084435|20906|420b8378d374f069
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/SimpleGram.ypp|20040414082402|57791|6301cedf92524710
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/SimpleParser.cpp|20040414082402|60351|549f93e2a7fd01b5
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/SimpleParser.hpp|20040414082402|62814|4fdff7ee3839efc4
+magnus@neptunus.(none)|ndb/src/client/odbc/codegen/SimpleScan.lpp|20040414082402|65230|e11862b97fe39faf
+magnus@neptunus.(none)|ndb/src/client/odbc/common/AttrArea.cpp|20040414082402|03357|1570da617a1a6c4b
+magnus@neptunus.(none)|ndb/src/client/odbc/common/AttrArea.hpp|20040414082402|06048|f3d78ccd37af4e6
+magnus@neptunus.(none)|ndb/src/client/odbc/common/CodeTree.cpp|20040414082402|08438|1a4912632b0a61ee
+magnus@neptunus.(none)|ndb/src/client/odbc/common/CodeTree.hpp|20040414082402|10916|dcb603cce390eafa
+magnus@neptunus.(none)|ndb/src/client/odbc/common/ConnArea.cpp|20040414082402|13287|103182cf445f0bc3
+magnus@neptunus.(none)|ndb/src/client/odbc/common/ConnArea.hpp|20040414082402|16782|ffe99deedf7dc1ee
+magnus@neptunus.(none)|ndb/src/client/odbc/common/Ctx.cpp|20040414082402|18121|ce1c13ba8a312eba
+magnus@neptunus.(none)|ndb/src/client/odbc/common/Ctx.hpp|20040414082402|20500|bc88aba55ab71063
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DataField.cpp|20040414082402|22982|6bb1fe1cb971c8f9
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DataField.hpp|20040414082402|25733|d324898a9a86463d
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DataRow.cpp|20040414082402|29367|8764a23cee4f9481
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DataRow.hpp|20040414082402|31983|66a65eee1a1b2f23
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DataType.cpp|20040414082402|34382|29b8ddd51fdd3a2f
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DataType.hpp|20040414082403|02299|adef26bc1dc940eb
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DescArea.cpp|20040414082403|04653|aab4edd7e336acdd
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DescArea.hpp|20040414082403|07055|20ba9b6484762f0f
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DiagArea.cpp|20040414082403|09406|e3662d8977947e67
+magnus@neptunus.(none)|ndb/src/client/odbc/common/DiagArea.hpp|20040414082403|11824|1c6595b5fac06eb2
+magnus@neptunus.(none)|ndb/src/client/odbc/common/Makefile|20040414084435|27122|8505f6b38fe5c219
+magnus@neptunus.(none)|ndb/src/client/odbc/common/OdbcData.cpp|20040414082403|16621|e557009c1ed1e017
+magnus@neptunus.(none)|ndb/src/client/odbc/common/OdbcData.hpp|20040414082403|19077|2125814c1293c0b3
+magnus@neptunus.(none)|ndb/src/client/odbc/common/ResultArea.cpp|20040414082403|21436|8bcc2a2d9a98b9b0
+magnus@neptunus.(none)|ndb/src/client/odbc/common/ResultArea.hpp|20040414082403|23832|8d4646b94be475d1
+magnus@neptunus.(none)|ndb/src/client/odbc/common/Sqlstate.cpp|20040414082403|26171|b844144af963c22c
+magnus@neptunus.(none)|ndb/src/client/odbc/common/Sqlstate.hpp|20040414082403|29665|60006ee1c27c6e5
+magnus@neptunus.(none)|ndb/src/client/odbc/common/StmtArea.cpp|20040414082403|32310|5c5f8613156e06b2
+magnus@neptunus.(none)|ndb/src/client/odbc/common/StmtArea.hpp|20040414082403|34785|9662e56ae164eb7f
+magnus@neptunus.(none)|ndb/src/client/odbc/common/StmtInfo.cpp|20040414082403|37141|54ee4040e5807214
+magnus@neptunus.(none)|ndb/src/client/odbc/common/StmtInfo.hpp|20040414082403|39465|6698d657391692fc
+magnus@neptunus.(none)|ndb/src/client/odbc/common/common.cpp|20040414082403|41862|4792b9ecddd99482
+magnus@neptunus.(none)|ndb/src/client/odbc/common/common.hpp|20040414082403|45229|25369fa6c80eff53
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictCatalog.cpp|20040414082403|46524|9804b0ff3eac2f8
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictCatalog.hpp|20040414082403|50152|cace2fb2f6bb65e5
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictColumn.cpp|20040414082403|56647|b69d90c53e5b618
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictColumn.hpp|20040414082403|58973|c2da1b7bd0408bd1
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictIndex.cpp|20040414082403|62455|a456d3039e6a39e3
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictIndex.hpp|20040414082403|64865|f53b91a41bb96663
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictSchema.cpp|20040414082403|01679|639403c84a47dfdd
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictSchema.hpp|20040414082403|04043|5aa7dc8ade17e94c
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictSys.cpp|20040414082403|06523|fb89465b10c32bb0
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictSys.hpp|20040414082403|08917|76583ba8aa88fd6f
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictTable.cpp|20040414082403|11346|8f4a9ee5a8038f87
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/DictTable.hpp|20040414082403|13733|cf99a9ac3dd49206
+magnus@neptunus.(none)|ndb/src/client/odbc/dictionary/Makefile|20040414084435|30267|4c1a6148787bdc2f
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/class.fig|20040414082403|16124|c0754ccad74d380a
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/descfield.pl|20040414082403|18935|e0bd59c2824824cc
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/diag.txt|20040414082403|21798|b66a7e227391335f
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/getinfo.pl|20040414082403|24266|2142ecf1567a66f6
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/gettypeinfo.pl|20040414082403|27572|2ea4c0589eac4e73
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/handleattr.pl|20040414082403|31383|b0c2a2901b68342e
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/main.hpp|20040414082404|00011|7b15eb7ffad488a0
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/ndbodbc.html|20040414082404|02501|a2f14fdd978b62cc
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/select.fig|20040414082404|04967|34f5222b5012e1d7
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/systables.pl|20040414082404|07386|1fa2191648bdb629
+magnus@neptunus.(none)|ndb/src/client/odbc/docs/type.txt|20040414082404|10311|feec700c81f5095f
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/Func.data|20040414082404|12860|9e75f15d921063f3
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/Func.pl|20040414082404|16530|aefb901bc3941d32
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/Makefile|20040414084435|24049|80d21270fc3ad931
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLAllocConnect.cpp|20040414082404|18964|246af836b028d810
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLAllocEnv.cpp|20040414082404|21279|eaf36cf2285ec2ac
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLAllocHandle.cpp|20040414082404|23612|c0921921e84d1a10
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLAllocHandleStd.cpp|20040414082404|27069|7d145f6e3640d913
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLAllocStmt.cpp|20040414082404|29405|362331ef456ec879
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLBindCol.cpp|20040414082404|31826|fec3a78088d4951d
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLBindParam.cpp|20040414082404|34178|a50b619a23efaab
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLBindParameter.cpp|20040414082404|36965|533b1992496e2775
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLBrowseConnect.cpp|20040414082404|39327|120b61a1ff6edee3
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLBulkOperations.cpp|20040414082404|41701|7a96be04250a388
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLCancel.cpp|20040414082404|45242|27eab683f6fa6ec6
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLCloseCursor.cpp|20040414082404|47634|6cbf193aadaf1058
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLColAttribute.cpp|20040414082404|51528|f2c858b16a9360d
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLColAttributes.cpp|20040414082404|53928|d4007908ee1309d
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLColumnPrivileges.cpp|20040414082404|56456|39a3020da4c3485b
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLColumns.cpp|20040414082404|58871|1c31107df60bb544
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLConnect.cpp|20040414082404|62974|868e02a519b72743
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLCopyDesc.cpp|20040414082404|64271|286522b25a029761
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLDataSources.cpp|20040414082404|01136|12792108aac5b2ca
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLDescribeCol.cpp|20040414082404|03611|1d1faafbcd3ecb3c
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLDescribeParam.cpp|20040414082404|06014|70b016fa795ed275
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLDisconnect.cpp|20040414082404|08470|9fb4c3d7a84db50a
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLDriverConnect.cpp|20040414082404|10866|8dad42af7d17a9d9
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLDrivers.cpp|20040414082404|13335|400e7453e70f6e99
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLEndTran.cpp|20040414082404|15741|c37cce04cc303c01
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLError.cpp|20040414082404|18143|593b81885c15187b
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLExecDirect.cpp|20040414082404|20664|5e6274e76315339d
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLExecute.cpp|20040414082404|24388|1692a85f8639f71
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLExtendedFetch.cpp|20040414082404|27134|8b9d604580a83cfd
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLFetch.cpp|20040414082404|29534|fa1606aa2dd901db
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLFetchScroll.cpp|20040414082404|31991|cdb16803511963a1
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLForeignKeys.cpp|20040414082405|00096|4b8a9af2f6bf92cb
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLFreeConnect.cpp|20040414082405|02501|92359420501ebc5b
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLFreeEnv.cpp|20040414082405|04956|64f1776817464807
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLFreeHandle.cpp|20040414082405|07349|2dc029edf912c2d
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLFreeStmt.cpp|20040414082405|09791|8f8cb0a43c02a67
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetConnectAttr.cpp|20040414082405|13307|b29ff18aeedd8966
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetConnectOption.cpp|20040414082405|15755|3e0bc4e1af95c682
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetCursorName.cpp|20040414082405|19268|8266b920671b6d01
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetData.cpp|20040414082405|21785|3d837348460c219d
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetDescField.cpp|20040414082405|24186|62828192a7d1d954
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetDescRec.cpp|20040414082405|26589|f54cc69bcd1238ad
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetDiagField.cpp|20040414082405|29075|673e1ea0f9d5121f
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetDiagRec.cpp|20040414082405|31498|bea0f68f5b940ab8
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetEnvAttr.cpp|20040414082405|33972|e742277d8bdf234d
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetFunctions.cpp|20040414082405|36391|72de050fbfb4a9bb
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetInfo.cpp|20040414082405|38935|e4e09d6bedbf02b1
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetStmtAttr.cpp|20040414082405|41363|de7dabc8c2acea7
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetStmtOption.cpp|20040414082405|43806|2ff900ebdd167077
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLGetTypeInfo.cpp|20040414082405|46378|333196b07473dff6
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLMoreResults.cpp|20040414082405|48899|483d94cb57379e81
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLNativeSql.cpp|20040414082405|51374|eeae6067f4a85c
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLNumParams.cpp|20040414082405|57810|8921304c3bcf4835
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLNumResultCols.cpp|20040414082405|59136|4d2b6527ffe81059
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLParamData.cpp|20040414082405|62648|163b046513f1e4ae
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLParamOptions.cpp|20040414082405|64040|bdcbccb961fff044
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLPrepare.cpp|20040414082405|00921|1d339fe24888087
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLPrimaryKeys.cpp|20040414082405|03420|5d7b2a0ae08a267
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLProcedureColumns.cpp|20040414082405|05843|c7a0535e9f50ff39
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLProcedures.cpp|20040414082405|08319|c59d025b22e2d1a6
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLPutData.cpp|20040414082405|11934|9dbf69ea9d369dbd
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLRowCount.cpp|20040414082405|14434|d4ac5b273afdb154
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetConnectAttr.cpp|20040414082405|16860|c2c520c34c41bd88
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetConnectOption.cpp|20040414082405|19298|dadc980d9f9cad1b
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetCursorName.cpp|20040414082405|21855|ccfc33dd2cf6abeb
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetDescField.cpp|20040414082405|24355|c4db694d1b9e8f77
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetDescRec.cpp|20040414082405|26866|f8dd72467d5012ab
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetEnvAttr.cpp|20040414082405|29480|7b50aeae6228c2db
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetParam.cpp|20040414082405|31915|e0dd2d5e8d3ec450
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetPos.cpp|20040414082405|34406|39a3e69960041aa7
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetScrollOptions.cpp|20040414082406|03524|6f8250379bb0cac8
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetStmtAttr.cpp|20040414082406|06008|e99b7e6025a1ae1f
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSetStmtOption.cpp|20040414082406|10068|87af3125a48c27fa
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLSpecialColumns.cpp|20040414082406|12486|1877b4c368825de5
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLStatistics.cpp|20040414082406|14949|87e0359f237aa66a
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLTablePrivileges.cpp|20040414082406|17508|fa16ea0fffa4edeb
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLTables.cpp|20040414082406|20645|c8b201068baec393
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/SQLTransact.cpp|20040414082406|23280|eb33c2f66ee85738
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/driver.cpp|20040414082406|25724|f8f1eeec35b08f18
+magnus@neptunus.(none)|ndb/src/client/odbc/driver/driver.hpp|20040414082406|29359|f108f4eef34ec8ea
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_comp_op.cpp|20040414082406|31800|eacbd7512b32d68b
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_create_index.cpp|20040414082406|35482|c6b8e670198adfa9
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_create_table.cpp|20040414082406|37927|76904d417bc0a59a
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_delete_index.cpp|20040414082406|40489|1ffe5af6eb160a68
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_delete_lookup.cpp|20040414082406|43115|5d24028ce16b6623
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_delete_scan.cpp|20040414082406|46919|810aa4058f73c941
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_drop_index.cpp|20040414082406|49349|3a3871ec6ee48c28
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_drop_table.cpp|20040414082406|51862|639a2faba4da14f4
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_expr_conv.cpp|20040414082406|54314|b5452bd4fbd7c945
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_expr_func.cpp|20040414082406|56759|c78ab0e67d54f38c
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_expr_op.cpp|20040414082406|59381|5e341b2e63495ba4
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_insert.cpp|20040414082406|61884|71dd4bf2fb913f2e
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_pred_op.cpp|20040414082406|64460|ebe7b65ba81e5185
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_query_index.cpp|20040414082406|01584|4cada676fa178001
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_query_lookup.cpp|20040414082406|05431|79dfe29b088d832
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_query_range.cpp|20040414082406|06819|7c4e148e81a292d6
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_query_scan.cpp|20040414082406|09339|7c66194f7f93346f
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_query_sys.cpp|20040414082406|11968|d66abe07cd519163
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_update_index.cpp|20040414082406|14543|86140a945f790890
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_update_lookup.cpp|20040414082406|17085|b7a7387620cf42ab
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Exec_update_scan.cpp|20040414082406|19743|2285c72106cffe0
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Executor.cpp|20040414082406|22273|ccb54cc8ffe18bae
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Executor.hpp|20040414082406|24762|c94d916ae5af2506
+magnus@neptunus.(none)|ndb/src/client/odbc/executor/Makefile|20040414084435|12419|a08f437558c2d3b4
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/AttrDbc.cpp|20040414082406|27307|24a034fbb22cdb23
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/AttrEnv.cpp|20040414082406|30042|7d74bcba78e149d0
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/AttrRoot.cpp|20040414082406|32507|5def5d7e228eedf0
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/AttrStmt.cpp|20040414082407|00551|5363ba63b35ff8f4
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/DescSpec.cpp|20040414082407|03310|cd50c1c855f1905
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/FuncTab.cpp|20040414082407|05927|e77abea11a532708
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleBase.cpp|20040414082407|08362|2ba63dce2dfec07b
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleBase.hpp|20040414082407|10820|8cf9a1e94d272328
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleDbc.cpp|20040414082407|13361|2a79fea6477b2c63
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleDbc.hpp|20040414082407|15852|9abc692ac6b0abb3
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleDesc.cpp|20040414082407|18335|e77eb1d73d171a98
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleDesc.hpp|20040414082407|20794|553aeb842b3da88e
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleEnv.cpp|20040414082407|23207|6b96fc6b188f252b
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleEnv.hpp|20040414082407|25666|572a7b4af6816f8b
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleRoot.cpp|20040414082407|28085|aa5044f74554fa9c
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleRoot.hpp|20040414082407|30587|2fcfca742c13cfb3
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleStmt.cpp|20040414082407|33024|782f96bda9eaf13c
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/HandleStmt.hpp|20040414082407|35570|6508fc97f3c772e1
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/InfoTab.cpp|20040414082407|38088|f89104b9c6fe7489
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/Makefile|20040414084435|15527|3d8d1529ad26ce76
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/PoolNdb.cpp|20040414082407|40567|793fa032699b7d98
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/PoolNdb.hpp|20040414082407|43172|db9e1a04d2fe705d
+magnus@neptunus.(none)|ndb/src/client/odbc/handles/handles.hpp|20040414082407|45564|bfe0b6a7a95ac142
+magnus@neptunus.(none)|ndb/src/ndbbaseclient/Makefile|20040414084439|01640|4b92d5e5b416dd0
+magnus@neptunus.(none)|ndb/src/ndbbaseclient/ndbbaseclient_dummy.cpp|20040414082426|08918|daee9eb6acbc94
+magnus@neptunus.(none)|ndb/src/ndbclient/Makefile|20040414084438|29978|f993f3afae0d4308
+magnus@neptunus.(none)|ndb/src/ndbclient/ndbclient_dummy.cpp|20040414082426|11587|73154070f5d0bfbf
+magnus@neptunus.(none)|ndb/src/newtonapi/Makefile|20040414084438|17704|bcbd9a7282094cc
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_binding.cpp|20040414082426|14355|dcc4fb57f9ab6cba
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_bulkread.cpp|20040414082426|17142|4ddfe02a93d2ba11
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_config.cpp|20040414082426|19935|38acf2ad3a932420
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_dac.cpp|20040414082426|10457|4615e3d0d8a15bff
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_error.cpp|20040414082426|12319|a58b4a1628a2d4b9
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_init.cpp|20040414082426|15064|80da7e3fa0775346
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_internal.hpp|20040414082426|17987|54884404e30c8823
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_process.cpp|20040414082426|22216|509e54294bc7efd2
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_process.hpp|20040414082426|24005|f0ddefb3b2d6a662
+magnus@neptunus.(none)|ndb/src/newtonapi/dba_schema.cpp|20040414082426|26757|1c3b8399853c108
+magnus@neptunus.(none)|ndb/src/rep/ExtSender.cpp|20040414082426|29555|1851d559cfddae43
+magnus@neptunus.(none)|ndb/src/rep/ExtSender.hpp|20040414082426|32345|10ae62ec85ee6692
+magnus@neptunus.(none)|ndb/src/rep/Makefile|20040414084438|44449|954f853c2d812c2c
+magnus@neptunus.(none)|ndb/src/rep/NodeConnectInfo.hpp|20040414082427|00605|9c4318dd55f3f84
+magnus@neptunus.(none)|ndb/src/rep/README|20040414082427|03407|6939b06d192a6b99
+magnus@neptunus.(none)|ndb/src/rep/RepApiInterpreter.cpp|20040414082427|06188|8ba561cb831ae353
+magnus@neptunus.(none)|ndb/src/rep/RepApiInterpreter.hpp|20040414082427|08968|31be5af2ba72d263
+magnus@neptunus.(none)|ndb/src/rep/RepApiService.cpp|20040414082427|11699|93d4005333167a0f
+magnus@neptunus.(none)|ndb/src/rep/RepApiService.hpp|20040414082432|07265|42f5ffb7e3baa54e
+magnus@neptunus.(none)|ndb/src/rep/RepCommandInterpreter.cpp|20040414082432|10009|f661a8ff312213f8
+magnus@neptunus.(none)|ndb/src/rep/RepCommandInterpreter.hpp|20040414082432|12750|fb6f22895e8c8679
+magnus@neptunus.(none)|ndb/src/rep/RepComponents.cpp|20040414082432|16488|fb067aee8e5a4a1f
+magnus@neptunus.(none)|ndb/src/rep/RepComponents.hpp|20040414082432|19179|9e632beac4f8bbf8
+magnus@neptunus.(none)|ndb/src/rep/RepMain.cpp|20040414082432|21936|de79cb7b6f3acd18
+magnus@neptunus.(none)|ndb/src/rep/Requestor.cpp|20040414082432|24636|c653fa987f84ce43
+magnus@neptunus.(none)|ndb/src/rep/Requestor.hpp|20040414082432|27340|a499054c9a128dbd
+magnus@neptunus.(none)|ndb/src/rep/RequestorSubscriptions.cpp|20040414082432|30099|f0643f7cc9aa9654
+magnus@neptunus.(none)|ndb/src/rep/SignalQueue.cpp|20040414082432|32849|6d32d876acc1a598
+magnus@neptunus.(none)|ndb/src/rep/SignalQueue.hpp|20040414082432|35536|b92204ff36f399d1
+magnus@neptunus.(none)|ndb/src/rep/TODO|20040414082432|38233|187896dd2e5dfd02
+magnus@neptunus.(none)|ndb/src/rep/adapters/AppNDB.cpp|20040414082432|46457|1db5eafacdeda3b7
+magnus@neptunus.(none)|ndb/src/rep/adapters/AppNDB.hpp|20040414082432|49233|2c3081224b4ff75f
+magnus@neptunus.(none)|ndb/src/rep/adapters/ExtAPI.cpp|20040414082432|51989|d98f38669b10ca97
+magnus@neptunus.(none)|ndb/src/rep/adapters/ExtAPI.hpp|20040414082432|54656|32bcb96bcd2d60c
+magnus@neptunus.(none)|ndb/src/rep/adapters/ExtNDB.cpp|20040414082432|57410|38cccb80529c02c6
+magnus@neptunus.(none)|ndb/src/rep/adapters/ExtNDB.hpp|20040414082432|60222|ee245e7e2c707685
+magnus@neptunus.(none)|ndb/src/rep/adapters/Makefile|20040414084438|21912|bcb9d87fd69a7911
+magnus@neptunus.(none)|ndb/src/rep/adapters/TableInfoPs.hpp|20040414082432|62988|56b1f8f75fe7cb1c
+magnus@neptunus.(none)|ndb/src/rep/dbug_hack.cpp|20040414082432|40989|f090906a24103f0
+magnus@neptunus.(none)|ndb/src/rep/rep_version.hpp|20040414082432|43779|82a23fe4dbb13cab
+magnus@neptunus.(none)|ndb/src/rep/repapi/Makefile|20040414084438|41386|25c4b35b84d945b4
+magnus@neptunus.(none)|ndb/src/rep/repapi/repapi.cpp|20040414082432|00155|82b9b00c67cfdcf7
+magnus@neptunus.(none)|ndb/src/rep/repapi/repapi.h|20040414082432|02987|6f8cf6b53a86a5ae
+magnus@neptunus.(none)|ndb/src/rep/state/Channel.cpp|20040414082432|05711|1d5f62245962b839
+magnus@neptunus.(none)|ndb/src/rep/state/Channel.hpp|20040414082432|08527|71c1d63ef4b2cbfe
+magnus@neptunus.(none)|ndb/src/rep/state/Interval.cpp|20040414082432|11324|3d079ca9cc21124d
+magnus@neptunus.(none)|ndb/src/rep/state/Interval.hpp|20040414082432|14048|85aa46fc419bb109
+magnus@neptunus.(none)|ndb/src/rep/state/Makefile|20040414084438|33082|6a9cedaeedcc4650
+magnus@neptunus.(none)|ndb/src/rep/state/RepState.cpp|20040414082432|16760|3d60b0a46e9477c1
+magnus@neptunus.(none)|ndb/src/rep/state/RepState.hpp|20040414082432|19671|94d7c472c8a7367
+magnus@neptunus.(none)|ndb/src/rep/state/RepStateEvent.cpp|20040414082432|22494|f51d7eb7b7aca0b
+magnus@neptunus.(none)|ndb/src/rep/state/RepStateRequests.cpp|20040414082432|25234|393882166df6929
+magnus@neptunus.(none)|ndb/src/rep/state/testInterval/Makefile|20040414084438|35164|e33e587a7947ac36
+magnus@neptunus.(none)|ndb/src/rep/state/testInterval/testInterval.cpp|20040414082432|27995|993f4118f616e80
+magnus@neptunus.(none)|ndb/src/rep/state/testRepState/Makefile|20040414084438|28225|f5a6d9415d7e0977
+magnus@neptunus.(none)|ndb/src/rep/state/testRepState/testRequestor.cpp|20040414082432|30850|4a943fae5be63c79
+magnus@neptunus.(none)|ndb/src/rep/state/testRepState/testRequestor.hpp|20040414082432|33580|583208c83ff5b554
+magnus@neptunus.(none)|ndb/src/rep/storage/GCIBuffer.cpp|20040414082433|01915|6e8c6f38ab63d1d6
+magnus@neptunus.(none)|ndb/src/rep/storage/GCIBuffer.hpp|20040414082433|04667|703e2016a7ec616f
+magnus@neptunus.(none)|ndb/src/rep/storage/GCIContainer.cpp|20040414082433|07490|9c53acd16fc5ac74
+magnus@neptunus.(none)|ndb/src/rep/storage/GCIContainer.hpp|20040414082433|10275|ac28cea9114659fd
+magnus@neptunus.(none)|ndb/src/rep/storage/GCIContainerPS.cpp|20040414082433|13103|116168903a2c617a
+magnus@neptunus.(none)|ndb/src/rep/storage/GCIContainerPS.hpp|20040414082433|15896|9a801ffe939e192e
+magnus@neptunus.(none)|ndb/src/rep/storage/GCIPage.cpp|20040414082433|18724|42fa918fbf36828a
+magnus@neptunus.(none)|ndb/src/rep/storage/GCIPage.hpp|20040414082433|22604|4197e2278326515e
+magnus@neptunus.(none)|ndb/src/rep/storage/LogRecord.hpp|20040414082433|25752|11644fe7c5f5d36
+magnus@neptunus.(none)|ndb/src/rep/storage/Makefile|20040414084438|25055|a955d34726662aba
+magnus@neptunus.(none)|ndb/src/rep/storage/NodeConnectInfo.hpp|20040414082433|28517|35a7682fd9dba464
+magnus@neptunus.(none)|ndb/src/rep/storage/NodeGroup.cpp|20040414082433|31343|adebbefb11cd1670
+magnus@neptunus.(none)|ndb/src/rep/storage/NodeGroup.hpp|20040414082433|34127|3fcddc2da5d10e45
+magnus@neptunus.(none)|ndb/src/rep/storage/NodeGroupInfo.cpp|20040414082433|36945|b1130e3c42777658
+magnus@neptunus.(none)|ndb/src/rep/storage/NodeGroupInfo.hpp|20040414082433|39718|7fd3b74f4b59a503
+magnus@neptunus.(none)|ndb/src/rep/transfer/Makefile|20040414084438|38260|6b43df78ea480db1
+magnus@neptunus.(none)|ndb/src/rep/transfer/TransPS.cpp|20040414082433|43592|7a88ca746987ac10
+magnus@neptunus.(none)|ndb/src/rep/transfer/TransPS.hpp|20040414082433|46546|846b26eaa80632a1
+magnus@neptunus.(none)|ndb/src/rep/transfer/TransSS.cpp|20040414082433|49370|8f12a062b240eecf
+magnus@neptunus.(none)|ndb/src/rep/transfer/TransSS.hpp|20040414082433|52255|7718b5e4ce9a4007
+magnus@neptunus.(none)|ndb/src/rep/transfer/TransSSSubscriptions.cpp|20040414082433|55067|6bc55e474f33e023
 magnus@neptunus.(none)|ndb/tools/ndbnet/Makefile.PL|20040414082442|56473|81be90388548652f
 magnus@neptunus.(none)|ndb/tools/ndbnet/lib/NDB/Net.pm|20040414082442|02828|425c84165071d5f6
 magnus@neptunus.(none)|ndb/tools/ndbnet/lib/NDB/Net/Base.pm|20040414082442|11671|50a6f0d38fa1a57c
@@ -789,26 +1181,15 @@ sasha@mysql.sashanet.com|build-tags|20011125054855|05181|7afb7e785b80f97
 sasha@mysql.sashanet.com|build-tags|20011201050944|25384|b6f6fff142121618
 sasha@mysql.sashanet.com|libmysql_r/acconfig.h|20001128060846|51084|65f1202b3b5c345f
 sasha@mysql.sashanet.com|mysql-test/README.gcov|20001012045950|28177|5a6da067a30780ce
-sasha@mysql.sashanet.com|mysql-test/README.gcov|20001214012355|41825|2de7575ca81155e5
 sasha@mysql.sashanet.com|mysql-test/README|20001010001022|12739|108667adaeabe3f5
 sasha@mysql.sashanet.com|mysql-test/r/3.23/alt000001.result|20001122072330|24729|393103dbf15f35c9
 sasha@mysql.sashanet.com|mysql-test/r/3.23/ins000001.result|20001018175743|49824|f45c599efdf8352b
 sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000001.a.result|20001118063528|39426|2987b17db06808c3
 sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000001.b.result|20001118063528|44057|62e1fa91167cacc3
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000002.result|20001118063528|46039|109f5ceed1e0d64
 sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000003.result|20001118063528|48148|68d6ee00beaa011
 sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000004.a.result|20001118063528|50132|3415f066cb91c460
 sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000004.b.result|20001118063528|52094|352b35351551485
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000005.result|20001118063528|54071|a50962bc2340ab9a
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000006.result|20001118063528|56081|5653051e8ce6b4aa
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000007.result|20001121063807|21606|e0c3b6134e0884da
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000008.result|20001121063807|23636|c5cfee19ca5a7da9
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000009.result|20001121063807|25633|ed8042446ab97926
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000010.result|20001122072330|29430|3228109b8965b0f8
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000011.result|20001125024912|48851|c29dce30aa97f265
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000012.result|20001126062901|05938|35d6596da7b90fc5
 sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000012.status.result|20001126062901|09395|bbbd650b5beea32f
-sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000013.result|20001202171150|03876|ac5024e6cf6daac6
 sasha@mysql.sashanet.com|mysql-test/r/3.23/rpl000013.status.result|20001202171150|06069|6bee190c298cc9fd
 sasha@mysql.sashanet.com|mysql-test/r/3.23/sel000003.result|20001011230020|64653|d7b657b1e3a286a7
 sasha@mysql.sashanet.com|mysql-test/r/3.23/sel000100.res|20001205131218|23520|84ed46856cb3a69f
@@ -817,7 +1198,6 @@ sasha@mysql.sashanet.com|mysql-test/r/binlog-backup-restore.result|2001042423392
 sasha@mysql.sashanet.com|mysql-test/r/df_crash.result|20010406010433|59989|4a3dbee64843953d
 sasha@mysql.sashanet.com|mysql-test/r/identity.result|20010910233028|16331|e41453a364242503
 sasha@mysql.sashanet.com|mysql-test/r/mrg000002.result|20001212152450|11492|745be0854aaaaf5e
-sasha@mysql.sashanet.com|mysql-test/r/slave-running.result|20001208141122|24303|f73e49462cf59e1f
 sasha@mysql.sashanet.com|mysql-test/r/slave-stopped.result|20001208141122|28916|25c134b1a4f1993a
 sasha@mysql.sashanet.com|mysql-test/std_data/m.MRG|20001212152450|17736|3f5632c37af00f18
 sasha@mysql.sashanet.com|mysql-test/std_data/m.frm|20001212152450|13897|e351dfe0b6824c0c

--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -151,6 +151,7 @@ monty@tramp.mysql.fi
 monty@work.mysql.com
 mronstrom@build.mysql.com
 mronstrom@mysql.com
+mskold@bk-internal.mysql.com
 mskold@mysql.com
 msvensson@build.mysql.com
 msvensson@neptunus.homeip.net

--- a/mysql-test/my_create_tables.c
+++ b/mysql-test/my_create_tables.c
@@ -96,6 +96,8 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
      "PRIMARY KEY Host (Host,Db,User),"
      "KEY User (User))"
+      "engine=MyISAM "
+      "CHARACTER SET utf8 COLLATE utf8_bin "
      "comment='Database privileges';\n");

    if (test)
@@ -126,10 +128,12 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
      "Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
      "PRIMARY KEY Host (Host,Db))"
-      "comment='Host privileges;"
-      " Merged with database privileges';\n");
+      "engine=MyISAM "
+      "CHARACTER SET utf8 COLLATE utf8_bin "
+      "comment='Host privileges;  Merged with database privileges';\n");
  }

+
  if (test_sys_file(mdata,"mysql/user.frm"))
  {
 #ifdef __WIN__
@@ -184,7 +188,10 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "max_updates int(11) unsigned DEFAULT 0  NOT NULL,"
      "max_connections int(11) unsigned DEFAULT 0  NOT NULL,"
      "PRIMARY KEY Host (Host,User)"
-      ") comment='Users and global privileges';\n");
+      ") engine=MyISAM "
+      "CHARACTER SET utf8 COLLATE utf8_bin "
+      "comment='Users and global privileges';\n");
+

    if (test)
    {
@@ -238,7 +245,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "dl char(128) DEFAULT '' NOT NULL,"
      "type enum ('function','aggregate') NOT NULL,"
      "PRIMARY KEY (name)"
-      ") comment='User defined functions';\n");
+      ") engine=MyISAM "
+      "CHARACTER SET utf8 COLLATE utf8_bin "
+      "comment='User defined functions';\n");
  }

  if (test_sys_file(mdata,"mysql/tables_priv.frm"))
@@ -258,7 +267,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "  DEFAULT '' NOT NULL,"
      "PRIMARY KEY (Host,Db,User,Table_name),"
      "KEY Grantor (Grantor)"
-      ") comment='Table privileges';\n");
+      ") engine=MyISAM "
+      "CHARACTER SET utf8 COLLATE utf8_bin "
+      "comment='Table privileges';\n");
  }

  if (test_sys_file(mdata,"mysql/columns_priv.frm"))
@@ -274,7 +285,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "Column_priv set('Select','Insert','Update','References')"
      " DEFAULT '' NOT NULL,"
      "PRIMARY KEY (Host,Db,User,Table_name,Column_name)"
-      ") comment='Column privileges';\n");
+      ") engine=MyISAM "
+      "CHARACTER SET utf8 COLLATE utf8_bin "
+      "comment='Column privileges';\n");
  }

  if (test_sys_file(mdata,"mysql/help_topic.frm"))
@@ -289,7 +302,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "url              varchar(128) not null,"
      "primary key      (help_topic_id),"
      "unique index     (name)"
-      ") comment='help topics';\n");
+      ") engine=MyISAM "
+      "CHARACTER SET utf8 "
+      "comment='help topics';\n");
  }

  if (test_sys_file(mdata,"mysql/help_category.frm"))
@@ -302,7 +317,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "url                varchar(128) not null,"
      "primary key        (help_category_id),"
      "unique index       (name)"
-      ") comment='help categories';\n");
+      ") engine=MyISAM "
+      "CHARACTER SET utf8 "
+      "comment='help categories';\n");
  }

  if (test_sys_file(mdata,"mysql/help_keyword.frm"))
@@ -313,7 +330,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "name             varchar(64) not null,"
      "primary key      (help_keyword_id),"
      "unique index     (name)"
-      ") comment='help keywords';\n");
+      ") engine=MyISAM "
+      "CHARACTER SET utf8 "
+      "comment='help keywords';\n");
  }
 				    
  if (test_sys_file(mdata,"mysql/help_relation.frm"))
@@ -323,7 +342,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "help_topic_id int unsigned not null references help_topic,"
      "help_keyword_id int unsigned not null references help_keyword,"
      "primary key      (help_keyword_id, help_topic_id)"
-      ") comment='keyword-topic relation';\n");
+      ") engine=MyISAM "
+      "CHARACTER SET utf8 "
+      "comment='keyword-topic relation';\n");
  }

  if (test_sys_file(mdata,"mysql/time_zone_name.frm"))
@@ -333,7 +354,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "Name char(64) NOT NULL,"
      "Time_zone_id int unsigned NOT NULL,"
      "PRIMARY KEY Name (Name)"
-      ") DEFAULT CHARACTER SET latin1 "
+      ") engine=MyISAM CHARACTER SET utf8 "
      "comment='Time zone names';\n");
  
    if (test)
@@ -341,7 +362,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      fprintf(out,
        "INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES"
        "('MET', 1), ('UTC', 2), ('Universal', 2), "
-        "('Europe/Moscow',3), ('leap/Europe/Moscow',4);\n");
+        "('Europe/Moscow',3), ('leap/Europe/Moscow',4),"
+        "('Japan', 5);\n");
+
    }
  }

@@ -353,13 +376,13 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "Time_zone_id int unsigned NOT NULL auto_increment,"
      "Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL,"
      "PRIMARY KEY TzId (Time_zone_id)"
-      ") DEFAULT CHARACTER SET latin1 "
+      ") engine=MyISAM CHARACTER SET utf8 "
      "comment='Time zones';\n");
  
    if (test)
    {
      fprintf(out,"INSERT INTO time_zone (Time_zone_id, Use_leap_seconds)"
-                  "VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y');\n");
+                  "VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y'), (5,'N');\n");
    }
  }

@@ -371,7 +394,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "Transition_time bigint signed NOT NULL,"
      "Transition_type_id int unsigned NOT NULL,"
      "PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time)"
-      ") DEFAULT CHARACTER SET latin1 "
+      ") engine=MyISAM CHARACTER SET utf8 "
      "comment='Time zone transitions';\n");
  
    if (test)
@@ -576,7 +599,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
       ",(4, 2045689222, 8) ,(4, 2058390022, 9)"
       ",(4, 2077138822, 8) ,(4, 2090444422, 9)"
       ",(4, 2108588422, 8) ,(4, 2121894022, 9)"
-       ",(4, 2140038022, 8);\n");
+       ",(4, 2140038022, 8), (5, -1009875600, 1);\n");
+       
+       
    }
  }

@@ -590,7 +615,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "Is_DST tinyint unsigned DEFAULT 0 NOT NULL,"
      "Abbreviation char(8) DEFAULT '' NOT NULL,"
      "PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id)"
-      ") DEFAULT CHARACTER SET latin1 "
+      ") engine=MyISAM CHARACTER SET utf8 "
      "comment='Time zone transition types';\n");
  
    if (test)
@@ -612,7 +637,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
        ",(4, 4, 10800, 0, 'MSK') ,(4, 5, 14400, 1, 'MSD')"
        ",(4, 6, 18000, 1, 'MSD') ,(4, 7, 7200, 0, 'EET')"
        ",(4, 8, 10800, 0, 'MSK') ,(4, 9, 14400, 1, 'MSD')"
-        ",(4, 10, 10800, 1, 'EEST') ,(4, 11, 7200, 0, 'EET');\n");
+        ",(4, 10, 10800, 1, 'EEST') ,(4, 11, 7200, 0, 'EET')"
+        ",(5, 0, 32400, 0, 'CJT') ,(5, 1, 32400, 0, 'JST');\n");
+	
    }
  }

@@ -623,7 +650,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
      "Transition_time bigint signed NOT NULL,"
      "Correction int signed NOT NULL,"
      "PRIMARY KEY TranTime (Transition_time)"
-      ") DEFAULT CHARACTER SET latin1 "
+      ") engine=MyISAM CHARACTER SET utf8 "
      "comment='Leap seconds information for time zones';\n");
  
    if (test)

--- a/mysql-test/my_manage.c
+++ b/mysql-test/my_manage.c
@@ -800,9 +800,12 @@ int removef(const char *format, ...)
 #ifndef STRUCT_DIRENT_HAS_D_TYPE
    struct stat st;

-    if (lstat(entry->d_name, &st) == -1)
+    /* create long name */
+    snprintf(temp, FN_REFLEN, "%s/%s", path, entry->d_name);
+
+    if (lstat(temp, &st) == -1)
    {
-      return 1;
+      return 1;  /* Error couldn't lstat file */
    }

    if (!S_ISDIR(st.st_mode) && !fnmatch(p, entry->d_name,0))

--- a/mysql-test/mysql_test_run_new.c
+++ b/mysql-test/mysql_test_run_new.c
@@ -132,7 +132,13 @@ static char skip_test[FN_REFLEN]=
 " repair ,"
 " rpl_trunc_binlog ,"
 " mysqldump ,"
-" rpl000001 ";
+" rpl000001 ,"
+
+" derived ,"
+" group_by ,"
+" select ,"
+" rpl000015 ,"
+" subselect ";
 #endif
 static char ignore_test[FN_REFLEN]= "";

@@ -143,6 +149,8 @@ static char mysql_tmp_dir[FN_REFLEN];
 static char result_dir[FN_REFLEN];
 static char master_dir[FN_REFLEN];
 static char slave_dir[FN_REFLEN];
+static char slave1_dir[FN_REFLEN];
+static char slave2_dir[FN_REFLEN];
 static char lang_dir[FN_REFLEN];
 static char char_dir[FN_REFLEN];

@@ -190,6 +198,8 @@ int restarts= 0;

 FILE *log_fd= NULL;

+static char argument[FN_REFLEN];
+
 /******************************************************************************

  functions
@@ -221,7 +231,7 @@ void log_info(const char *, ...);
 void log_error(const char *, ...);
 void log_errno(const char *, ...);
 void die(const char *);
-char *str_tok(char *string, const char *delim);
+char *str_tok(char* dest, char *string, const char *delim);
 #ifndef __WIN__
 void run_init_script(const char *script_name);
 #endif
@@ -289,11 +299,15 @@ void install_db(char *datadir)
  add_arg(&al, "--basedir=%s", base_dir);
  add_arg(&al, "--datadir=%s", datadir);
  add_arg(&al, "--skip-innodb");
+  add_arg(&al, "--skip-ndbcluster");
  add_arg(&al, "--skip-bdb");
 #ifndef __NETWARE__
  add_arg(&al, "--character-sets-dir=%s", char_dir);
  add_arg(&al, "--language=%s", lang_dir);
 #endif
+// added 
+  add_arg(&al, "--default-character-set=latin1");
+  add_arg(&al, "--innodb_data_file_path=ibdata1:50M");

  /* spawn */
  if ((err= spawn(mysqld_file, &al, TRUE, input, output, error, NULL)) != 0)
@@ -335,12 +349,27 @@ void mysql_install_db()
  mkdir(temp, S_IRWXU);
  snprintf(temp, FN_REFLEN, "%s/var/master-data/test", mysql_test_dir);
  mkdir(temp, S_IRWXU);
+  
  snprintf(temp, FN_REFLEN, "%s/var/slave-data", mysql_test_dir);
  mkdir(temp, S_IRWXU);
  snprintf(temp, FN_REFLEN, "%s/var/slave-data/mysql", mysql_test_dir);
  mkdir(temp, S_IRWXU);
  snprintf(temp, FN_REFLEN, "%s/var/slave-data/test", mysql_test_dir);
  mkdir(temp, S_IRWXU);
+  
+  snprintf(temp, FN_REFLEN, "%s/var/slave1-data", mysql_test_dir);
+  mkdir(temp, S_IRWXU);
+  snprintf(temp, FN_REFLEN, "%s/var/slave1-data/mysql", mysql_test_dir);
+  mkdir(temp, S_IRWXU);
+  snprintf(temp, FN_REFLEN, "%s/var/slave1-data/test", mysql_test_dir);
+  mkdir(temp, S_IRWXU);
+  
+  snprintf(temp, FN_REFLEN, "%s/var/slave2-data", mysql_test_dir);
+  mkdir(temp, S_IRWXU);
+  snprintf(temp, FN_REFLEN, "%s/var/slave2-data/mysql", mysql_test_dir);
+  mkdir(temp, S_IRWXU);
+  snprintf(temp, FN_REFLEN, "%s/var/slave2-data/test", mysql_test_dir);
+  mkdir(temp, S_IRWXU);
 #else
  mkdir(temp);
  /* create subdirectories */
@@ -368,6 +397,8 @@ void mysql_install_db()
  install_db(master_dir);
  mlog("Creating test databases for slave... \n");
  install_db(slave_dir);
+  install_db(slave1_dir);
+  install_db(slave2_dir);
 }

 /******************************************************************************
@@ -384,7 +415,6 @@ void start_master()
  int err;
  char master_out[FN_REFLEN];
  char master_err[FN_REFLEN];
-/*  char temp[FN_REFLEN]; */
  char temp2[FN_REFLEN];

  /* remove old berkeley db log files that can confuse the server */
@@ -463,6 +493,11 @@ void start_master()
  add_arg(&al, "--character-sets-dir=%s", char_dir);
  add_arg(&al, "--tmpdir=%s", mysql_tmp_dir);
  add_arg(&al, "--language=%s", lang_dir);
+ 
+  add_arg(&al, "--rpl-recovery-rank=1");
+  add_arg(&al, "--init-rpl-role=master");
+  add_arg(&al, "--default-character-set=latin1");
+//  add_arg(&al, "--innodb_data_file_path=ibdata1:50M");
 #ifdef DEBUG /* only for debug builds */
  add_arg(&al, "--debug");
 #endif
@@ -491,13 +526,13 @@ void start_master()
  {
    char *p;

-    p= (char *)str_tok(master_opt, " \t");
+    p= (char *)str_tok(argument, master_opt, " \t");
    if (!strstr(master_opt, "timezone"))
    {
      while (p)
      {
        add_arg(&al, "%s", p);
-        p= (char *)str_tok(NULL, " \t");
+        p= (char *)str_tok(argument, NULL, " \t");
      }
    }
  }
@@ -624,10 +659,10 @@ void start_slave()
  add_arg(&al, "--log-bin=slave-bin");
  add_arg(&al, "--relay_log=slave-relay-bin");
  add_arg(&al, "--basedir=%s", base_dir);
-  add_arg(&al, "--port=%u", slave_port);
 #if !defined(__NETWARE__) && !defined(__WIN__)
  add_arg(&al, "--socket=%s",slave_socket);
 #endif
+  add_arg(&al, "--port=%u", slave_port);
  add_arg(&al, "--datadir=%s", slave_dir);
 #ifndef __WIN__
  add_arg(&al, "--pid-file=%s", slave_pid);
@@ -651,6 +686,11 @@ void start_slave()
  add_arg(&al, "--master-retry-count=10");
  add_arg(&al, "-O");
  add_arg(&al, "slave_net_timeout=10");
+  add_arg(&al, "--log-slave-updates");
+  add_arg(&al, "--log=%s/var/log/slave.log", mysql_test_dir);
+  add_arg(&al, "--default-character-set=latin1");
+  add_arg(&al, "--skip-ndbcluster");
+  
 #ifdef DEBUG /* only for debug builds */
  add_arg(&al, "--debug");
 #endif      
@@ -667,12 +707,12 @@ void start_slave()
  {
    char *p;

-    p= (char *)str_tok(slave_master_info, " \t");
+    p= (char *)str_tok(argument, slave_master_info, " \t");

    while (p)
    {
      add_arg(&al, "%s", p);
-      p= (char *)str_tok(NULL, " \t");
+      p= (char *)str_tok(argument, NULL, " \t");
    }
  }
  else
@@ -700,12 +740,12 @@ void start_slave()
  {
    char *p;

-    p= (char *)str_tok(slave_opt, " \t");
+    p= (char *)str_tok(argument, slave_opt, " \t");

    while (p)
    {
      add_arg(&al, "%s", p);
-      p= (char *)str_tok(NULL, " \t");
+      p= (char *)str_tok(argument, NULL, " \t");
    } 
  }

@@ -753,9 +793,12 @@ void start_slave()

 void mysql_start()
 {
-/*  log_info("Starting the MySQL server(s): %u", ++restarts); */
+
+
+  printf("loading master...\r");
  start_master();

+  printf("loading slave...\r");
  start_slave();

  /* activate the test screen */
@@ -853,6 +896,7 @@ void mysql_restart()
  mysql_stop();

  mlog(DASH);
+  sleep(1);

  mysql_start();
 }
@@ -912,7 +956,7 @@ int read_option(char *opt_file, char *opt)
    if ((p= strstr(opt, "\\\\")) != NULL)
    {
      /* bmove is guranteed to work byte by byte */
-      bmove(p, p+1, strlen(p+1));
+      bmove(p, p+1, strlen(p)+1);
    }
  }
  else
@@ -977,14 +1021,6 @@ void run_test(char *test)
    char err_file[FN_REFLEN];
    int err;
    arg_list_t al;
-#ifdef __WIN__
-    /* Clean test database */
-    removef("%s/test/*.*", master_dir);
-    removef("%s/test/*.*", slave_dir);
-    removef("%s/mysqltest/*.*", master_dir);
-    removef("%s/mysqltest/*.*", slave_dir);
-
-#endif
    /* skip slave? */
    flag= skip_slave;
    skip_slave= (strncmp(test, "rpl", 3) != 0);
@@ -1045,9 +1081,6 @@ void run_test(char *test)
    if (!master_running) mysql_start();
      else if (restart) mysql_restart();

-    /* let the system stabalize */
-    sleep(1);
-
    /* show test */
    mlog("%-46s ", test);

@@ -1066,10 +1099,12 @@ void run_test(char *test)
    add_arg(&al, "--silent");
    add_arg(&al, "--basedir=%s/", mysql_test_dir);
    add_arg(&al, "--host=127.0.0.1");
+    add_arg(&al, "--skip-safemalloc");
    add_arg(&al, "-v");
    add_arg(&al, "-R");
    add_arg(&al, "%s", result_file);
    
+    
    if (use_openssl)
    {
      add_arg(&al, "--ssl-ca=%s", ca_cert);
@@ -1079,7 +1114,6 @@ void run_test(char *test)

    /* spawn */
    err= spawn(mysqltest_file, &al, TRUE, test_file, out_file, err_file, NULL);
-
    /* free args */
    free_args(&al);

@@ -1259,7 +1293,9 @@ void die(const char *msg)
 void setup(char *file __attribute__((unused)))
 {
  char temp[FN_REFLEN];
+#if defined(__WIN__) || defined(__NETWARE__)  
  char file_path[FN_REFLEN*2];
+#endif  
  char *p;
  int position;

@@ -1349,7 +1385,11 @@ void setup(char *file __attribute__((unused)))
  snprintf(client_key, FN_REFLEN, "%s/SSL/client-key.pem", base_dir);

  /* setup files */
+#ifdef _DEBUG 
+  snprintf(mysqld_file, FN_REFLEN, "%s/mysqld-debug.exe", bin_dir);
+#else
  snprintf(mysqld_file, FN_REFLEN, "%s/mysqld.exe", bin_dir);
+#endif
  snprintf(mysqltest_file, FN_REFLEN, "%s/mysqltest.exe", bin_dir);
  snprintf(mysqladmin_file, FN_REFLEN, "%s/mysqladmin.exe", bin_dir);
 #else
@@ -1361,6 +1401,8 @@ void setup(char *file __attribute__((unused)))
  snprintf(result_dir, FN_REFLEN, "%s/r", mysql_test_dir);
  snprintf(master_dir, FN_REFLEN, "%s/var/master-data", mysql_test_dir);
  snprintf(slave_dir, FN_REFLEN, "%s/var/slave-data", mysql_test_dir);
+  snprintf(slave1_dir, FN_REFLEN, "%s/var/slave1-data", mysql_test_dir);
+  snprintf(slave2_dir, FN_REFLEN, "%s/var/slave2-data", mysql_test_dir);
  snprintf(lang_dir, FN_REFLEN, "%s/sql/share/english", base_dir);
  snprintf(char_dir, FN_REFLEN, "%s/sql/share/charsets", base_dir);

@@ -1413,30 +1455,147 @@ void setup(char *file __attribute__((unused)))
  snprintf(file_path,FN_REFLEN,"MYSQL_TEST_DIR=%s",mysql_test_dir);
  _putenv(file_path);
  snprintf(file_path, FN_REFLEN*2,
-           "MYSQL_DUMP=%s/mysqldump.exe --no-defaults -u root --port=%u",
+           "MYSQL_DUMP=%s/mysqldump.exe --no-defaults -uroot --port=%u",
           bin_dir, master_port);
  _putenv(file_path);
  snprintf(file_path, FN_REFLEN*2,
          "MYSQL_BINLOG=%s/mysqlbinlog.exe --no-defaults --local-load=%s",
           bin_dir, mysql_tmp_dir);
  _putenv(file_path);
-#else
-  snprintf(file_path,FN_REFLEN,"MYSQL_TEST_DIR=%s",mysql_test_dir);
-  putenv(file_path);
+    
  snprintf(file_path, FN_REFLEN*2,
-           "MYSQL_DUMP=%s/mysqldump --no-defaults -u root --port=%u --socket=%s",
-           bin_dir, master_port, master_socket);
-  putenv(file_path);
+          "TESTS_BINDIR=%s/tests", base_dir);
+  _putenv(file_path);
+
+  snprintf(file_path, FN_REFLEN*2,
+           "CHARSETSDIR=%s/sql/share/charsets", base_dir);
+  _putenv(file_path);
+
+  snprintf(file_path, FN_REFLEN*2,
+           "MYSQL=%s/mysql --port=%u ", 
+           bin_dir, master_port);
+  _putenv(file_path);
+    
  snprintf(file_path, FN_REFLEN*2,
-           "MYSQL_BINLOG=%s/mysqlbinlog --no-defaults --local-load=%s",
+           "MYSQL_FIX_SYSTEM_TABLES=%s/scripts/mysql_fix_privilege_tables --no-defaults "
+           "--host=localhost --port=%u "
+           "--basedir=%s --bindir=%s --verbose",
+           base_dir,master_port, base_dir, bin_dir);
+  _putenv(file_path);
+     
+  snprintf(file_path, FN_REFLEN*2,
+           "NDB_TOOLS_DIR=%s/ndb/tools", base_dir);
+  _putenv(file_path);
+    
+  snprintf(file_path, FN_REFLEN*2,
+           "CLIENT_BINDIR=%s", bin_dir);
+  _putenv(file_path);
+
+  snprintf(file_path, FN_REFLEN*2,
+             "MYSQL_CLIENT_TEST=%s/tests/mysql_client_test --no-defaults --testcase "
+	     "--user=root --port=%u --silent", 
+	     base_dir, master_port);
+  _putenv(file_path);
+
+#else
+  {
+    static char env_MYSQL_TEST_DIR[FN_REFLEN*2];
+    static char env_MYSQL_DUMP[FN_REFLEN*2];
+    static char env_MYSQL_BINLOG[FN_REFLEN*2];
+    static char env_MASTER_MYSOCK[FN_REFLEN*2];
+    static char env_TESTS_BINDIR[FN_REFLEN*2];
+    static char env_CHARSETSDIR[FN_REFLEN*2];
+    static char env_MYSQL[FN_REFLEN*2];
+    static char env_MYSQL_FIX_SYSTEM_TABLES[FN_REFLEN*2];
+    static char env_CLIENT_BINDIR[FN_REFLEN*2];
+    static char env_MYSQL_CLIENT_TEST[FN_REFLEN*2];
+    static char env_NDB_TOOLS_DIR[FN_REFLEN*2];
+    static char env_NDB_MGM[FN_REFLEN*2];
+    static char env_NDB_BACKUP_DIR[FN_REFLEN*2];
+    static char env_NDB_TOOLS_OUTPUT[FN_REFLEN*2];
+    
+    snprintf(env_MYSQL_TEST_DIR,FN_REFLEN*2,
+             "MYSQL_TEST_DIR=%s",mysql_test_dir);
+    putenv(env_MYSQL_TEST_DIR);
+    
+    snprintf(env_MYSQL_DUMP, FN_REFLEN*2,"MYSQL_DUMP=%s/mysqldump --no-defaults "
+             "-uroot --port=%u --socket=%s ", 
+             bin_dir, master_port, master_socket);    
+    putenv(env_MYSQL_DUMP);
+    
+    snprintf(env_MYSQL_BINLOG, FN_REFLEN*2,
+             "MYSQL_BINLOG=%s/mysqlbinlog --no-defaults --local-load=%s -uroot ",
             bin_dir, mysql_tmp_dir);
-  putenv(file_path);
+    putenv(env_MYSQL_BINLOG);
+    
+    snprintf(env_MASTER_MYSOCK, FN_REFLEN*2,
+             "MASTER_MYSOCK=%s", master_socket);
+    putenv(env_MASTER_MYSOCK);
+
+    snprintf(env_TESTS_BINDIR, FN_REFLEN*2,
+             "TESTS_BINDIR=%s/tests", base_dir);
+    putenv(env_TESTS_BINDIR);
+
+    snprintf(env_CHARSETSDIR, FN_REFLEN*2,
+             "CHARSETSDIR=%s/sql/share/charsets", base_dir);
+    putenv(env_CHARSETSDIR);
+
+    snprintf(env_MYSQL, FN_REFLEN*2,
+             "MYSQL=%s/mysql --port=%u --socket=%s -uroot ", 
+	     bin_dir, master_port, master_socket);
+    putenv(env_MYSQL);
+    
+    snprintf(env_MYSQL_FIX_SYSTEM_TABLES, FN_REFLEN*2,
+             "MYSQL_FIX_SYSTEM_TABLES=%s/scripts/mysql_fix_privilege_tables --no-defaults "
+	     "--host=localhost --port=%u --socket=%s "
+	     "--basedir=%s --bindir=%s --verbose -uroot ",
+	     base_dir,master_port, master_socket, base_dir, bin_dir);
+    putenv(env_MYSQL_FIX_SYSTEM_TABLES);
+     
+    
+    snprintf(env_CLIENT_BINDIR, FN_REFLEN*2,
+             "CLIENT_BINDIR=%s", bin_dir);
+    putenv(env_CLIENT_BINDIR);
+
+    snprintf(env_MYSQL_CLIENT_TEST, FN_REFLEN*2,
+             "MYSQL_CLIENT_TEST=%s/tests/mysql_client_test --no-defaults --testcase "
+	     "--user=root --socket=%s --port=%u --silent", 
+	     base_dir, master_socket, master_port);
+    putenv(env_MYSQL_CLIENT_TEST);
+    
+    // NDB
+    
+    snprintf(env_NDB_TOOLS_DIR, FN_REFLEN*2,
+             "NDB_TOOLS_DIR=%s/ndb/tools", base_dir);
+    putenv(env_NDB_TOOLS_DIR);
+  
+    snprintf(env_NDB_MGM, FN_REFLEN*2,
+             "NDB_MGM=%s/ndb/src/mgmclient/ndb_mgm", base_dir);
+    putenv(env_NDB_MGM);
+  
+    //NDBCLUSTER_PORT=9350
+    snprintf(env_NDB_BACKUP_DIR, FN_REFLEN*2,
+             "NDB_BACKUP_DIR=%s/var/ndbcluster-%i", mysql_test_dir, 9350);
+    putenv(env_NDB_BACKUP_DIR);
+  
+    snprintf(env_NDB_TOOLS_OUTPUT, FN_REFLEN*2,
+             "NDB_TOOLS_OUTPUT=%s/var/log/ndb_tools.log", mysql_test_dir);
+    putenv(env_NDB_TOOLS_OUTPUT);
+
+    putenv((char *)"NDB_STATUS_OK=1");
+  
+// NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
+// NDB_BACKUP_DIR=$MYSQL_TEST_DIR/var/ndbcluster-$NDBCLUSTER_PORT
+// NDB_TOOLS_OUTPUT=$MYSQL_TEST_DIR/var/log/ndb_tools.log
+  }
+  
 #endif

 #ifndef __WIN__
  putenv((char *)"MASTER_MYPORT=9306");
  putenv((char *)"SLAVE_MYPORT=9307");
  putenv((char *)"MYSQL_TCP_PORT=3306");
+
 #else
  _putenv("MASTER_MYPORT=9306");
  _putenv("SLAVE_MYPORT=9307");
@@ -1468,9 +1627,14 @@ int main(int argc, char **argv)
  char **testes= 0;
  int name_index;
  int index;
+  char var_dir[FN_REFLEN];
  /* setup */
  setup(argv[0]);
  
+  /* delete all file in var */
+  snprintf(var_dir,FN_REFLEN,"%s/var",mysql_test_dir);
+  del_tree(var_dir);
+
  /*
    The --ignore option is comma saperated list of test cases to skip and
    should be very first command line option to the test suite.
@@ -1484,7 +1648,8 @@ int main(int argc, char **argv)
  {
    char *temp, *token;
    temp= strdup(strchr(argv[1],'=') + 1);
-    for (token=str_tok(temp, ","); token != NULL; token=str_tok(NULL, ","))
+    for (token=str_tok(argument, temp, ","); token != NULL; 
+         token=str_tok(argument, NULL, ","))
    {
      if (strlen(ignore_test) + strlen(token) + 2 <= FN_REFLEN-1)
        sprintf(ignore_test+strlen(ignore_test), " %s ", token);
@@ -1671,105 +1836,70 @@ int main(int argc, char **argv)
 Output:
  return the null terminated token of NULL.
 */
-
-char *str_tok(char *string, const char *delim)
+char *str_tok(char* dest, char *string, const char *delim)
 {
-  char *token;            /* current token received from strtok */
-  char *qt_token;         /* token delimeted by the matching pair of quote */
-  /*
-    if there are any quote chars found in the token then this variable
-    will hold the concatenated string to return to the caller
-  */
-  char *ptr_token=NULL;
-  /* pointer to the quote character in the token from strtok */
-  char *ptr_quote=NULL;
+  char *token;            
+  char *ptr_end_token= NULL;
+  char *ptr_quote= NULL;
+  char *ptr_token= NULL;
+  int count_quotes= 0;

-  /* See if the delimeter contains any quote character */
+  *dest = '\0';
  if (strchr(delim,'\'') || strchr(delim,'\"'))
    return NULL;

-  /* repeate till we are getting some token from strtok */
-  while ((token= (char*)strtok(string, delim) ) != NULL)
+  token= (char*)strtok(string, delim);
+  if (token) 
  {
-    /*
-      make the input string NULL so that next time onward strtok can
-      be called with NULL input string.
-    */
-    string= NULL;
-    /* We don't need to remove any quote character for Windows version */
-#ifndef __WIN__
-    /* check if the current token contain double quote character*/
-    if ((ptr_quote= (char*)strchr(token,'\"')) != NULL)
+    /* double quote is found */
+    if (strchr(token,'\"'))
    {
-      /*
-        get the matching the matching double quote in the remaining
-        input string
-      */
-      qt_token= (char*)strtok(NULL,"\"");
-    }
-    /* check if the current token contain single quote character*/
-    else if ((ptr_quote= (char*)strchr(token,'\'')) != NULL)
+      do
      {
-      /*
-        get the matching the matching single quote in the remaining
-        input string
-      */
-      qt_token= (char*)strtok(NULL,"\'");
-    }
-#endif
-    /*
-      if the current token does not contains any quote character then
-      return to the caller.
-    */
-    if (ptr_quote == NULL)
+        if (count_quotes & 1)
        {
-      /*
-        if there is any earlier token i.e. ptr_token then append the
-        current token in it and return it else return the current
-        token directly
-      */
-      return ptr_token ? strcat(ptr_token,token) : token;
+	  if (*dest == '\0')
+            sprintf(dest,"%s", ptr_token);
+	  else
+            sprintf(dest,"%s %s", dest, ptr_token);
+          ptr_token= (char*)strtok(NULL, delim);
+          if (!ptr_token)
+            break;
        }
-
-    /*
-      remove the quote character i.e. make NULL so that the token will
-      be devided in two part and later both part can be concatenated
-      and hence quote will be removed
-    */
-    *ptr_quote= 0;
-
-    /* check if ptr_token has been initialized or not */
-    if (ptr_token == NULL)
+        else
        {
-      /* initialize the ptr_token with current token */
          ptr_token= token;
-      /* copy entire string between matching pair of quote*/
-      sprintf(ptr_token+strlen(ptr_token),"%s %s", ptr_quote+1, qt_token);
        }
-    else
+        if (ptr_quote = strchr(ptr_token,'\"'))
        {
-      /*
-        copy the current token and entire string between matching pair
-        of quote
-      */
-      if (qt_token == NULL)
+          ptr_end_token= ptr_token + strlen(ptr_token);
+          do
+          {
+#ifndef __WIN__
+            bmove(ptr_quote, ptr_quote+1, ptr_end_token - ptr_quote);
+#endif
+            count_quotes++;
+          } while (ptr_quote != NULL && (ptr_quote = strchr(ptr_quote+1,'\"')));
+        }
+      /* there are unpair quotes we have to search next quote*/
+      } while (count_quotes & 1);
+      if (ptr_token != NULL)
      {
-        sprintf(ptr_token+strlen(ptr_token),"%s%s", token, ptr_quote+1);
+        if (*dest == '\0')
+          sprintf(dest,"%s", ptr_token);
+	else
+          sprintf(dest,"%s %s",dest,ptr_token);
+      }
    }
    else
    {
-        sprintf(ptr_token+strlen(ptr_token),"%s%s %s", token, ptr_quote+1,
-                qt_token );
+      sprintf(dest,"%s",token);
    }
  }
-  }
-
-  /* return the concatenated token */
-  return ptr_token;
+  return token ? dest : NULL;
 }

 #ifndef __WIN__
-
 /*
 Synopsis:
  This function run scripts files on Linux and Netware

--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -329,7 +329,7 @@ prepare stmt4 from ' show engine bdb logs ';
 execute stmt4;
 --enable_result_log
 prepare stmt4 from ' show full processlist ';
--replace_column 1 number 6 time
+--replace_column 1 number 6 time 3 localhost
 execute stmt4;
 prepare stmt4 from ' show grants for user ';
 --error 1295

--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -4834,16 +4834,16 @@ uint8 ha_ndbcluster::table_cache_type()
 }


-uint ndb_get_commitcount(THD* thd, char* dbname, char* tabname, 
-			 Uint64* commit_count)
+uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname,
+			 Uint64 *commit_count)
 {
  DBUG_ENTER("ndb_get_commitcount");

  if (ndb_cache_check_time > 0)
  {
-    // Use cached commit_count from share
+    /* Use cached commit_count from share */
    char name[FN_REFLEN];
-    NDB_SHARE* share;
+    NDB_SHARE *share;
    (void)strxnmov(name, FN_REFLEN,
 		   "./",dbname,"/",tabname,NullS);
    DBUG_PRINT("info", ("name: %s", name));
@@ -4861,7 +4861,7 @@ uint ndb_get_commitcount(THD* thd, char* dbname, char* tabname,
    DBUG_RETURN(0);
  }

-  // Get commit_count from NDB
+  /* Get commit_count from NDB */
  Ndb *ndb;
  if (!(ndb= check_ndb_in_thd(thd)))
    DBUG_RETURN(1);
@@ -4906,16 +4906,16 @@ uint ndb_get_commitcount(THD* thd, char* dbname, char* tabname,
 */

 static my_bool
-ndbcluster_cache_retrieval_allowed(THD*	thd, 
-				   char* full_name, uint full_name_len, 
+ndbcluster_cache_retrieval_allowed(THD *thd,
+				   char *full_name, uint full_name_len,
 				   ulonglong *engine_data)
 {
  DBUG_ENTER("ndbcluster_cache_retrieval_allowed");

  Uint64 commit_count;
  bool is_autocommit= !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));
-  char* dbname= full_name;
-  char* tabname= dbname+strlen(dbname)+1;
+  char *dbname= full_name;
+  char *tabname= dbname+strlen(dbname)+1;

  DBUG_PRINT("enter",("dbname=%s, tabname=%s, autocommit=%d",
 		      dbname, tabname, is_autocommit));
@@ -4925,14 +4925,14 @@ ndbcluster_cache_retrieval_allowed(THD*	thd,

  if (ndb_get_commitcount(thd, dbname, tabname, &commit_count))
  {
-    *engine_data+= 1; // invalidate
+    *engine_data+= 1; /* invalidate */
    DBUG_RETURN(FALSE);
  }
  DBUG_PRINT("info", ("*engine_data=%llu, commit_count=%llu",
 		      *engine_data, commit_count));
  if (*engine_data != commit_count)
  {
-    *engine_data= commit_count; // invalidate
+    *engine_data= commit_count; /* invalidate */
    DBUG_PRINT("exit",("Do not use cache, commit_count has changed"));
    DBUG_RETURN(FALSE);
  }
@@ -4965,8 +4965,8 @@ ndbcluster_cache_retrieval_allowed(THD*	thd,
 */

 my_bool
-ha_ndbcluster::register_query_cache_table(THD* thd, 
-					  char* full_name, uint full_name_len,
+ha_ndbcluster::register_query_cache_table(THD *thd,
+					  char *full_name, uint full_name_len,
 					  qc_engine_callback *engine_callback,
 					  ulonglong *engine_data)
 {
@@ -4978,7 +4978,6 @@ ha_ndbcluster::register_query_cache_table(THD* thd,
  if (!is_autocommit)
    DBUG_RETURN(FALSE);

-  
  Uint64 commit_count;
  if (ndb_get_commitcount(thd, m_dbname, m_tabname, &commit_count))
  {
@@ -4992,6 +4991,7 @@ ha_ndbcluster::register_query_cache_table(THD* thd,
  DBUG_RETURN(TRUE);
 }

+
 /*
  Handling the shared NDB_SHARE structure that is needed to
  provide table locking.
@@ -5648,21 +5648,21 @@ ha_ndbcluster::update_table_comment(
 extern "C" pthread_handler_decl(ndb_util_thread_func,
                                arg __attribute__((unused)))
 {
-  THD *thd; // needs to be first for thread_stack
-  int error = 0;
+  THD *thd; /* needs to be first for thread_stack */
+  int error= 0;
  struct timespec abstime;

  my_thread_init();
  DBUG_ENTER("ndb_util_thread");
  DBUG_PRINT("enter", ("ndb_cache_check_time: %d", ndb_cache_check_time));

-  thd= new THD; // note that contructor of THD uses DBUG_ !
+  thd= new THD; /* note that contructor of THD uses DBUG_ */
  THD_CHECK_SENTRY(thd);

  pthread_detach_this_thread();
-  ndb_util_thread = pthread_self();
+  ndb_util_thread= pthread_self();

-  thd->thread_stack = (char*)&thd; // remember where our stack is
+  thd->thread_stack= (char*)&thd; /* remember where our stack is */
  if (thd->store_globals())
  {
    thd->cleanup();
@@ -5685,7 +5685,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func,
                                   ndb_cache_check_time));

    if (abort_loop)
-      break; // Shutting down server
+      break; /* Shutting down server */

    if (ndb_cache_check_time == 0)
    {
@@ -5693,32 +5693,31 @@ extern "C" pthread_handler_decl(ndb_util_thread_func,
      continue;
    }

-    // Set new time to wake up 
+    /* Set new time to wake up */
    set_timespec(abstime, ndb_cache_check_time);

-    // Lock mutex and fill list with pointers to all open tables
+    /* Lock mutex and fill list with pointers to all open tables */
    NDB_SHARE *share;
    pthread_mutex_lock(&ndbcluster_mutex);
    for (uint i= 0; i < ndbcluster_open_tables.records; i++)
    {
      share= (NDB_SHARE *)hash_element(&ndbcluster_open_tables, i);
-      share->use_count++; // Make sure the table can't be closed
+      share->use_count++; /* Make sure the table can't be closed */

      DBUG_PRINT("ndb_util_thread",
                 ("Found open table[%d]: %s, use_count: %d",
                  i, share->table_name, share->use_count));

-      // Store pointer to table
+      /* Store pointer to table */
      util_open_tables.push_back(share);
    }
    pthread_mutex_unlock(&ndbcluster_mutex);

-    
-    // Iterate through the  open files list 
+    /* Iterate through the  open files list */
    List_iterator_fast<NDB_SHARE> it(util_open_tables);
-    while (share=it++)
+    while (share= it++)
    {
-      // Split tab- and dbname
+      /* Split tab- and dbname */
      char buf[FN_REFLEN];
      char *tabname, *db;
      uint length= dirname_length(share->table_name);
@@ -5730,10 +5729,11 @@ extern "C" pthread_handler_decl(ndb_util_thread_func,
                 ("Fetching commit count for: %s, db: %s, tab: %s",
                  share->table_name, db, tabname));

-      // Contact NDB to get commit count for table
+      /* Contact NDB to get commit count for table */
      g_ndb->setDatabaseName(db);
      struct Ndb_statistics stat;;
-      if(ndb_get_table_statistics(g_ndb, tabname, &stat) == 0){
+      if(ndb_get_table_statistics(g_ndb, tabname, &stat) == 0)
+      {
        DBUG_PRINT("ndb_util_thread",
                   ("Table: %s, rows: %llu, commit_count: %llu",
                    share->table_name, stat.row_count, stat.commit_count));
@@ -5744,13 +5744,13 @@ extern "C" pthread_handler_decl(ndb_util_thread_func,
        DBUG_PRINT("ndb_util_thread",
                   ("Error: Could not get commit count for table %s",
                    share->table_name));
-	share->commit_count++; // Invalidate
+        share->commit_count++; /* Invalidate */
      }
-      // Decrease the use count and possibly free share
+      /* Decrease the use count and possibly free share */
      free_share(share);
    }

-    // Clear the list of open tables
+    /* Clear the list of open tables */
    util_open_tables.empty();

  }

--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -31,7 +31,6 @@

 TABLE *unused_tables;				/* Used by mysql_test */
 HASH open_cache;				/* Used by mysql_test */
-HASH assign_cache;

 static int open_unireg_entry(THD *thd, TABLE *entry, const char *db,
 			     const char *name, const char *alias,

--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4817,7 +4817,7 @@ in_sum_expr:
 cast_type:
        BINARY opt_len		{ $$=ITEM_CAST_CHAR; Lex->charset= &my_charset_bin; Lex->dec= 0; }
        | CHAR_SYM opt_len opt_binary	{ $$=ITEM_CAST_CHAR; Lex->dec= 0; }
-	| NCHAR_SYM opt_len	{ $$=ITEM_CAST_CHAR; Lex->charset= national_charset_info; }
+	| NCHAR_SYM opt_len	{ $$=ITEM_CAST_CHAR; Lex->charset= national_charset_info; Lex->dec=0; }
        | SIGNED_SYM		{ $$=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
        | SIGNED_SYM INT_SYM	{ $$=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
        | UNSIGNED		{ $$=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }