From 7585067a47d2c745c6a8ddc2a06fdbbd4611edec Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@sun.com>
Date: Wed, 2 Dec 2009 18:33:51 +0300
Subject: [PATCH] Backport of:
 ---------------------------------------------------------- revno: 2630.4.30
 Konstantin Osipov   2008-06-11 Fix a potential cause of test failures.

sql/sql_base.cc:
  0 may not be equal to (char*) 0 on 64 bit pointer/32 bit int machines.
---
 sql/sql_base.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 61c071d3430..b1d2ec41367 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2934,7 +2934,7 @@ Locked_tables_list::init_locked_tables(THD *thd)
                            &db, db_len,
                            &table_name, table_name_len,
                            &alias, alias_len,
-                           0))
+                           NullS))
     {
       unlock_locked_tables(0);
       return TRUE;