mariadb

mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Files

unknown 600336ef45 Merge mysql.com:/home/my/mysql-5.0

into  mysql.com:/home/my/mysql-5.1


client/mysql.cc:
  Auto merged
cmd-line-utils/readline/bind.c:
  Auto merged
cmd-line-utils/readline/histfile.c:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/my_global.h:
  Auto merged
include/my_tree.h:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_cache.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/hp_clear.c:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
client/mysqldump.c:
  Manual merge
client/mysqltest.c:
  Manual merge
extra/replace.c:
  Manual merge
libmysql/libmysql.c:
  Manual merge
mysys/base64.c:
  Manual merge
sql/ha_ndbcluster.cc:
  Manual merge
sql/handler.cc:
  Manual merge
sql/item_strfunc.cc:
  Manual merge
sql/item_timefunc.cc:
  Manual merge
sql/log.cc:
  Manual merge
sql/opt_range.cc:
  Manual merge
sql/password.c:
  Manual merge
sql/sp.cc:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_cache.cc:
  Manual merge
sql/sql_db.cc:
  Manual merge
sql/sql_rename.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge
sql/sql_show.cc:
  Manual merge
sql/sql_trigger.cc:
  Manual merge
sql/sql_update.cc:
  Manual merge
sql/tztime.cc:
  Manual merge
storage/archive/ha_archive.cc:
  Manual merge
storage/federated/ha_federated.cc:
  Manual merge
storage/myisam/mi_create.c:
  Manual merge
storage/myisam/myisampack.c:
  Manual merge
storage/myisammrg/myrg_rkey.c:
  Manual merge
storage/ndb/src/mgmapi/mgmapi.cpp:
  Manual merge
storage/ndb/src/ndbapi/Ndb.cpp:
  Manual merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Manual merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Manual merge
storage/ndb/src/ndbapi/Ndblist.cpp:
  Manual merge

2006-11-30 22:38:12 +02:00

buffer.cc

Some minor fixes revealed as warnings by

2005-09-23 21:28:56 +03:00

buffer.h

Some minor fixes revealed as warnings by

2005-09-23 21:28:56 +03:00

CMakeLists.txt

Additional files for cmake support

2006-08-31 19:52:42 +02:00

command.cc

Some minor fixes revealed as warnings by

2005-09-23 21:28:56 +03:00

command.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

commands.cc

Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)

2006-11-01 19:41:09 +02:00

commands.h

Fix compilation problems on Windows and SUN Solaris.

2006-05-19 04:51:23 +04:00

exit_codes.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

guardian.cc

Fixed compiler warnings

2006-11-30 21:56:03 +02:00

guardian.h

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime

2006-10-23 12:35:56 +04:00

IMService.cpp

Fix compilation problems on Windows and SUN Solaris.

2006-05-19 04:51:23 +04:00

IMService.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

instance_map.cc

Fix for BUG#17486: IM: race condition on exit.

2006-10-24 18:23:16 +04:00

instance_map.h

Fix for BUG#17486: IM: race condition on exit.

2006-10-24 18:23:16 +04:00

instance_options.cc

Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)

2006-11-01 19:41:09 +02:00

instance_options.h

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

2006-05-22 14:22:58 +04:00

instance.cc

Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)

2006-11-01 19:41:09 +02:00

instance.h

Fix for BUG#17486: IM: race condition on exit.

2006-10-24 18:23:16 +04:00

listener.cc

Fix for BUG#17486: IM: race condition on exit.

2006-10-24 18:23:16 +04:00

listener.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

log.cc

IM polishing: log more information in log.

2006-10-24 18:31:10 +04:00

log.h

Various fixes (cleanups, valgrind, makefiles, ...)

2005-02-03 20:48:58 +03:00

Makefile.am

make dist changes for Cmake build

2006-09-01 10:32:12 +02:00

manager.cc

Fix for BUG#17486: IM: race condition on exit.

2006-10-24 18:23:16 +04:00

manager.h

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

2006-05-22 14:22:58 +04:00

messages.cc

Fix Bug #22494 Instance Manager: Inconsistent error message wording

2006-11-07 05:21:33 +03:00

messages.h

Fix for AIX compilation failure: sacred knowledge of my_global.h nature (it should be

2005-03-22 02:04:14 +03:00

mysql_connection.cc

Fixed a LOT of compiler warnings

2006-11-27 01:47:38 +02:00

mysql_connection.h

fix compilation failure on serg's box: we shouldn't

2005-10-19 00:31:00 +04:00

mysql_manager_error.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

mysqlmanager.cc

Merged.

2006-05-22 15:20:40 +04:00

mysqlmanager.vcproj

mysqlmanager.vcproj:

2006-07-22 02:00:33 +02:00

options.cc

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime

2006-10-23 12:35:56 +04:00

options.h

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime

2006-10-23 12:35:56 +04:00

parse_output.cc

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

parse_output.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

parse.cc

Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)

2006-11-01 19:41:09 +02:00

parse.h

Fixes for Windows compilation failures.

2006-07-07 16:14:07 +04:00

portability.h

Merge mysql.com:/home/my/mysql-5.0

2006-11-30 22:38:12 +02:00

priv.cc

Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().

2006-06-19 15:17:15 +04:00

priv.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

protocol.cc

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

protocol.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

README

First implementation of instance-manager carcass:

2003-08-16 21:44:24 +04:00

thread_registry.cc

Fix for BUG#17486: IM: race condition on exit.

2006-10-24 18:23:16 +04:00

thread_registry.h

Fix for BUG#17486: IM: race condition on exit.

2006-10-24 18:23:16 +04:00

user_management_commands.cc

WL#3298: IM: make command-line option names consistent

2006-06-19 14:41:29 +04:00

user_management_commands.h

WL#3298: IM: make command-line option names consistent

2006-06-19 14:41:29 +04:00

user_map.cc

Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)

2006-11-01 19:41:09 +02:00

user_map.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

WindowsService.cpp

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

WindowsService.h

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

README

Instance Manager - manage MySQL instances locally and remotely.

File description:
 mysqlmanager.cc - entry point to the manager, main, 
 options.{h,cc} - handle startup options
 manager.{h,cc} - manager process
 mysql_connection.{h,cc} - handle one connection with mysql client.

See also instance manager architecture description in mysqlmanager.cc.