1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge branch '10.3' into 10.4

This commit is contained in:
Oleksandr Byelkin
2019-05-19 20:55:37 +02:00
3893 changed files with 11766 additions and 6460 deletions

View File

@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Write some debug info */
@ -596,13 +596,13 @@ update: %10lu\n",
tmp.ha_update_count);
printf("\nTable status:\n\
Opened tables: %10lu\n\
Open tables: %10lu\n\
Open files: %10lu\n\
Open tables: %10u\n\
Open files: %10u\n\
Open streams: %10lu\n",
tmp.opened_tables,
(ulong) tc_records(),
(ulong) my_file_opened,
(ulong) my_stream_opened);
tc_records(),
my_file_opened,
my_stream_opened);
#ifndef DONT_USE_THR_ALARM
ALARM_INFO alarm_info;