From 36fecd249cbc43dc5b64a70a74fc3fe050471de0 Mon Sep 17 00:00:00 2001
From: Saksham Gupta <shucon01@gmail.com>
Date: Mon, 10 May 2021 20:53:21 +0530
Subject: [PATCH 1/3] Fix #16882: Table delete resets count to 0

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
---
 templates/database/structure/table_header.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/database/structure/table_header.twig b/templates/database/structure/table_header.twig
index edb822191b..e3556e1f5d 100644
--- a/templates/database/structure/table_header.twig
+++ b/templates/database/structure/table_header.twig
@@ -1,7 +1,7 @@
 <form method="post" action="{{ url('/database/structure') }}" name="tablesForm" id="tablesForm">
 {{ get_hidden_inputs(db) }}
 <div class="table-responsive">
-<table class="table table-light table-striped table-hover table-sm w-auto">
+<table class="table table-light table-striped table-hover table-sm w-auto data">
     <thead class="thead-light">
         <tr>
             <th class="d-print-none"></th>

From aa06d9e680d61512f030924fa9a0bbe893dda29a Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 10 May 2021 23:19:06 +0200
Subject: [PATCH 2/3] Fix #16895 - Wrong table count on space separated numbers
 Fixes: #16895

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 js/src/database/structure.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/database/structure.js b/js/src/database/structure.js
index 4760bfd909..a023026b6a 100644
--- a/js/src/database/structure.js
+++ b/js/src/database/structure.js
@@ -70,7 +70,7 @@ DatabaseStructure.adjustTotals = function () {
             // The approximated value contains a preceding ~ (Eg 100 --> ~100)
             strRows = strRows.substring(1, strRows.length);
         }
-        strRows = strRows.replace(/[,.]/g, '');
+        strRows = strRows.replace(/[,.\s]/g, '');
         var intRow = parseInt(strRows, 10);
         if (! isNaN(intRow)) {
             rowsSum += intRow;

From 1a16aa0577bc9cc38febc9d13de857f37f64e760 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 10 May 2021 23:20:39 +0200
Subject: [PATCH 3/3] Add ChangeLog entries for #16882 and #16895
 Signed-off-by: William Desportes <williamdes@wdes.fr>

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 609c882f3e..545f716b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,6 +99,8 @@ phpMyAdmin - ChangeLog
 - issue #16871 Fixed PHP and JS errors on normalization steps
 - issue        Fixed CSS missing classes on normalization buttons
 - issue #16437 Fixed sticky top position when using smaller screen sizes
+- issue #16895 Fixed wrong table count on space separated numbers
+- issue #16882 Fixed table delete resets count to 0
 
 5.1.0 (2021-02-24)
 - issue #15350 Change Media (MIME) type references to Media type