diff options
| author | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-14 09:12:07 -0400 |
|---|---|---|
| committer | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-14 09:12:07 -0400 |
| commit | e6170de4c01edaf6a39bd94d84be935f228332dc (patch) | |
| tree | 827438a688b1352593deb848a80ecd9f5c6f17b5 /sql/sql_manager.cc | |
| parent | 2ecd916de6f0daebb22f79cd6f0ad09f581c2aec (diff) | |
| parent | 6e9bdcc9e91db27ca37535f7d4989d08727d1902 (diff) | |
| download | mariadb-git-e6170de4c01edaf6a39bd94d84be935f228332dc.tar.gz | |
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_partition.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/partition.result:
manual merge
mysql-test/r/partition_error.result:
manual merge
mysql-test/r/partition_range.result:
manual merge
mysql-test/t/partition.test:
manual merge
mysql-test/t/partition_error.test:
manual merge
mysql-test/t/partition_range.test:
manual merge
sql/ha_partition.cc:
manual merge
sql/partition_element.h:
manual merge
sql/partition_info.cc:
manual merge
sql/partition_info.h:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sql_partition.cc:
manual merge
sql/sql_table.cc:
manual merge
sql/table.cc:
manual merge
Diffstat (limited to 'sql/sql_manager.cc')
0 files changed, 0 insertions, 0 deletions