summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorBernd Ocklin <bernhard.ocklin@sun.com>2010-01-20 12:54:55 +0100
committerBernd Ocklin <bernhard.ocklin@sun.com>2010-01-20 12:54:55 +0100
commit75e9a54a534430e0f7337dbd79145baee4f793b6 (patch)
treede0d02db6861e58baa34831e06e20f1286fdb186 /client
parent9ada265d39f290f9388e64e3ac723e3ee2fd9997 (diff)
downloadmariadb-git-75e9a54a534430e0f7337dbd79145baee4f793b6.tar.gz
exporting server version and other as env var (bug#50471)
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 45f94982472..258a3171460 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -7664,7 +7664,14 @@ int main(int argc, char **argv)
1024, 0, 0, get_var_key, var_free, MYF(0)))
die("Variable hash initialization failed");
- var_set_string("$MYSQL_SERVER_VERSION", MYSQL_SERVER_VERSION);
+ var_set_string("MYSQL_SERVER_VERSION", MYSQL_SERVER_VERSION);
+ var_set_string("MYSQL_SYSTEM_TYPE", SYSTEM_TYPE);
+ var_set_string("MYSQL_MACHINE_TYPE", MACHINE_TYPE);
+ if (sizeof(void *) == 8) {
+ var_set_string("MYSQL_SYSTEM_ARCHITECTURE", "64");
+ } else {
+ var_set_string("MYSQL_SYSTEM_ARCHITECTURE", "32");
+ }
memset(&master_pos, 0, sizeof(master_pos));