From 86086e719338e92e45e93dcebd76b3fc1c509943 Mon Sep 17 00:00:00 2001
From: "pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se" <>
Date: Mon, 20 Mar 2006 23:55:10 -0500
Subject: [PATCH] Manual merge

---
 sql/sql_partition.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index fc6169f921e..62c48ba37dc 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -4934,7 +4934,7 @@ the generated partition syntax in a correct manner.
     }
     if (thd->work_part_info)
     {
-      partition_info *part_info= thd->lex->part_info;
+      partition_info *part_info= thd->work_part_info;
       bool is_native_partitioned= FALSE;
       /*
         Need to cater for engine types that can handle partition without