summaryrefslogtreecommitdiff
path: root/libmysql/Makefile.shared
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-05-24 20:43:12 +0200
committerunknown <msvensson@pilot.blaudden>2007-05-24 20:43:12 +0200
commit71eb1afef15c103ff096104eef22049b8b4b0957 (patch)
treec8363ff07bf3105b416bf81980b0f9609df81738 /libmysql/Makefile.shared
parenta27fd67b512bace048a8c9b0cce7faf5cbbd1373 (diff)
parent945f3c2cc827ca6acc06a1034538f4ec1388ac5b (diff)
downloadmariadb-git-71eb1afef15c103ff096104eef22049b8b4b0957.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664
into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664 include/mysql_com.h: Auto merged include/violite.h: Auto merged libmysql/libmysql.c: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged sql-common/client.c: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_repl.cc: Auto merged vio/viosocket.c: Auto merged sql/sql_parse.cc: Merge 5.0->5.1
Diffstat (limited to 'libmysql/Makefile.shared')
0 files changed, 0 insertions, 0 deletions