diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-12 22:14:54 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-12 22:14:54 +0200 |
| commit | 95d678f84166348a46688d6f6c4f7f59abbfc058 (patch) | |
| tree | 8f3cbdbb202fc2e5f1959f002cb2721b328aa458 /sql/share | |
| parent | fac5ba8b4452de1830a2a5a847f6c230fc25031a (diff) | |
| parent | 492ebf924b40ac847201fa6dc3cb44731dbac210 (diff) | |
| download | mariadb-git-95d678f84166348a46688d6f6c4f7f59abbfc058.tar.gz | |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
storage/blackhole/ha_blackhole.h:
Auto merged
storage/csv/ha_tina.h:
Auto merged
storage/example/ha_example.h:
Auto merged
storage/federated/ha_federated.h:
Auto merged
storage/heap/ha_heap.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/innobase/handler/ha_innodb.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
sql/share/errmsg.txt:
SCCS merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index b5bfe8a691c..a8deec9c668 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6072,3 +6072,5 @@ ER_SLAVE_CREATE_EVENT_FAILURE eng "Failed to create %s" ER_SLAVE_MASTER_COM_FAILURE eng "Master command %s failed: %s" +ER_BINLOG_LOGGING_IMPOSSIBLE + eng "Binary logging not possible. Message: %s" |