diff options
| author | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 21:41:02 -0400 |
|---|---|---|
| committer | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 21:41:02 -0400 |
| commit | ec0e1a1b2bb6b797da01c082b8a36b97b8d6ed20 (patch) | |
| tree | a35b38db0cb01e4d7a973ad2dc76a71aae12afc0 /sql/sql_partition.cc | |
| parent | b19c1896adea1166adb8e80552ac3abfa7642205 (diff) | |
| parent | 60be734e52dfa96aa4cec371d1b41c2ba1efcbb8 (diff) | |
| download | mariadb-git-ec0e1a1b2bb6b797da01c082b8a36b97b8d6ed20.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/bug19307
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/partition_info.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_partition.cc:
Auto merged
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 2f79da7edf4..db69fd3daef 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright (C) 2005, 2006 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -238,8 +238,8 @@ bool partition_default_handling(TABLE *table, partition_info *part_info, check_reorganise_list() new_part_info New partition info old_part_info Old partition info - list_part_names The list of partition names that will go away and can be reused in the - new table. + list_part_names The list of partition names that will go away and + can be reused in the new table. RETURN VALUES TRUE Inacceptable name conflict detected. |