database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Manual merge from mysql-5.0.

Browse Source
This commit is contained in:
Alexander Nozdrin
2011-07-22 11:46:45 +04:00
parent 41258f8e6c f7618904bf
commit c4dad60a73
10 changed files with 39 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysql_upgrade.c
View File

@@ -1,5 +1,5 @@
/*
Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,6 +19,8 @@
#include <sslopt-vars.h>
#include "../scripts/mysql_fix_privilege_tables_sql.c"
#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
#define VER "1.1"
#ifdef HAVE_SYS_WAIT_H
@@ -228,6 +230,7 @@ get_one_option(int optid, const struct my_option *opt,
switch (optid) {
case '?':
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
printf("%s Ver %s Distrib %s, for %s (%s)\n",
my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
puts("MySQL utility for upgrading databases to new MySQL versions.\n");