[Pkg-mysql-commits] r867 - in branches/sid-5.0/debian: . patches

[Sean Finney]

Author: seanius
Date: 2007-05-12 09:32:03 +0000 (Sat, 12 May 2007)
New Revision: 867

Removed:
   branches/sid-5.0/debian/patches/90_TEMP_sqlparse-ifdef.dpatch
Modified:
   branches/sid-5.0/debian/changelog
Log:
now *this* one has been committed upstream

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-05-12 09:27:38 UTC (rev 866)
+++ branches/sid-5.0/debian/changelog	2007-05-12 09:32:03 UTC (rev 867)
@@ -15,6 +15,7 @@
     - Czech. Closes: #421766
     - Portuguese. Closes: #422428
   * massaged the local PATH_MAX patch.
+  * removed temp sql parsing patch which has been incorporated upstream
   * upstream no longer includes the mysql_create_system_tables command,
     so removed our local patches for it.
   * the following issues may have been fixed in a previous version of

Deleted: branches/sid-5.0/debian/patches/90_TEMP_sqlparse-ifdef.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/90_TEMP_sqlparse-ifdef.dpatch	2007-05-12 09:27:38 UTC (rev 866)
+++ branches/sid-5.0/debian/patches/90_TEMP_sqlparse-ifdef.dpatch	2007-05-12 09:32:03 UTC (rev 867)
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by  <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: http://lists.mysql.com/commits/21676
-
- at DPATCH@
-
-# From: holyfoot at mysql dot com
-# Date: March 10 2007 2:44pm
-# Subject: bk commit into 5.0 tree (holyfoot:1.2470) BUG#26833
-# 
-# Below is the list of changes that have just been committed into a local
-# 5.0 repository of hf. When hf does a push these changes will
-# be propagated to the main repository and, within 24 hours after the
-# push, to the public repository.
-# For information on how to access the public repository
-# see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
-# 
-# ChangeSet at stripped, 2007-03-10 17:44:25+04:00, holyfoot at stripped +1 -0
-#   bug #26833 (Compile error with embedded lib)
-#   org_tables declaration was mistakenly #ifdef-ed with the EMBEDDED_LIBRARY
-#   instead of ACCESS_CHECKS
-# 
-#   sql/sql_parse.cc at stripped, 2007-03-10 17:44:23+04:00, holyfoot at stripped +1 -1
-#     default condition fixed
-# 
-# # This is a BitKeeper patch.  What follows are the unified diffs for the
-# # set of deltas contained in the patch.  The rest of the patch, the part
-# # that BitKeeper cares about, is below these diffs.
-# # User:	holyfoot
-# # Host:	hfmain.(none)
-# # Root:	/home/hf/work/26833/my50-26833
-
---- old/sql/sql_parse.cc	2007-03-10 17:44:29 +04:00
-+++ new/sql/sql_parse.cc	2007-03-10 17:44:29 +04:00
-@@ -5402,7 +5402,7 @@ check_table_access(THD *thd, ulong want_
- {
-   uint found=0;
-   ulong found_access=0;
--#ifndef EMBEDDED_LIBRARY
-+#ifndef NO_EMBEDDED_ACCESS_CHECKS
-   TABLE_LIST *org_tables= tables;
- #endif
-   TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();