mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12873 commits 2778 branches 343 tags 1.6 GiB
Commit graph

12873 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
5920a83184 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-05 22:58:13 -07:00
unknown
5cc410bb70 mysql_stmt_field_count() 
include/mysql.h:
  mysql_stmt_field_count() declaration
libmysql/libmysql.c:
  added mysql_stmt_field_count(): 
  we need this function to ease use of mysql_stmt_result_metadata:
  if mysql_stmt_field_count() != 0 mysql_stmt_result_metadata fails
  only if OOM.
libmysql/libmysql.def:
  declaration for mysql_stmt_field_count()
 2004-06-06 02:27:05 +04:00
unknown
780fdb02fd More comments in prepared statements code. 
libmysql/libmysql.c:
  Extended comments for mysql_stmt_init, mysql_stmt_prepare, 
  mysql_stmt_result_metadata.
  Few bits of code moved around and cleaned up.
sql/sql_prepare.cc:
  Commented case with ulonglong length in get_param_length
 2004-06-06 00:33:16 +04:00
unknown
895efc07ac Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
 2004-06-05 10:43:22 -07:00
unknown
2e8fc0cae2 one more ndb-isolating fix 2004-06-05 13:16:29 +02:00
unknown
b929e7b6a4 do not create ndb Makefiles unless required 2004-06-05 09:22:11 +02:00
unknown
0fc147494a Few more cleanups in client_test: 
No need for mysql_commit, especially after DDL statements.


tests/client_test.c:
  No need for mysql_commit, especially after DDL statements.
 2004-06-05 03:09:53 +04:00
unknown
cfdb7ae67c The comment is not true any more. 
Is there a way to sefely use MYSQL_BIND structure without bzero?
 2004-06-05 02:56:50 +04:00
unknown
f74217fa9e mysql_install_db.sh: 
Correct a grammar error.


scripts/mysql_install_db.sh:
  Correct a grammar error.
 2004-06-04 16:11:47 -05:00
unknown
c08420c8e4 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


myisam/mi_check.c:
  Auto merged
 2004-06-04 21:16:55 +02:00
unknown
889058aa00 make CHECK killable 2004-06-04 21:15:08 +02:00
unknown
8438a19382 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
 2004-06-04 10:35:57 -05:00
unknown
1407f2f0a8 HAVE_DEPRECATED_411_API macro removed. 
include/mysql.h:
  Removed obsolete define.
tests/client_test.c:
  Rewritten to use new API.
  Few cleanups.
  A lot of valgrind warnings/errors removed.
 2004-06-04 18:38:18 +04:00
unknown
7942677020 moved ndb versioning to configure and fixed ndb docs make 2004-06-04 16:08:50 +02:00
unknown
bba051c809 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-06-04 14:08:49 +00:00
unknown
7b2ccce167 automake ndb docs make 
ndb/src/old_files/newtonapi/Makefile:
  mvdir
ndb/src/old_files/newtonapi/dba_binding.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_bulkread.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_config.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_dac.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_error.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_init.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_internal.hpp:
  mvdir
ndb/src/old_files/newtonapi/dba_process.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_process.hpp:
  mvdir
ndb/src/old_files/newtonapi/dba_schema.cpp:
  mvdir
ndb/src/old_files/rep/ExtSender.cpp:
  mvdir
ndb/src/old_files/rep/ExtSender.hpp:
  mvdir
ndb/src/old_files/rep/Makefile:
  mvdir
ndb/src/old_files/rep/NodeConnectInfo.hpp:
  mvdir
ndb/src/old_files/rep/README:
  mvdir
ndb/src/old_files/rep/RepApiInterpreter.cpp:
  mvdir
ndb/src/old_files/rep/RepApiInterpreter.hpp:
  mvdir
ndb/src/old_files/rep/RepApiService.cpp:
  mvdir
ndb/src/old_files/rep/RepApiService.hpp:
  mvdir
ndb/src/old_files/rep/RepCommandInterpreter.cpp:
  mvdir
ndb/src/old_files/rep/RepCommandInterpreter.hpp:
  mvdir
ndb/src/old_files/rep/RepComponents.cpp:
  mvdir
ndb/src/old_files/rep/RepComponents.hpp:
  mvdir
ndb/src/old_files/rep/RepMain.cpp:
  mvdir
ndb/src/old_files/rep/Requestor.cpp:
  mvdir
ndb/src/old_files/rep/Requestor.hpp:
  mvdir
ndb/src/old_files/rep/RequestorSubscriptions.cpp:
  mvdir
ndb/src/old_files/rep/SignalQueue.cpp:
  mvdir
ndb/src/old_files/rep/SignalQueue.hpp:
  mvdir
ndb/src/old_files/rep/TODO:
  mvdir
ndb/src/old_files/rep/adapters/AppNDB.cpp:
  mvdir
ndb/src/old_files/rep/adapters/AppNDB.hpp:
  mvdir
ndb/src/old_files/rep/adapters/ExtAPI.cpp:
  mvdir
ndb/src/old_files/rep/adapters/ExtAPI.hpp:
  mvdir
ndb/src/old_files/rep/dbug_hack.cpp:
  mvdir
ndb/src/old_files/rep/rep_version.hpp:
  mvdir
ndb/src/old_files/rep/adapters/ExtNDB.cpp:
  mvdir
ndb/src/old_files/rep/adapters/ExtNDB.hpp:
  mvdir
ndb/src/old_files/rep/adapters/Makefile:
  mvdir
ndb/src/old_files/rep/adapters/TableInfoPs.hpp:
  mvdir
ndb/src/old_files/rep/repapi/Makefile:
  mvdir
ndb/src/old_files/rep/repapi/repapi.cpp:
  mvdir
ndb/src/old_files/rep/repapi/repapi.h:
  mvdir
ndb/src/old_files/rep/state/Channel.cpp:
  mvdir
ndb/src/old_files/rep/state/Channel.hpp:
  mvdir
ndb/src/old_files/rep/state/Interval.cpp:
  mvdir
ndb/src/old_files/rep/state/Interval.hpp:
  mvdir
ndb/src/old_files/rep/state/Makefile:
  mvdir
ndb/src/old_files/rep/state/RepState.cpp:
  mvdir
ndb/src/old_files/rep/state/RepState.hpp:
  mvdir
ndb/src/old_files/rep/state/RepStateEvent.cpp:
  mvdir
ndb/src/old_files/rep/state/RepStateRequests.cpp:
  mvdir
ndb/src/old_files/rep/state/testInterval/Makefile:
  mvdir
ndb/src/old_files/rep/state/testInterval/testInterval.cpp:
  mvdir
ndb/src/old_files/rep/state/testRepState/Makefile:
  mvdir
ndb/src/old_files/rep/state/testRepState/testRequestor.cpp:
  mvdir
ndb/src/old_files/rep/state/testRepState/testRequestor.hpp:
  mvdir
ndb/src/old_files/rep/storage/GCIBuffer.cpp:
  mvdir
ndb/src/old_files/rep/storage/GCIBuffer.hpp:
  mvdir
ndb/src/old_files/rep/storage/GCIContainer.cpp:
  mvdir
ndb/src/old_files/rep/storage/GCIContainer.hpp:
  mvdir
ndb/src/old_files/rep/storage/GCIContainerPS.cpp:
  mvdir
ndb/src/old_files/rep/storage/GCIContainerPS.hpp:
  mvdir
ndb/src/old_files/rep/storage/GCIPage.cpp:
  mvdir
ndb/src/old_files/rep/storage/GCIPage.hpp:
  mvdir
ndb/src/old_files/rep/storage/LogRecord.hpp:
  mvdir
ndb/src/old_files/rep/storage/Makefile:
  mvdir
ndb/src/old_files/rep/storage/NodeConnectInfo.hpp:
  mvdir
ndb/src/old_files/rep/storage/NodeGroup.cpp:
  mvdir
ndb/src/old_files/rep/storage/NodeGroup.hpp:
  mvdir
ndb/src/old_files/rep/storage/NodeGroupInfo.cpp:
  mvdir
ndb/src/old_files/rep/storage/NodeGroupInfo.hpp:
  mvdir
ndb/src/old_files/rep/transfer/Makefile:
  mvdir
ndb/src/old_files/rep/transfer/TransPS.cpp:
  mvdir
ndb/src/old_files/rep/transfer/TransPS.hpp:
  mvdir
ndb/src/old_files/rep/transfer/TransSS.cpp:
  mvdir
ndb/src/old_files/rep/transfer/TransSS.hpp:
  mvdir
ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp:
  mvdir
ndb/src/old_files/client/Makefile:
  mvdir
ndb/src/old_files/client/odbc/Extra.mk:
  mvdir
ndb/src/old_files/client/odbc/Makefile:
  mvdir
ndb/src/old_files/client/odbc/NdbOdbc.cpp:
  mvdir
ndb/src/old_files/client/odbc/NdbOdbc.def:
  mvdir
ndb/src/old_files/client/odbc/codegen/CodeGen.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/CodeGen.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_base.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_base.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_insert.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_insert.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_pred.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_pred.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_root.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_root.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_select.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_select.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_table.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Makefile:
  mvdir
ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp:
  mvdir
ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp:
  mvdir
ndb/src/old_files/client/odbc/common/AttrArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/AttrArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/CodeTree.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/CodeTree.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/ConnArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/ConnArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/Ctx.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/Ctx.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataField.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataField.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataRow.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataRow.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataType.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataType.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DescArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DescArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DiagArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DiagArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/Makefile:
  mvdir
ndb/src/old_files/client/odbc/common/OdbcData.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/OdbcData.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/ResultArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/ResultArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/Sqlstate.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/Sqlstate.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/StmtArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/StmtArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/StmtInfo.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/StmtInfo.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/common.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/common.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictSys.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictSys.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictTable.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictTable.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/Makefile:
  mvdir
ndb/src/old_files/client/odbc/docs/class.fig:
  mvdir
ndb/src/old_files/client/odbc/docs/descfield.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/diag.txt:
  mvdir
ndb/src/old_files/client/odbc/docs/getinfo.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/gettypeinfo.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/handleattr.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/main.hpp:
  mvdir
ndb/src/old_files/client/odbc/docs/ndbodbc.html:
  mvdir
ndb/src/old_files/client/odbc/docs/select.fig:
  mvdir
ndb/src/old_files/client/odbc/docs/systables.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/type.txt:
  mvdir
ndb/src/old_files/client/odbc/driver/Func.data:
  mvdir
ndb/src/old_files/client/odbc/driver/Func.pl:
  mvdir
ndb/src/old_files/client/odbc/driver/Makefile:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLCancel.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLColumns.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLError.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLExecute.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFetch.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetData.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLParamData.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLPutData.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLTables.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLTransact.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/driver.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/driver.hpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_insert.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Executor.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Executor.hpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Makefile:
  mvdir
ndb/src/old_files/client/odbc/handles/AttrDbc.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/AttrEnv.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/AttrRoot.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/AttrStmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/DescSpec.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/FuncTab.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleBase.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleBase.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleDbc.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleDbc.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleDesc.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleDesc.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleEnv.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleEnv.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleRoot.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleRoot.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleStmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleStmt.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/InfoTab.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/Makefile:
  mvdir
ndb/src/old_files/client/odbc/handles/PoolNdb.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/PoolNdb.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/handles.hpp:
  mvdir
configure.in:
  added search for doxygen
ndb/docs/Makefile.am:
  automake docs make
ndb/docs/doxygen/postdoxy.pl:
  changed start of perl
ndb/docs/doxygen/predoxy.pl:
  changed start of perl
 2004-06-04 14:08:16 +00:00
unknown
bdbaa6b7ad fixed bug in ndb_waiter 2004-06-04 10:24:43 +02:00
unknown
9be8544042 added operator<< for NdbRecAttr and removed attrtype from Event impl 
ndb/include/ndbapi/NdbRecAttr.hpp:
  operator << for NdbRecAttr
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  removed print methid for ndbRecAttr in Event Impl
ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  removed print methid for ndbRecAttr in Event Impl
ndb/src/ndbapi/NdbRecAttr.cpp:
  added operator<<
 2004-06-04 08:24:42 +00:00
unknown
deb50a10dc Portability fixes (and a typo after last merge) 
innobase/os/os0file.c:
  Fixed typo
sql/sql_class.h:
  Portability fix
 2004-06-04 11:02:35 +03:00
unknown
db70513cb2 charset.c: 
Typo fix.
  Thanks Vladimir Kolpakov who noticed it.


mysys/charset.c:
  Typo fix.
  Thanks Vladimir Kolpakov who noticed it.
 2004-06-04 09:07:46 +05:00
unknown
e9c4cea9de Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/lex.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2004-06-04 05:37:14 +04:00
unknown
948903fc4f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1


sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2004-06-03 23:19:01 +02:00
unknown
934bb37d39 Implementation of WL#1824 "Add replication of character set variables in 4.1", 
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill. 
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput  if query uses
 variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
 properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.


mysql-test/r/rpl_server_id1.result:
  it's normal to not run as I have added a test to compare server ids of master and slave
  at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
  result update (as we now print charset of user var).
mysql-test/r/user_var.result:
  result update
mysql-test/t/rpl_server_id1.test:
  no need to select as slave is not running
mysql-test/t/user_var.test:
  testing if the content of user vars is escaped when mysqlbinlog prints them,
  and if the name is backquoted.
sql/lex.h:
  new keyword ONE_SHOT
sql/log.cc:
  when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
  for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
  print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
  escape the content of the var. Backquote its name.
  Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
  understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
  Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
  as it will make the master or slave make wrong assumptions.
  A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
  no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
  Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
  when I/O slave thread starts, verify that master's and slave charsets match.
  And by the way verify that server ids are different.
  Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
  not fatal.
sql/sql_class.cc:
  one_shot
sql/sql_class.h:
  one_shot
sql/sql_lex.h:
  one_shot
sql/sql_parse.cc:
  when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
  otherwise refuse.
sql/sql_yacc.yy:
  ONE_SHOT keyword in SET
 2004-06-03 23:17:18 +02:00
unknown
65ee1426f4 merge 2004-06-03 20:37:58 +02:00
unknown
d6e6c800f1 Merge 
ndb/Makefile.am:
  SCCS merged
ndb/src/common/portlib/Makefile.am:
  SCCS merged
 2004-06-03 18:28:18 +00:00
unknown
f633f2d4b7 ndb make updates 
ndb/src/common/portlib/NdbCondition.c:
  Rename: ndb/src/common/portlib/unix/NdbCondition.c -> ndb/src/common/portlib/NdbCondition.c
ndb/src/common/portlib/NdbDaemon.c:
  Rename: ndb/src/common/portlib/unix/NdbDaemon.c -> ndb/src/common/portlib/NdbDaemon.c
ndb/src/common/portlib/NdbEnv.c:
  Rename: ndb/src/common/portlib/unix/NdbEnv.c -> ndb/src/common/portlib/NdbEnv.c
ndb/src/common/portlib/NdbHost.c:
  Rename: ndb/src/common/portlib/unix/NdbHost.c -> ndb/src/common/portlib/NdbHost.c
ndb/src/common/portlib/NdbMem.c:
  Rename: ndb/src/common/portlib/unix/NdbMem.c -> ndb/src/common/portlib/NdbMem.c
ndb/src/common/portlib/NdbMutex.c:
  Rename: ndb/src/common/portlib/unix/NdbMutex.c -> ndb/src/common/portlib/NdbMutex.c
ndb/src/common/portlib/NdbSleep.c:
  Rename: ndb/src/common/portlib/unix/NdbSleep.c -> ndb/src/common/portlib/NdbSleep.c
ndb/src/common/portlib/NdbTCP.c:
  Rename: ndb/src/common/portlib/unix/NdbTCP.c -> ndb/src/common/portlib/NdbTCP.c
ndb/src/common/portlib/NdbThread.c:
  Rename: ndb/src/common/portlib/unix/NdbThread.c -> ndb/src/common/portlib/NdbThread.c
ndb/src/common/portlib/NdbTick.c:
  Rename: ndb/src/common/portlib/unix/NdbTick.c -> ndb/src/common/portlib/NdbTick.c
BitKeeper/deleted/.del-Makefile.am~4d9c81a4353f3ee8:
  Delete: ndb/src/common/portlib/unix/Makefile.am
ndb/src/common/portlib/old_dirs/unix/Makefile_old:
  mvdir
ndb/src/common/portlib/old_dirs/win32/Makefile:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbCondition.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbEnv.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbHost.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbMem.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbMutex.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbSleep.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbTCP.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbThread.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbTick.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/Makefile:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbCondition.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbEnv.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbHost.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbMem.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbMutex.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbSleep.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbTCP.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbThread.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbTick.c:
  mvdir
ndb/src/common/portlib/memtest.c:
  Rename: ndb/src/common/portlib/memtest/memtest.c -> ndb/src/common/portlib/memtest.c
ndb/src/common/portlib/munmaptest.cpp:
  Rename: ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp -> ndb/src/common/portlib/munmaptest.cpp
ndb/src/common/portlib/mmslist.cpp:
  Rename: ndb/src/common/portlib/mmstest/mmslist.cpp -> ndb/src/common/portlib/mmslist.cpp
ndb/src/common/portlib/mmstest.cpp:
  Rename: ndb/src/common/portlib/mmstest/mmstest.cpp -> ndb/src/common/portlib/mmstest.cpp
ndb/src/common/portlib/old_dirs/memtest/Makefile:
  mvdir
ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile:
  mvdir
ndb/src/common/portlib/NdbPortLibTest.cpp:
  Rename: ndb/src/common/portlib/test/NdbPortLibTest.cpp -> ndb/src/common/portlib/NdbPortLibTest.cpp
ndb/src/common/portlib/old_dirs/test/Makefile:
  mvdir
 2004-06-03 18:25:46 +00:00
unknown
f0beff16f3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
 2004-06-03 20:54:46 +04:00
unknown
e6b4b30481 Fix skipp -> skip once and for all. 
(Note: This affects only comments, not variable names.)


extra/perror.c:
  Fix skipp -> skip once and for all.
heap/hp_hash.c:
  Fix skipp -> skip once and for all.
isam/_dynrec.c:
  Fix skipp -> skip once and for all.
isam/isamchk.c:
  Fix skipp -> skip once and for all.
isam/isamlog.c:
  Fix skipp -> skip once and for all.
isam/pack_isam.c:
  Fix skipp -> skip once and for all.
isam/test1.c:
  Fix skipp -> skip once and for all.
merge/mrg_open.c:
  Fix skipp -> skip once and for all.
myisam/mi_check.c:
  Fix skipp -> skip once and for all.
myisam/mi_delete.c:
  Fix skipp -> skip once and for all.
myisam/mi_key.c:
  Fix skipp -> skip once and for all.
myisam/mi_search.c:
  Fix skipp -> skip once and for all.
myisam/myisamlog.c:
  Fix skipp -> skip once and for all.
mysys/ChangeLog:
  Fix skipp -> skip once and for all.
mysys/default.c:
  Fix skipp -> skip once and for all.
mysys/mf_iocache.c:
  Fix skipp -> skip once and for all.
mysys/mf_iocache2.c:
  Fix skipp -> skip once and for all.
mysys/mf_pack.c:
  Fix skipp -> skip once and for all.
mysys/mf_soundex.c:
  Fix skipp -> skip once and for all.
mysys/mf_wfile.c:
  Fix skipp -> skip once and for all.
mysys/my_error.c:
  Fix skipp -> skip once and for all.
mysys/my_getwd.c:
  Fix skipp -> skip once and for all.
scripts/mysql_find_rows.sh:
  Fix skipp -> skip once and for all.
sql/sql_yacc.yy:
  Fix skipp -> skip once and for all.
sql/time.cc:
  Fix skipp -> skip once and for all.
strings/ctype-big5.c:
  Fix skipp -> skip once and for all.
strings/ctype-gbk.c:
  Fix skipp -> skip once and for all.
strings/ctype-tis620.c:
  Fix skipp -> skip once and for all.
 2004-06-03 11:52:54 -05:00
unknown
e39719ad54 top_srcdir -> top_builddir 2004-06-03 17:54:18 +02:00
unknown
0f7a9f6102 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mm
 2004-06-03 16:31:47 +02:00
unknown
bf54e9f44b fil0fil.c: 
Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()


innobase/fil/fil0fil.c:
  Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()
 2004-06-03 17:31:46 +03:00
unknown
bdabdb766e os0file.c, fil0fil.c: 
Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup


innobase/fil/fil0fil.c:
  Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
innobase/os/os0file.c:
  Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
 2004-06-03 17:02:37 +03:00
unknown
54d8f52ca2 fixes for ndb and make distdir 2004-06-03 16:02:07 +02:00
unknown
3b2201c837 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-03 14:45:54 +02:00
unknown
5a2b1ba6d0 Unicode collations: WL#916 
XML and "collation customization" language parsers.
 2004-06-03 17:45:53 +05:00
unknown
8dd79895e5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-03 13:22:55 +02:00
unknown
7159900e9a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-06-03 13:22:54 +02:00
unknown
e99795cc98 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


configure.in:
  Auto merged
 2004-06-03 13:15:55 +02:00
unknown
13047f4521 Makefile.am: 
local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
configure.in:
  cleaned up ndb CXX flags and added optional flag possibility


configure.in:
  cleaned up ndb CXX flags and added optional flag possibility
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
ndb/src/kernel/error/ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/error/ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
ndb/src/kernel/vm/Emulator.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/Emulator.hpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/pc.hpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/ndbapi/Makefile.am:
  local flag in ndbapi to set -O2 since problems occur with -O3
 2004-06-03 13:15:54 +02:00
unknown
b558c415d7 More warnings in atrt 
ndb/test/run-test/main.cpp:
  More warnings
 2004-06-03 13:14:03 +02:00
unknown
34e5cca1b7 Setup connect string 2004-06-03 10:17:52 +02:00
unknown
80b27997e1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-06-03 08:13:10 +02:00
unknown
db858c08b7 Fix for 840, invalid tuple size. 
Still don't know reason, but this works
 2004-06-03 08:09:04 +02:00
unknown
d88fbdc3c6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mc01.ndb.mysql.com:/space/mysql-4.1-ndb
 2004-06-03 08:04:40 +02:00
unknown
e34db29d2d extern"C" bug 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-06-03 08:03:37 +02:00
unknown
6868112c76 Fix for 3910 2004-06-03 03:56:12 +02:00
unknown
2a32bb2be3 portability fix 2004-06-03 02:13:19 +03:00
unknown
b94356aecc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-03 01:58:33 +03:00
unknown
f112903ca7 Added authentication code that was missed in merge 
Added new windows configuration


VC++Files/client/mysqlclient.dsp:
  Added new configuration
VC++Files/zlib/zlib.dsp:
  Added new configuration
libmysql/libmysql.c:
  Moved check function from libmysql.c to client.c
sql-common/client.c:
  Moved check function from libmysql.c to client.c
 2004-06-03 01:55:47 +03:00
unknown
284144f408 fil0fil.c: 
Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'


innobase/fil/fil0fil.c:
  Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'
 2004-06-02 18:19:28 +03:00