summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorholyfoot@mysql.com <>2006-05-02 09:01:13 +0500
committerholyfoot@mysql.com <>2006-05-02 09:01:13 +0500
commitaaf2c26e015b911da2e394dd3aa1b792d2ae855e (patch)
treefbb760cf68923763d60c44e7381a9515c3c2a483 /client
parent1205ae82769be49e7c20aecf9277673eeca0a145 (diff)
parentaab0e9c24e37eae19a86b554b19285db27b43b90 (diff)
downloadmariadb-git-aaf2c26e015b911da2e394dd3aa1b792d2ae855e.tar.gz
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.clean
Diffstat (limited to 'client')
-rw-r--r--client/mysql_upgrade.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 551be79fc99..3288b627554 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -307,7 +307,7 @@ int main(int argc, char **argv)
b_read= my_read(check_file, chf_buffer, sizeof(chf_buffer)-1, MYF(0));
chf_buffer[b_read]= 0;
my_close(check_file, MYF(0));
- if (!strcmp(chf_buffer, VERSION))
+ if (!strcmp(chf_buffer, MYSQL_SERVER_VERSION))
{
if (opt_verbose)
puts("mysql_upgrade already done for this version");