summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-07-04 18:41:17 -0600
committerunknown <sasha@mysql.sashanet.com>2001-07-04 18:41:17 -0600
commitfde78d995acca36cb353151604de5a12c2299361 (patch)
treeb692749a03b9ff3a1703d9f7405efa9cd78d4f33 /include
parentb5c2e85cace2f92c0cfdd126ed163e583caace92 (diff)
parentbb9da6021ccd4ae4b2eab46b9125c6a1ee62bd33 (diff)
downloadmariadb-git-fde78d995acca36cb353151604de5a12c2299361.tar.gz
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
Diffstat (limited to 'include')
-rw-r--r--include/mysqld_error.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 106c49dc110..5777c8c7bef 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -213,4 +213,5 @@
#define ER_CONNECT_TO_MASTER 1210
#define ER_QUERY_ON_MASTER 1211
#define ER_SHOW_BINLOG_EVENTS 1212
-#define ER_ERROR_MESSAGES 213
+#define ER_SHOW_NEW_MASTER 1213
+#define ER_ERROR_MESSAGES 214