Fix autoincrement for signed columns (Bug #1366)

Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651)
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
Fixed timestamp.test


include/my_base.h:
  Add HA_END_SPACE_KEY to mark keys that has VARCHAR/TEXT fields.
myisam/mi_check.c:
  Delete not used variable
myisam/mi_key.c:
  Fix autoincrement for signed columns (Bug #1366). Patch by Holyfoot
myisam/mi_open.c:
  Bug fix for future (doesn't affect current code)
myisam/mi_search.c:
  Ignore end space for VARCHAR/TEXT columns
mysql-test/r/auto_increment.result:
  Test auto_increment with signed numbers
mysql-test/r/binary.result:
  Update results (old result was wrong)
mysql-test/r/func_str.result:
  Added test of QUOTE()
mysql-test/r/func_time.result:
  Add test of unix_timestamp()
mysql-test/r/have_met_timezone.require:
  Fixed test
mysql-test/r/innodb.result:
  Add test for InnoDB behaviour with TRUNCATE
mysql-test/r/multi_update.result:
  Test of multi-update bug
mysql-test/r/symlink.result:
  Test of ALTER TABLE and symlinks
mysql-test/r/timezone.result:
  Test of from_unixtime()
mysql-test/r/truncate.result:
  Test of truncate and auto_increment
mysql-test/r/type_blob.result:
  Test of key search on TEXT/VARCHAR column with end space
mysql-test/t/auto_increment.test:
  Test auto_increment with signed numbers
mysql-test/t/func_str.test:
  Added test of QUOTE()
mysql-test/t/func_time.test:
  Add test of unix_timestamp()
mysql-test/t/innodb.test:
  Add test for InnoDB behaviour with TRUNCATE
mysql-test/t/multi_update.test:
  Test of multi-update bug
mysql-test/t/symlink.test:
  Test of ALTER TABLE and symlinks
mysql-test/t/timezone.test:
  Test of from_unixtime()
mysql-test/t/truncate.test:
  Test of truncate and auto_increment
mysql-test/t/type_blob.test:
  Test of key search on TEXT/VARCHAR column with end space
mysys/my_symlink2.c:
  Disable creation of symlinks if my_disable_symlink is set
sql/field.h:
  Indentation cleanup
sql/ha_innodb.cc:
  HA_PART_KEY -> HA_PART_KEY_SEG
sql/item_strfunc.cc:
  Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
sql/mysql_priv.h:
  Make check_dup() external
sql/opt_range.cc:
  Fixed searching of TEXT with end space. (Bug #1651)
sql/records.cc:
  Fixed caching bug in multi-table-update where same table was used twice.
  (Bug #1711)
sql/sql_acl.cc:
  Reset ip and ip_mask if hostname is NULL
sql/sql_parse.cc:
  Make check_dup() global
sql/sql_select.cc:
  Fixed searching of TEXT with end space. (Bug #1651)
sql/sql_table.cc:
  Fixed searching of TEXT with end space. (Bug #1651)
sql/sql_update.cc:
  Fixed caching bug in multi-table-update where same table was used twice.
  (Bug #1711)
sql/table.cc:
  Fixed searching of TEXT with end space. (Bug #1651)
sql/table.h:
  Fixed caching bug in multi-table-update where same table was used twice.
  (Bug #1711)
sql/time.cc:
  Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)

1 files changed, 4 insertions, 3 deletions

diff --git a/sql/field.h b/sql/field.h
index 3186f9f5275..8a829a455ed 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -799,9 +799,10 @@ public:
     binary_flag(binary_arg)
     {
       if (binary_arg)
-	flags|=BINARY_FLAG;
+	flags|= BINARY_FLAG;
     }
-  Field_varstring(uint32 len_arg,bool maybe_null_arg, const char *field_name_arg,
+  Field_varstring(uint32 len_arg,bool maybe_null_arg,
+		  const char *field_name_arg,
 		  struct st_table *table_arg, bool binary_arg)
     :Field_str((char*) 0,len_arg, maybe_null_arg ? (uchar*) "": 0,0,
 	       NONE, field_name_arg, table_arg),
@@ -856,7 +857,7 @@ public:
     {
       flags|= BLOB_FLAG;
       if (binary_arg)
-	flags|=BINARY_FLAG;
+	flags|= BINARY_FLAG;
     }
   enum_field_types type() const { return FIELD_TYPE_BLOB;}
   enum ha_base_keytype key_type() const