diff options
author | unknown <sasha@mysql.sashanet.com> | 2000-11-20 23:38:08 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2000-11-20 23:38:08 -0700 |
commit | 1100a260aa067860e1889489a69dcae0fd9907ae (patch) | |
tree | 050393cb70f23f2d613cf4a5f8134232f3a1b540 /client | |
parent | b500ad64274dab7650c8cc243bc2ed37f94714ff (diff) | |
download | mariadb-git-1100a260aa067860e1889489a69dcae0fd9907ae.tar.gz |
fixed warning in sql_class.cc
added gdb support, mysqld options per test, and other cool stuff to mysql-test-run
added --replicate-wild-do/ignore-table
more test cases
client/mysqltest.c:
fixed a reject file bug
mysql-test/mysql-test-run:
support for gdb and running only one test case
sql/mysql_priv.h:
wild_compare needs to be global
sql/mysqld.cc:
--replicate-wild-do/ignore-table
sql/slave.cc:
wild,wild
sql/slave.h:
wild fixes
sql/sql_class.cc:
fixed compiler warning
sql/sql_string.cc:
wild stuff needs to be global
BitKeeper/etc/ignore:
Added BitKeeper/tmp/gone mysql-test/r/3.23/rpl mysql-test/r/3.23/rpl.reject mysql-test/var/lib/bar/bar.frm mysql-test/var/lib/bar/bar.MYD mysql-test/var/lib/bar/bar.MYI mysql-test/var/lib/foo/foo.frm mysql-test/var/lib/foo/foo.MYD mysql-test/var/lib/foo/foo.MYI mysql-test/var/lib/test/bar.frm mysql-test/var/lib/test/bar.MYD mysql-test/var/lib/test/bar.MYI mysql-test/var/lib/test/choo.frm mysql-test/var/lib/test/choo.MYD mysql-test/var/lib/test/choo.MYI mysql-test/var/slave-data/bar/bar.frm mysql-test/var/slave-data/bar/bar.MYD mysql-test/var/slave-data/bar/bar.MYI mysql-test/var/slave-data/foo/foo.frm mysql-test/var/slave-data/foo/foo.MYD mysql-test/var/slave-data/foo/foo.MYI mysql-test/var/slave-data/test/bar.frm mysql-test/var/slave-data/test/bar.MYD mysql-test/var/slave-data/test/bar.MYI mysql-test/var/slave-data/test/choo.frm mysql-test/var/slave-data/test/choo.MYD mysql-test/var/slave-data/test/choo.MYI mysql-test/var/tmp/README to the ignore list
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqltest.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 47201c35ae9..90080f12e56 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -95,7 +95,7 @@ int open_file(const char* name) if(*cur_file && ++cur_file == file_stack_end) die("Source directives are nesting too deep"); if(!(*cur_file = fopen(name, "r"))) - die("Could not read '%s'\n", name); + die("Could not read '%s': errno %d\n", name, errno); return 0; } @@ -593,8 +593,9 @@ void reject_dump(char* record_file, char* buf, int size) FILE* freject; p = reject_file; - p = safe_str_append(p, record_file, size); - p = safe_str_append(p, (char*)".reject", reject_file + size - p); + p = safe_str_append(p, record_file, sizeof(reject_file)); + p = safe_str_append(p, (char*)".reject", reject_file - p + + sizeof(reject_file)); if(!(freject = fopen(reject_file, "w"))) die("Could not open reject file %s, error %d", reject_file, errno); |