mariadb/VC++Files/mysqldemb
unknown d6d5983074 Merge trift2.:/M41/clone-4.1
into  trift2.:/M50/merge-4.1-to-5.0


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/libmysqld/libmysqld_ia64.dsp:
  Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
VC++Files/sql/mysqld_ia64.dsp:
  Auto merged
VC++Files/sql/mysqldmax.dsp:
  Auto merged
sql/field.cc:
  Merge a backport == Null-merge == "ul".
sql/field.h:
  Merge a backport == Null-merge == "ul".
sql/sql_locale.cc:
  Changes were already present (and even better) == Null-merge == "ul".
2006-07-24 16:30:31 +02:00
..
mysqldemb.dsp Merge trift2.:/M41/clone-4.1 2006-07-24 16:30:31 +02:00
mysqldemb.vcproj Changes to make "sql/sql_locale.cc" compile + link on Windows: 2006-07-17 20:40:41 +02:00
mysqldemb_ia64.dsp Changes to make "sql/sql_locale.cc" compile + link on Windows: 2006-07-17 20:40:41 +02:00