unknown 926664fe2c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 ...

into  mysql.com:/home/my/mysql-5.1


client/client_priv.h:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlslap.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_cache.cc:
  Manual merge
  Removed comment about bug in old code (not relevant)

2007-08-02 07:55:33 +03:00

..

client.c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2007-08-02 07:55:33 +03:00

Makefile.am

my_strtoll10-x86.s:

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

my_time.c

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

2007-05-18 06:50:22 +02:00

my_user.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

pack.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00