unknown 7620e066db Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 ...

into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943


sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
sql/mysql_priv.h:
  Manual merge
sql/sql_parse.cc:
  Manual merge

2007-01-29 14:33:53 +01:00

..

client.c

Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943

2007-01-29 14:33:53 +01:00

Makefile.am

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

my_time.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

my_user.c

Many files:

2006-12-23 20:17:15 +01:00

pack.c

Many files:

2006-12-23 20:17:15 +01:00