← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/cslib/CSXML.cc

  • Committer: lbieber
  • Date: 2010-09-07 22:29:56 UTC
  • mfrom: (1747.1.3 build)
  • Revision ID: lbieber@orisndriz03-20100907222956-d60u695b7hx3zs0d
Merge Andrew - bug 597778 - Timestamp cannot reliably store leap seconds, so don't try. Leave that to datetime only
Merge Andrew - bug 621862 - Add / clean-up error messages for unireg_abort
Merge Andrew - bug 629563 - Drop the broken --mysql options and Change the --protocol option to accept 'mysql' or 'drizzle' ('mysql' currently default)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/cslib/CSXML.cc
14
14
 *
15
15
 * You should have received a copy of the GNU General Public License
16
16
 * along with this program; if not, write to the Free Software
17
 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
17
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
 *
19
19
 * Paul McCullagh (H&G2JCtL)
20
20
 *
1293
1293
 
1294
1294
        switch (err) {
1295
1295
                case CS_XML_ERR_OUT_OF_MEMORY:
1296
 
                        snprintf(err_message, CS_XML_ERR_MSG_SIZE, "AES parse error- insufficient memory");                     
 
1296
                        sprintf(err_message, "AES parse error- insufficient memory");                   
1297
1297
                        break;
1298
1298
                case CS_XML_ERR_CHAR_TOO_LARGE:
1299
 
                        snprintf(err_message, CS_XML_ERR_MSG_SIZE, "AES parse error- UNICODE character too large to be encoded as UTF-8");                      
 
1299
                        sprintf(err_message, "AES parse error- UNICODE character too large to be encoded as UTF-8");                    
1300
1300
                        break;
1301
1301
                default:
1302
 
                        snprintf(err_message, CS_XML_ERR_MSG_SIZE, "AES parse error- %s", strerror(err));
 
1302
                        sprintf(err_message, "AES parse error- %s", strerror(err));
1303
1303
                        break;
1304
1304
        }
1305
1305
}