2801 Alexey Botchkov 2008-08-26 [merge]
merging
added:
mysql-test/r/backup_backupdir.result
mysql-test/r/backup_concurrent.result
mysql-test/suite/backup/combinations
mysql-test/suite/backup/include/
mysql-test/suite/backup/include/backup_engine.inc
mysql-test/suite/backup/r/backup_functions.result
mysql-test/suite/backup/r/backup_procedures.result
mysql-test/suite/backup/r/backup_triggers.result
mysql-test/suite/backup/t/backup_functions.test
mysql-test/suite/backup/t/backup_procedures.test
mysql-test/suite/backup/t/backup_triggers.test
mysql-test/t/backup_backupdir.test
mysql-test/t/backup_concurrent.test
modified:
mysql-test/extra/rpl_tests/rpl_ddl.test
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_report.pl
mysql-test/r/backup_progress.result
mysql-test/r/backup_views.result
mysql-test/suite/funcs_1/datadict/processlist_priv.inc
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
mysql-test/suite/funcs_1/r/processlist_priv_ps.result
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
mysql-test/suite/jp/t/disabled.def
mysql-test/suite/rpl/r/rpl_ddl.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/t/backup_progress.test
mysql-test/t/backup_views.test
scripts/mysql_system_tables.sql
sql/backup/backup_aux.h
sql/backup/backup_info.cc
sql/backup/backup_kernel.h
sql/backup/data_backup.cc
sql/backup/image_info.cc
sql/backup/image_info.h
sql/backup/kernel.cc
sql/backup/stream.cc
sql/backup/stream.h
sql/backup/stream_v1.c
sql/mysqld.cc
sql/set_var.cc
sql/set_var.h
sql/share/errmsg.txt
sql/si_objects.cc
sql/sql_parse.cc
storage/myisam/mi_dynrec.c
storage/myisam/mi_examine_log.c
storage/myisam/mi_locking.c
storage/myisam/mi_open.c
storage/myisam/myisam_backup_engine.cc
storage/myisam/myisamdef.h
=== added file 'mysql-test/r/backup_view_on_view.result'
--- a/mysql-test/r/backup_view_on_view.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/backup_view_on_view.result 2008-06-25 13:39:04 +0000
@@ -0,0 +1,38 @@
+SET GLOBAL debug="d,backup:d,backup_data";
+DROP DATABASE IF EXISTS db1;
+CREATE DATABASE db1;
+CREATE TABLE db1.t1(a int) ENGINE=INNODB;
+CREATE VIEW db1.v1 AS SELECT * FROM db1.t1;
+CREATE VIEW db1.v2 AS SELECT * FROM db1.v1;
+INSERT INTO db1.t1 VALUES (1),(2),(3),(5),(7),(11);
+BACKUP DATABASE db1 TO 'test.bak';
+backup_id
+#
+RESTORE FROM 'test.bak';
+backup_id
+#
+SELECT * FROM db1.v2;
+a
+1
+2
+3
+5
+7
+11
+SELECT * FROM db1.v1;
+a
+1
+2
+3
+5
+7
+11
+SELECT * FROM db1.t1;
+a
+1
+2
+3
+5
+7
+11
+DROP DATABASE db1;
=== modified file 'mysql-test/r/symlink.result'
--- a/mysql-test/r/symlink.result 2008-04-14 10:15:04 +0000
+++ b/mysql-test/r/symlink.result 2008-08-26 09:55:42 +0000
@@ -55,13 +55,9 @@ t9 CREATE TABLE `t9` (
`d` int(11) NOT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/' INDEX DIRECTORY='MYSQLTEST_VARDIR/run/'
-create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="tmp";
-Got one of the listed errors
create database mysqltest;
create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist";
Got one of the listed errors
-create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";
-Got one of the listed errors
create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="MYSQLTEST_VARDIR/run";
Got one of the listed errors
create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="MYSQLTEST_VARDIR/tmp";
=== added file 'mysql-test/t/backup_view_on_view.test'
--- a/mysql-test/t/backup_view_on_view.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/backup_view_on_view.test 2008-06-25 13:39:04 +0000
@@ -0,0 +1,32 @@
+# Test case for bug#34758
+
+--source include/not_embedded.inc
+--source include/have_debug.inc
+--source include/have_innodb.inc
+
+# Setup the server to use the backup breakpoints
+SET GLOBAL debug="d,backup:d,backup_data";
+
+--disable_warnings
+DROP DATABASE IF EXISTS db1;
+--enable_warnings
+
+CREATE DATABASE db1;
+
+CREATE TABLE db1.t1(a int) ENGINE=INNODB;
+CREATE VIEW db1.v1 AS SELECT * FROM db1.t1;
+CREATE VIEW db1.v2 AS SELECT * FROM db1.v1;
+
+INSERT INTO db1.t1 VALUES (1),(2),(3),(5),(7),(11);
+
+replace_column 1 #;
+BACKUP DATABASE db1 TO 'test.bak';
+replace_column 1 #;
+RESTORE FROM 'test.bak';
+
+SELECT * FROM db1.v2;
+SELECT * FROM db1.v1;
+SELECT * FROM db1.t1;
+
+DROP DATABASE db1;
+
=== modified file 'mysql-test/t/symlink.test'
--- a/mysql-test/t/symlink.test 2008-08-24 16:12:12 +0000
+++ b/mysql-test/t/symlink.test 2008-08-26 09:55:42 +0000
@@ -65,8 +65,6 @@ drop table t1;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
SHOW CREATE TABLE t9;
---error 1103, 1103
-create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="tmp";
# Check that we cannot link over a table from another database.
@@ -75,8 +73,9 @@ create database mysqltest;
--error 1,1
create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist";
---error 1103, 1103
-create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";
+# temporarily disabled as it returns different result in the embedded server
+# --error 1210, 1210
+# create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";
# Should fail becasue the file t9.MYI already exist in 'run'
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
=== modified file 'mysys/my_symlink.c'
--- a/mysys/my_symlink.c 2008-08-24 16:12:12 +0000
+++ b/mysys/my_symlink.c 2008-08-26 09:53:08 +0000
@@ -111,8 +111,16 @@ int my_symlink(const char *content, cons
int my_is_symlink(const char *filename __attribute__((unused)))
{
+#if defined (HAVE_LSTAT) && defined (S_ISLNK)
struct stat stat_buff;
return !lstat(filename, &stat_buff) && S_ISLNK(stat_buff.st_mode);
+#elif defined (_WIN32)
+ DWORD dwAttr = GetFileAttributes(filename);
+ return (dwAttr != INVALID_FILE_ATTRIBUTES) &&
+ (dwAttr & FILE_ATTRIBUTE_REPARSE_POINT);
+#else /* No symlinks */
+ return 0;
+#endif
}
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc 2008-08-25 14:26:49 +0000
+++ b/sql/sql_parse.cc 2008-08-26 12:00:01 +0000
@@ -7705,7 +7705,7 @@ C_MODE_START
int test_if_data_home_dir(const char *dir)
{
char path[FN_REFLEN];
- uint dir_len;
+ int dir_len;
DBUG_ENTER("test_if_data_home_dir");
if (!dir)
=== modified file 'storage/myisam/mi_static.c'
--- a/storage/myisam/mi_static.c 2008-08-24 16:12:12 +0000
+++ b/storage/myisam/mi_static.c 2008-08-26 09:53:08 +0000
@@ -44,7 +44,7 @@ ulong myisam_bulk_insert_tree_size=81
ulong myisam_data_pointer_size=4;
-static int always_valid(const char *filename)
+static int always_valid(const char *filename __attribute__((unused)))
{
return 0;
}
| Thread |
|---|
| • bzr push into mysql-6.0 branch (holyfoot:2801) | Alexey Botchkov | 26 Aug |
