diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-01-07 13:49:06 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-01-07 13:49:06 +0200 |
| commit | a44cf8a6dde299b92a8bfad3f941c7e68a8f0e86 (patch) | |
| tree | 409350b4b4d075cd9cc893b0bddf8554f165977d /include | |
| parent | 322cd4a6bd079452d24e36f59861210ca91e9921 (diff) | |
| parent | da9cb6e1e25e6f2fb938a864411c3f10a8493e7d (diff) | |
| download | mariadb-git-a44cf8a6dde299b92a8bfad3f941c7e68a8f0e86.tar.gz | |
Merge mysql-5.5 -> mysql-5.5-innodb
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 7 | ||||
| -rw-r--r-- | include/my_handler.h | 4 | ||||
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/include/my_base.h b/include/my_base.h index 28dc55b1b84..83b02bfd833 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -351,7 +351,7 @@ enum ha_base_keytype { /* update the 'variable' part of the info: handler::records, deleted, data_file_length, index_file_length, - delete_length, check_time, mean_rec_length + check_time, mean_rec_length */ #define HA_STATUS_VARIABLE 16 /* @@ -364,6 +364,11 @@ enum ha_base_keytype { update handler::auto_increment_value */ #define HA_STATUS_AUTO 64 +/* + Get also delete_length when HA_STATUS_VARIABLE is called. It's ok to set it also + when only HA_STATUS_VARIABLE but it won't be used. +*/ +#define HA_STATUS_VARIABLE_EXTRA 128 /* Errorcodes given by handler functions diff --git a/include/my_handler.h b/include/my_handler.h index 977c0042938..ba0d3fc313f 100644 --- a/include/my_handler.h +++ b/include/my_handler.h @@ -1,11 +1,11 @@ /* Copyright (C) 2002-2006 MySQL AB - This library is free software; you can redistribute it and/or + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; version 2 of the License. - This library is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. diff --git a/include/my_sys.h b/include/my_sys.h index 50abfb124f5..6e2cbd4c0b3 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2000, 2010, 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 diff --git a/include/mysql_com.h b/include/mysql_com.h index bc9296a6d02..f4c023721de 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2010, 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 |