mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-12 10:00:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

5.6.31

Browse source
This commit is contained in:
Sergei Golubchik 2016-06-21 14:21:03 +02:00
commit 720e04ff67
146 changed files with 1536 additions and 1481 deletions
Download patch file Download diff file Expand all files Collapse all files

8
storage/innobase/include/data0data.ic
View file

@ -1,6 +1,6 @@
/*****************************************************************************
Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
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 the Free Software
@ -56,7 +56,8 @@ dfield_set_type(
dfield_t* field, /*!< in: SQL data field */
const dtype_t* type) /*!< in: pointer to data type struct */
{
ut_ad(field && type);
ut_ad(field != NULL);
ut_ad(type != NULL);
field->type = *type;
}
@ -194,7 +195,8 @@ dfield_copy_data(
dfield_t* field1, /*!< out: field to copy to */
const dfield_t* field2) /*!< in: field to copy from */
{
ut_ad(field1 && field2);
ut_ad(field1 != NULL);
ut_ad(field2 != NULL);
field1->data = field2->data;
field1->len = field2->len;