diff options
| author | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-06-02 17:56:39 +0300 |
|---|---|---|
| committer | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-06-02 17:56:39 +0300 |
| commit | 1b8c7c3348fd1cc41d3bb15a455d2252b6fbfb00 (patch) | |
| tree | 640d5e7d3c48fece614f95259ddf09c51ecc2bc2 /sql/sql_parse.cc | |
| parent | afd492225462156cbad719e582b6febf630556c1 (diff) | |
| parent | 1bef08f9280a37ac47dddc99ce85a9c69795b99c (diff) | |
| download | mariadb-git-1b8c7c3348fd1cc41d3bb15a455d2252b6fbfb00.tar.gz | |
Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
mysql-test/t/innodb.test:
Auto merged
mysql-test/r/innodb.result:
manual merge use local 5.1
mysql-test/r/multi_update.result:
manual merge
mysql-test/t/multi_update.test:
manual merge
sql/sql_update.cc:
manual merge
Diffstat (limited to 'sql/sql_parse.cc')
0 files changed, 0 insertions, 0 deletions