diff options
author | unknown <dlenev@mockturtle.local> | 2007-05-11 21:55:55 +0400 |
---|---|---|
committer | unknown <dlenev@mockturtle.local> | 2007-05-11 21:55:55 +0400 |
commit | 5c5623775cf1006c5d9974073e63347a1732578c (patch) | |
tree | 7e0dd933e024c82884a722e2fa0094fba2418dfe /sql/sp_head.cc | |
parent | a0567199b118f14ec346249d91aabe2ee5d99354 (diff) | |
parent | c5a82455966e729219d164941f1461bb01a26290 (diff) | |
download | mariadb-git-5c5623775cf1006c5d9974073e63347a1732578c.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into mockturtle.local:/home/dlenev/src/mysql-5.0-cts-3
sql/mysql_priv.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
0 files changed, 0 insertions, 0 deletions