diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 317c18bae2..85faca3820 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-09  Hirofumi Kosaka  <kosaka@rworks.jp>
+
+	* pandoradb.sql: cleaned code style, to be acceptable by
+	Clustrix's SQL parser, for examples.  Merged from branch 4.x.
+
 2012-10-08  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/functions_graph.php,
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 86665ad1bc..b598cba3c8 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -544,7 +544,7 @@ CREATE TABLE IF NOT EXISTS `tevento` (
 CREATE TABLE IF NOT EXISTS `tgrupo` (
 	`id_grupo` mediumint(4) unsigned NOT NULL auto_increment,
 	`nombre` varchar(100) NOT NULL default '',
-	`icon` varchar(50) default NULL default 'world',
+	`icon` varchar(50) default 'world',
 	`parent` mediumint(4) unsigned NOT NULL default '0',
 	`propagate` tinyint(1) unsigned NOT NULL default '0',
 	`disabled` tinyint(3) unsigned NOT NULL default '0',
@@ -582,7 +582,7 @@ CREATE TABLE IF NOT EXISTS `tincidencia` (
 -- -----------------------------------------------------
 -- Table `tlanguage`
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS`tlanguage` (
+CREATE TABLE IF NOT EXISTS `tlanguage` (
 	`id_language` varchar(6) NOT NULL default '',
 	`name` varchar(100) NOT NULL default '',
 	PRIMARY KEY  (`id_language`)