Commits · b0f5651a371e9233a8fd9e7cb89f90a359fead7c · nexedi / MariaDB

08 Jun, 2004 2 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b0f5651a
  unknown authored Jun 08, 2004
```
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
```
  b0f5651a
- Sorry, forgot to commit together with the code change yesterday. · 6b539bd3
  unknown authored Jun 08, 2004
  
  6b539bd3
07 Jun, 2004 19 commits

SQL Syntax for Prepared Statements: post-merge fixes · b5e579f8
unknown authored Jun 08, 2004

b5e579f8

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 26586ce5

unknown authored Jun 07, 2004

into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

26586ce5

Merge mysql.com:/home/jonas/src/mysql-4.1 · 8830bf08
unknown authored Jun 07, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb
```
8830bf08
BUG#4034 · 19a5df38
unknown authored Jun 07, 2004

19a5df38
Merge mysql.com:/home/jonas/src/mysql-4.1 · f258478f
unknown authored Jun 07, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb
```
f258478f
BUG#4037 fix printout of limits · d6cb3d2a
unknown authored Jun 07, 2004

d6cb3d2a
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · dd1ef041
unknown authored Jun 07, 2004
```
into mysql.com:/home/mysql_src/mysql-4.1-874
```
dd1ef041
updating test's result now that SHOW BINLOG EVENTS quotes and escapes user variables. · 62092e38
unknown authored Jun 07, 2004
```
mysql-test/r/rpl_user_variables.result:
  adding quotes to the variable names, and escaping, in the result
```
62092e38
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · cc8a7115
unknown authored Jun 07, 2004
```
into mc05.(none):/space2/tomas/mysql-4.1


acconfig.h:
  Auto merged
configure.in:
  Auto merged
```
cc8a7115
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · b3d81a28
unknown authored Jun 07, 2004
```
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
```
b3d81a28

Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character · fffef41d

unknown authored Jun 07, 2004


mysql-test/r/ctype_ucs.result:
  Test for bug#3946: Error in LPAD() when padstring is longer than 1 character
mysql-test/t/ctype_ucs.test:
  Test for bug#3946: Error in LPAD() when padstring is longer than 1 character

fffef41d

mysqld.cc: · 77783616

unknown authored Jun 07, 2004

  WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation


sql/mysqld.cc:
  WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation

77783616

mysqldump.c: · 18430e22

unknown authored Jun 07, 2004

Dump could fail to load because of --default-character-set command line option.
More safe dump is now produces, --default-character-set doesn't matter.

client/mysqldump.c:
Dump could fail to load because of --default-character-set command line option.
More safe dump is now produces, --default-character-set doesn't matter.

18430e22

client.c: · bc90d849

unknown authored Jun 07, 2004

Bug #3990 `--with-charset' ./configure's switch doesn'taffect mysql client library.

sql-common/client.c:
Bug #3990 `--with-charset' ./configure's switch doesn'taffect mysql client library.

bc90d849

Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · a81c1978
unknown authored Jun 07, 2004
```
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
```
a81c1978

Last patch before push into main tree. Updated from code review and final once over. · 4e0b969b

unknown authored Jun 07, 2004

A couple of small changes to ha_example (mainly comments). 


sql/examples/ha_archive.cc:
  Changes from Serg.
  A few styles changes, fix for potential hash insert gone wrong, removed bad tables if create fails, gzflush used for flushing by default (had problems with OSX 10.2), and some spelling corrections.
sql/examples/ha_archive.h:
  Removed fast_key_read() and changed the name of a conflicting variable.
sql/examples/ha_example.cc:
  Added a few new comments.
sql/examples/ha_example.h:
  Added pragma interface. Removed fast_key_read() and Serg's request

4e0b969b

Merged · 1a5cca78

unknown authored Jun 07, 2004


sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysys/my_error.c:
  Hand merged

1a5cca78

Post review fixes for "SQL Syntax for Prepared Statements". · 2f9a9e55

unknown authored Jun 07, 2004


mysql-test/r/ps.result:
  Better error message
mysys/my_error.c:
  Comments added
sql/item.cc:
  Moved a chunk of code from sql_prepare.cc to Item_param::set_from_user_var
sql/item.h:
  Moved a chunk of code from sql_prepare.cc to Item_param::set_from_user_var
sql/item_func.cc:
  Code cleanup
sql/mysql_priv.h:
  Code cleanup
sql/sql_class.cc:
  Code cleanup
sql/sql_parse.cc:
  use user_var_entry::val_str in PREPARE stmt FROM @var.
sql/sql_prepare.cc:
  Post-review fixes and code cleanup.
sql/sql_yacc.yy:
  Coding style fixes

2f9a9e55

Bug #3928 regexp [[:>:]] and UTF-8 · 907eb131
unknown authored Jun 07, 2004

907eb131

06 Jun, 2004 1 commit
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3e37e0a3
  unknown authored Jun 05, 2004
```
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
```
  3e37e0a3
05 Jun, 2004 3 commits

mysql_stmt_field_count() · 0839550f

unknown authored Jun 06, 2004


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()

0839550f

More comments in prepared statements code. · af175193

unknown authored Jun 06, 2004


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

af175193

Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · 36631ba1

unknown authored Jun 05, 2004

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

36631ba1

04 Jun, 2004 12 commits

Few more cleanups in client_test: · 1c1e85e2

unknown authored Jun 05, 2004

No need for mysql_commit, especially after DDL statements.


tests/client_test.c:
  No need for mysql_commit, especially after DDL statements.

1c1e85e2

The comment is not true any more. · 8334fbc4
unknown authored Jun 05, 2004
```
Is there a way to sefely use MYSQL_BIND structure without bzero?
```
8334fbc4
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1d9efb18
unknown authored Jun 04, 2004
```
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
```
1d9efb18

HAVE_DEPRECATED_411_API macro removed. · c60ee5e6

unknown authored Jun 04, 2004


include/mysql.h:
  Removed obsolete define.
tests/client_test.c:
  Rewritten to use new API.
  Few cleanups.
  A lot of valgrind warnings/errors removed.

c60ee5e6

moved ndb versioning to configure and fixed ndb docs make · ad6f3ccb
unknown authored Jun 04, 2004

ad6f3ccb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · f777b851
unknown authored Jun 04, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
```
f777b851

automake ndb docs make · 620e83e3

unknown authored Jun 04, 2004


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

620e83e3

fixed bug in ndb_waiter · d9c1923d
unknown authored Jun 04, 2004

d9c1923d

added operator<< for NdbRecAttr and removed attrtype from Event impl · 39b697e1

unknown authored Jun 04, 2004


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<<

39b697e1

Portability fixes (and a typo after last merge) · 7679cf46
unknown authored Jun 04, 2004
```
innobase/os/os0file.c:
  Fixed typo
sql/sql_class.h:
  Portability fix
```
7679cf46

charset.c: · a239a32d

unknown authored Jun 04, 2004

  Typo fix.
  Thanks Vladimir Kolpakov who noticed it.


mysys/charset.c:
  Typo fix.
  Thanks Vladimir Kolpakov who noticed it.

a239a32d

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6fa41b0a

unknown authored Jun 04, 2004

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

6fa41b0a

03 Jun, 2004 3 commits

Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 8aabe7f8

unknown authored Jun 03, 2004

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

8aabe7f8

Implementation of WL#1824 "Add replication of character set variables in 4.1", · e784947a

unknown authored Jun 03, 2004

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

e784947a

merge · d962bcb5
unknown authored Jun 03, 2004

d962bcb5