diff options
| author | unknown <mskold/marty@linux.site> | 2007-04-04 13:21:49 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-04-04 13:21:49 +0200 |
| commit | 655a58d85c5b83824ceec5a7041bbb3b84b5731a (patch) | |
| tree | 625030adbf3bf1a60ae1260b13c5cfa9ce655ef6 /sql/sql_client.cc | |
| parent | 5abe2fdba4823370b50495ca1f926a514124785c (diff) | |
| parent | 2efc0f51cf3e80cd49c1ea0dee9a440936ee6287 (diff) | |
| download | mariadb-git-655a58d85c5b83824ceec5a7041bbb3b84b5731a.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
sql/ha_ndbcluster.h:
Auto merged
sql/sql_trigger.h:
Auto merged
mysql-test/r/ndb_trigger.result:
Using local, will re-generate.
include/my_base.h:
Merge
mysql-test/t/ndb_trigger.test:
Merge
sql/ha_ndbcluster.cc:
Merge
sql/mysql_priv.h:
Merge
sql/sql_delete.cc:
Merge
sql/sql_insert.cc:
Merge
sql/sql_load.cc:
Merge
sql/sql_update.cc:
Merge
Diffstat (limited to 'sql/sql_client.cc')
0 files changed, 0 insertions, 0 deletions