summaryrefslogtreecommitdiff
path: root/mysql-test/r/connect.result
diff options
context:
space:
mode:
authorunknown <pgalbraith@bk-internal.mysql.com>2006-12-09 02:34:42 +0100
committerunknown <pgalbraith@bk-internal.mysql.com>2006-12-09 02:34:42 +0100
commit9e82f299e526ceafd0deb105f0487681406b1be8 (patch)
treea683748b700b98b6f378009228727821e369623b /mysql-test/r/connect.result
parentb0a5cd8ed133b8bce2ab470826dd8d91ec27fa9d (diff)
parente54bbaa3fb8793905d37af808b9bee6a49df358a (diff)
downloadmariadb-git-9e82f299e526ceafd0deb105f0487681406b1be8.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch client/mysql.cc: Auto merged sql/field_conv.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sp.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'mysql-test/r/connect.result')
0 files changed, 0 insertions, 0 deletions