mariadb/client
unknown 5bd9bf5572 Merge maint2.mysql.com:/data/localhome/tsmith/bk/41
into  maint2.mysql.com:/data/localhome/tsmith/bk/50


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
vio/viosocket.c:
  Auto merged
client/mysql.cc:
  Manual merge.
mysql-test/t/ctype_recoding.test:
  Manual merge.
sql/sql_lex.h:
  SCCS merged
sql/sql_table.cc:
  Manual merge.
mysql-test/r/ctype_recoding.result:
  Manual merge
2006-09-01 08:53:56 +02:00
..
.cvsignore
client_priv.h
completion_hash.cc
completion_hash.h
get_password.c
Makefile.am
my_readline.h
mysql.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 2006-09-01 08:53:56 +02:00
mysql_upgrade.c
mysqladmin.cc
mysqlbinlog.cc
mysqlcheck.c
mysqldump.c
mysqlimport.c
mysqlmanager-pwgen.c
mysqlmanagerc.c
mysqlshow.c
mysqltest.c
readline.cc
sql_string.cc
sql_string.h