mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-28 03:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/bkroot/mysql-5.1-new

Browse source 
into  mysql.com:/home/bk/w3023-mysql-5.1-new


configure.in:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/r/binlog_row_insert_select.result:
  Auto merged
mysql-test/r/rpl_row_basic_11bugs.result:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
client/Makefile.am:
  Merging with mysql-5.1-new
mysql-test/r/binlog_row_ctype_cp932.result:
  Merging with mysql-5.1-new
mysql-test/r/rpl_ndb_blob.result:
  Merging with mysql-5.1-new
mysql-test/r/rpl_ndb_dd_basic.result:
  Merging with mysql-5.1-new
This commit is contained in:
unknown 2006-03-03 09:57:42 +01:00
commit ac2b587029
68 changed files with 1280 additions and 1054 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/extra/binlog_tests/insert_select-binlog.test
View file

@ -19,6 +19,7 @@ insert into t1 select * from t2;
# verify the binlog :
let $VERSION=`select version()`;
--replace_result $VERSION VERSION
--replace_regex /table_id: [0-9]+/table_id: #/
show binlog events;
select * from t1;
drop table t1, t2;
@ -33,6 +34,7 @@ create table t2(unique(a)) select a from t1;
# The above should produce an error, *and* not appear in the binlog
let $VERSION=`select version()`;
--replace_result $VERSION VERSION
--replace_regex /table_id: [0-9]+/table_id: #/
show binlog events;
drop table t1;