← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.h

Merge trunk changes and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error.h
22
22
 
23
23
#include "drizzled/my_error.h"
24
24
 
25
 
#ifdef  __cplusplus
26
 
extern "C" {
27
 
#endif
 
25
namespace drizzled
 
26
{
28
27
 
29
28
bool init_errmessage(void);
30
29
const char * error_message(unsigned int err_index);
727
726
  ER_ERROR_LAST= ER_NO_PRIMARY_KEY_ON_REPLICATED_TABLE
728
727
};
729
728
 
730
 
#ifdef  __cplusplus
731
 
}
732
 
#endif
 
729
} /* namespace drizzled */
733
730
 
734
731
#endif /* DRIZZLED_ERROR_H */