Merge r1850 from trunk:

* src/odbc/mysql.sql: Fix complain about comment syntax
* src/odbc/pg.sql: Likewise

SVN Revision: 1897

diff --git a/ChangeLog b/ChangeLog
index 9ed3381a3e4098876ca98191a231988ce2f45487..2c239e7168c769c2076c72e6aa588217e40851a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-21  Badlop  <badlop@process-one.net>
 
+       * src/odbc/mysql.sql: Fix complain about comment syntax
+       * src/odbc/pg.sql: Likewise
+
        * doc/guide.tex: Explain that account creation is only supported
        by internal and odbc authentication methods
        * doc/guide.html: Likewise

diff --git a/src/odbc/mysql.sql b/src/odbc/mysql.sql
index cdc20062ccd2f3fe73cf6e7f7c661cb173faa8d0..e975b92318ae36c0ba9114b83ff43b1746d5f724 100644 (file)
--- a/src/odbc/mysql.sql
+++ b/src/odbc/mysql.sql
@@ -148,7 +148,7 @@ CREATE TABLE private_storage (
 CREATE INDEX i_private_storage_username USING BTREE ON private_storage(username);
 CREATE UNIQUE INDEX i_private_storage_username_namespace USING BTREE ON private_storage(username(75), namespace(75));
 
---- To update from 1.x:
+-- To update from 1.x:
 -- ALTER TABLE rosterusers ADD COLUMN askmessage text AFTER ask;
 -- UPDATE rosterusers SET askmessage = '';
 -- ALTER TABLE rosterusers ALTER COLUMN askmessage SET NOT NULL;

diff --git a/src/odbc/pg.sql b/src/odbc/pg.sql
index 1cb9eeb4d66144eff504b23755a7742cc3dbc3f6..3cf3a09495a9b0fa87ef066551417bdc1790cc8b 100644 (file)
--- a/src/odbc/pg.sql
+++ b/src/odbc/pg.sql
@@ -146,14 +146,14 @@ CREATE INDEX i_private_storage_username ON private_storage USING btree (username
 CREATE UNIQUE INDEX i_private_storage_username_namespace ON private_storage USING btree (username, namespace);
 
 
---- To update from 0.9.8:
+-- To update from 0.9.8:
 -- CREATE SEQUENCE spool_seq_seq;
 -- ALTER TABLE spool ADD COLUMN seq integer;
 -- ALTER TABLE spool ALTER COLUMN seq SET DEFAULT nextval('spool_seq_seq');
 -- UPDATE spool SET seq = DEFAULT;
 -- ALTER TABLE spool ALTER COLUMN seq SET NOT NULL;
 
---- To update from 1.x:
+-- To update from 1.x:
 -- ALTER TABLE rosterusers ADD COLUMN askmessage text;
 -- UPDATE rosterusers SET askmessage = '';
 -- ALTER TABLE rosterusers ALTER COLUMN askmessage SET NOT NULL;