database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

post-merge fixes

Browse Source
This commit is contained in:
serg@serg.mylan
2003-11-25 20:06:41 +01:00
parent cff81e4b63
commit 34fdd54e07
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING zlib EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
SUBDIRS = . include @docs_dirs@ \ SUBDIRS = . include @docs_dirs@ \
@readline_topdir@ sql-common \ @readline_topdir@ sql-common \
@thread_dirs@ pstack @sql_client_dirs@ \ @thread_dirs@ pstack @sql_client_dirs@ \
@sql_server_dirs@ scripts man tests \ @sql_server_dirs@ scripts man tests \

2
mysql-test/r/rpl_change_master.result
View File

@@ -8,7 +8,7 @@ select get_lock("a",5);
get_lock("a",5) get_lock("a",5)
1 1
create table t1(n int); create table t1(n int);
insert into t1 values(1+get_lock("a",10)*0); insert into t1 values(1+get_lock("a",15)*0);
insert into t1 values(2); insert into t1 values(2);
stop slave; stop slave;
select * from t1; select * from t1;