WIP merge 10.5 to 10.6bb-10.6-merge

FIXME: Disabled tests due to upgrading libmariadb:

main.mysql_client_test main.mysql_client_test_nonblock main.mysql_client_test_comp

1 files changed, 9 insertions, 6 deletions

diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c
index f7626f93acf..d6cd9334a55 100644
--- a/storage/myisam/myisampack.c
+++ b/storage/myisam/myisampack.c
@@ -1953,7 +1953,7 @@ static void make_traverse_code_tree(HUFF_TREE *huff_tree,
   {
     chr=element->a.leaf.element_nr;
     huff_tree->code_len[chr]= (uchar) (8 * sizeof(ulonglong) - size);
-    huff_tree->code[chr]= (code >> size);
+    huff_tree->code[chr]= (size == 8 * sizeof(ulonglong)) ? 0 : (code >> size);
     if (huff_tree->height < 8 * sizeof(ulonglong) - size)
         huff_tree->height= 8 * sizeof(ulonglong) - size;
   }
@@ -2944,12 +2944,15 @@ static void flush_bits(void)
   ulonglong bit_buffer;
 
   bits= file_buffer.bits & ~7;
-  bit_buffer= file_buffer.bitbucket >> bits;
-  bits= BITS_SAVED - bits;
-  while (bits > 0)
+  if (bits != BITS_SAVED)
   {
-    bits-= 8;
-    *file_buffer.pos++= (uchar) (bit_buffer >> bits);
+    bit_buffer= file_buffer.bitbucket >> bits;
+    bits= BITS_SAVED - bits;
+    while (bits > 0)
+    {
+      bits-= 8;
+      *file_buffer.pos++= (uchar) (bit_buffer >> bits);
+    }
   }
   if (file_buffer.pos >= file_buffer.end)
     (void) flush_buffer(~ (ulong) 0);