diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
| commit | 624dd71b9419555eca8baadc695e3376de72286f (patch) | |
| tree | 31aaab8aeac43f921638407ab82190dd05a72793 /include/maria.h | |
| parent | d4d865fcc8083782b6e4419c69bec372cd0b4142 (diff) | |
| parent | e9c1701e11e2441435223cc7c00c467f58aaff19 (diff) | |
| download | mariadb-git-624dd71b9419555eca8baadc695e3376de72286f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/maria.h b/include/maria.h index 47a670b91b1..60b981fd1a9 100644 --- a/include/maria.h +++ b/include/maria.h @@ -1,5 +1,5 @@ /* Copyright (C) 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. - Copyright (c) 2009, 2013, Monty Program Ab. + Copyright (c) 2009, 2019, MariaDB Corporation. 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 @@ -308,7 +308,7 @@ extern int maria_rsame_with_pos(MARIA_HA *file, uchar *record, int inx, MARIA_RECORD_POS pos); extern int maria_update(MARIA_HA *file, const uchar *old, const uchar *new_record); -extern int maria_write(MARIA_HA *file, uchar *buff); +extern int maria_write(MARIA_HA *file, const uchar *buff); extern MARIA_RECORD_POS maria_position(MARIA_HA *file); extern int maria_status(MARIA_HA *info, MARIA_INFO *x, uint flag); extern int maria_lock_database(MARIA_HA *file, int lock_type); |