diff options
| author | unknown <lars@mysql.com> | 2006-03-09 16:12:58 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-03-09 16:12:58 +0100 |
| commit | 4c4aea2dd660df64874c955e210a11fa2a9bfe96 (patch) | |
| tree | 15a97dd54f69333f8917e03ac3e99753f855ce85 /sql/sql_prepare.cc | |
| parent | 1cef1679a47bfbf744d656646770193ba07c30fe (diff) | |
| parent | 556155c2b41a3408f1d042f102be0ad75206470b (diff) | |
| download | mariadb-git-4c4aea2dd660df64874c955e210a11fa2a9bfe96.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
Fix of merge conflict
Diffstat (limited to 'sql/sql_prepare.cc')
0 files changed, 0 insertions, 0 deletions