mirror of
https://github.com/MariaDB/server.git
synced 2025-11-06 13:10:12 +03:00
e8e85ed2a6
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/r/show_check.result
Text conflict in mysql-test/r/sp-code.result
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/t/show_check.test
Text conflict in mysys/my_delete.c
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/log.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/repl_failsafe.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_yacc.yy
Text conflict in storage/myisam/ha_myisam.cc
Corrected results for
stm_auto_increment_bug33029.reject 2009-12-01
20:01:49.000000000 +0300
<andrei> @@ -42,9 +42,6 @@
<andrei> RETURN i;
<andrei> END//
<andrei> CALL p1();
<andrei> -Warnings:
<andrei> -Note 1592 Statement may not be safe to log in statement
format.
<andrei> -Note 1592 Statement may not be safe to log in statement
format.
There should be indeed no Note present because there is in fact autoincrement
top-level query in sp() that triggers inserting in yet another auto-inc table.
(todo: alert DaoGang to improve the test).
67 lines
1.6 KiB
INI
67 lines
1.6 KiB
INI
!include include/default_mysqld.cnf
|
|
!include include/default_ndbd.cnf
|
|
!include include/default_client.cnf
|
|
|
|
[cluster_config.1]
|
|
NoOfReplicas= 2
|
|
ndbd=,
|
|
ndb_mgmd=
|
|
mysqld=,
|
|
|
|
[cluster_config.slave]
|
|
NoOfReplicas= 1
|
|
ndbd=
|
|
ndb_mgmd=
|
|
mysqld=
|
|
|
|
[mysqld]
|
|
# Make all mysqlds use cluster
|
|
ndbcluster
|
|
# Turn on bin logging
|
|
log-bin= master-bin
|
|
|
|
[mysqld.1.1]
|
|
|
|
[mysqld.1.1]
|
|
|
|
[mysqld.1.slave]
|
|
|
|
# Append <testname>-slave.opt file to the list of argument used when
|
|
# starting the mysqld
|
|
#!use-slave-opt
|
|
|
|
log-bin= slave-bin
|
|
relay-log= slave-relay-bin
|
|
|
|
init-rpl-role= slave
|
|
log-slave-updates
|
|
master-retry-count= 10
|
|
|
|
# Values reported by slave when it connect to master
|
|
# and shows up in SHOW SLAVE STATUS;
|
|
report-host= 127.0.0.1
|
|
report-port= @mysqld.1.slave.port
|
|
report-user= root
|
|
|
|
loose-skip-innodb
|
|
skip-slave-start
|
|
|
|
# Directory where slaves find the dumps generated by "load data"
|
|
# on the server. The path need to have constant length otherwise
|
|
# test results will vary, thus a relative path is used.
|
|
slave-load-tmpdir= ../../../tmp
|
|
|
|
rpl-recovery-rank= @mysqld.1.slave.server-id
|
|
|
|
|
|
[ENV]
|
|
NDB_CONNECTSTRING= @mysql_cluster.1.ndb_connectstring
|
|
MASTER_MYPORT= @mysqld.1.1.port
|
|
MASTER_MYPORT1= @mysqld.2.1.port
|
|
|
|
NDB_CONNECTSTRING_SLAVE= @mysql_cluster.slave.ndb_connectstring
|
|
SLAVE_MYPORT= @mysqld.1.slave.port
|
|
SLAVE_MYSOCK= @mysqld.1.slave.socket
|
|
|
|
NDB_BACKUP_DIR= @cluster_config.ndbd.1.1.BackupDataDir
|