diff options
| author | unknown <kostja@vajra.(none)> | 2007-05-16 10:21:39 +0400 |
|---|---|---|
| committer | unknown <kostja@vajra.(none)> | 2007-05-16 10:21:39 +0400 |
| commit | 5af1df9c76b62b838116235b4d0bfb6f638cf702 (patch) | |
| tree | 2295de4497bb7d779e22313f151b6bcdd25ce092 /plugin | |
| parent | d71f4248aa284eb73c882dff033b1eca4ac158ad (diff) | |
| parent | 7e628372e9b21e0355b9b8145e12a0ca31e98260 (diff) | |
| download | mariadb-git-5af1df9c76b62b838116235b4d0bfb6f638cf702.tar.gz | |
Merge vajra.(none):/opt/local/work/mysql-5.0-21483
into vajra.(none):/opt/local/work/mysql-5.1-21483
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
mysql-test/r/insert.result:
Manual merge.
mysql-test/t/insert.test:
Manual merge.
sql/sql_insert.cc:
Manual merge.
Diffstat (limited to 'plugin')
0 files changed, 0 insertions, 0 deletions