diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-09 10:00:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-09 10:00:49 +0100 |
| commit | abf9d35213ba482a3927651ddb98baa47aeb34fd (patch) | |
| tree | 567bee47df18c21d5fbc09bbb4fee4e8f26df4d9 /sql/table.cc | |
| parent | 50a796dcba2abe5f25c1e4cd8a69d7ea43343a8d (diff) | |
| parent | 40ae1b9b618fbbc3b494a896a9d074b74e414337 (diff) | |
| download | mariadb-git-abf9d35213ba482a3927651ddb98baa47aeb34fd.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sql/table.cc b/sql/table.cc index f521056aaee..db18214165e 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. Copyright (c) 2008, 2015, MariaDB This program is free software; you can redistribute it and/or modify @@ -2445,21 +2445,6 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, outparam->record[1]= outparam->record[0]; // Safety } -#ifdef HAVE_valgrind - /* - We need this because when we read var-length rows, we are not updating - bytes after end of varchar - */ - if (records > 1) - { - memcpy(outparam->record[0], share->default_values, share->rec_buff_length); - memcpy(outparam->record[1], share->default_values, share->null_bytes); - if (records > 2) - memcpy(outparam->record[1], share->default_values, - share->rec_buff_length); - } -#endif - if (!(field_ptr = (Field **) alloc_root(&outparam->mem_root, (uint) ((share->fields+1)* sizeof(Field*))))) |