diff options
| author | unknown <dlenev@mysql.com> | 2006-07-06 14:31:32 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2006-07-06 14:31:32 +0400 |
| commit | 685ccf85d40b39e690e99ef735ce202c876468c3 (patch) | |
| tree | 33de88b2939e43425e24ce52c714ac5a1541824b /libmysqld | |
| parent | b8c8508d2a39dfdf4d416f30fb5e5ab59bead346 (diff) | |
| parent | ae9724cce160c8d8351df3e2a232cc848b5c6fb8 (diff) | |
| download | mariadb-git-685ccf85d40b39e690e99ef735ce202c876468c3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into mysql.com:/home/dlenev/mysql-5.0-bg18437-3
mysql-test/t/federated.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/federated.result:
Manual merge.
Diffstat (limited to 'libmysqld')
0 files changed, 0 insertions, 0 deletions