From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Thu, 2 Apr 2009 09:40:59 +0000 (+0000)
Subject: enum and set lengths
X-Git-Tag: v3.0.0~951
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=6e566c7f26a7e3def204a3560d61f2d2a333ec05;p=adminer.git

enum and set lengths

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@569 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---

diff --git a/export.inc.php b/export.inc.php
index 7027046c..7787bfc9 100644
--- a/export.inc.php
+++ b/export.inc.php
@@ -28,7 +28,7 @@ function dump_table($table, $style, $is_view = false) {
 				$row_size = 21 + strlen(idf_escape($table));
 				foreach (fields($table) as $field) {
 					$type = $types[$field["type"]];
-					$row_size += 5 + ($field["length"] ? $field["length"] : $type) * (preg_match('~char|text|enum~', $field["type"]) ? 3 : 1); // UTF-8 in MySQL uses up to 3 bytes
+					$row_size += 5 + ($field["length"] ? (preg_match('~enum|set~', $field["type"]) ? strlen($field["length"]) : $field["length"]) : $type) * (preg_match('~char|text|enum|set~', $field["type"]) ? 3 : 1); // UTF-8 in MySQL uses up to 3 bytes
 				}
 				if ($row_size > $max_packet) {
 					$max_packet = min(1073741824, 1024 * ceil($row_size / 1024));