[geeklog-cvs] geeklog: Avoid SQL error with certain db dumps during migration ...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/71c20c696961
changeset: 7288:71c20c696961
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 13:07:25 2009 +0200
description:
Avoid SQL error with certain db dumps during migration (bug #0000955)

diffstat:

 public_html/admin/install/bigdump.php |  2 ++
 public_html/docs/history              |  1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diffs (23 lines):

diff -r 2b8f340f0e9f -r 71c20c696961 public_html/admin/install/bigdump.php
--- a/public_html/admin/install/bigdump.php	Sun Sep 06 11:59:29 2009 +0200
+++ b/public_html/admin/install/bigdump.php	Sun Sep 06 13:07:25 2009 +0200
@@ -69,6 +69,8 @@
 // $comment[]='---';                  // Uncomment this line if using proprietary dump created by outdated mysqldump
 // $comment[]='CREATE DATABASE';      // Uncomment this line if your dump contains create database queries in order to ignore them
 $comment[]='/*!';                     // Or add your own string to leave out other proprietary things
+// see http://project.geeklog.net/tracking/view.php?id=955
+$comment[]='SET character_set_client = @saved_cs_client;';
 
 // Connection character set should be the same as the dump file character set (utf8, latin1, cp1251, koi8r etc.)
 // See http://dev.mysql.com/doc/refman/5.0/en/charset-charsets.html for the full list
diff -r 2b8f340f0e9f -r 71c20c696961 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 06 11:59:29 2009 +0200
+++ b/public_html/docs/history	Sun Sep 06 13:07:25 2009 +0200
@@ -3,6 +3,7 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Avoid SQL error with certain db dumps during migration (bug #0000955) [Dirk]
 - Plugin migration was only called when the plugin also needed an upgrade
   (bug #0000947) [Dirk]
 - The Migrate option in the install script now also works on an existing