diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-11-09 14:55:32 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-11-09 14:55:32 -0500 |
| commit | f0e24c795fbceb3d7ad060934e1e399ec939a3f8 (patch) | |
| tree | 80d51cbfd49ff9e193edbb78843eb3e2ebbae2c9 /server-tools/instance-manager/mysqlmanager.cc | |
| parent | 69aee07373c19b5e5615c9a99574c000d0b3c95c (diff) | |
| parent | 10397af9c519b8238599a1ff9fed0d3e871c50e7 (diff) | |
| download | mariadb-git-f0e24c795fbceb3d7ad060934e1e399ec939a3f8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-community
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.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_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/sql_parse.cc:
Manual merge.
sql/sql_select.cc:
Manual merge.
Diffstat (limited to 'server-tools/instance-manager/mysqlmanager.cc')
| -rw-r--r-- | server-tools/instance-manager/mysqlmanager.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server-tools/instance-manager/mysqlmanager.cc b/server-tools/instance-manager/mysqlmanager.cc index 6d6ebbee57d..276d1ca3b49 100644 --- a/server-tools/instance-manager/mysqlmanager.cc +++ b/server-tools/instance-manager/mysqlmanager.cc @@ -79,6 +79,9 @@ int main(int argc, char *argv[]) { int return_value; + puts("\n" + "WARNING: This program is deprecated and will be removed in 6.0.\n"); + /* Initialize. */ MY_INIT(argv[0]); |