mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
MySQL-5.5.36 merge
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
This commit is contained in:
commit
84651126c0
1315 changed files with 4149 additions and 1509 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (c) 2004, 2011, Oracle and/or its affiliates.
|
||||
/* Copyright (c) 2004, 2013, Oracle and/or its affiliates.
|
||||
|
||||
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
|
||||
|
|
@ -2350,7 +2350,6 @@ int ha_federated::delete_row(const uchar *buf)
|
|||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Positions an index cursor to the index specified in the handle. Fetches the
|
||||
row if available. If the key value is null, begin at the first key of the
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
/*
|
||||
Copyright (c) 2004, 2011, Oracle and/or its affiliates
|
||||
/* Copyright (c) 2004, 2013, Oracle and/or its affiliates.
|
||||
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue