mirror of
https://github.com/MariaDB/server.git
synced 2025-05-08 15:01:49 +03:00
5bddbc44c6
- Added checking of return value for system(), freopen(), fgets() and chown()
- Ensure that calls that require a format strings gets a format string
- Other trivial things
Updated test suite results (especially for pbxt and embedded server)
Removed warning for "Invalid (old?) table or database name 'mysqld.1'" from pbxt tests
Speed up some pbxt tests by inserting begin ; commit; around "while loops with inserts"
Added mysqld startup option '--debug-flush'
Create maria_recovery.trace in data directory instead of current directory
client/mysql.cc:
Check return value from system()
client/mysql_upgrade.c:
Check return value from fgets()
client/mysqladmin.cc:
Check return value from fgets()
client/mysqlslap.c:
Check return value from system() (but ignore it, as it's not critical)
extra/yassl/src/crypto_wrapper.cpp:
Check return value from fgets() (but ignore it, as it's internal file)
extra/yassl/taocrypt/src/aes.cpp:
Added extra {} to remove compiler warning
extra/yassl/taocrypt/src/blowfish.cpp:
Added extra {} to remove compiler warning
extra/yassl/taocrypt/src/misc.cpp:
Ifdef not used code
include/mysys_err.h:
Added error message for failing chown()
mysql-test/mysql-test-run.pl:
Don't give warning for skipping ndbcluster (never enabled in MariaDB)
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result:
Update with new information schema information
mysql-test/suite/funcs_1/r/is_tables_is_embedded.result:
New test
mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result:
Update test results (has not been tested for a long time)
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result:
Update test results (has not been tested for a long time)
mysql-test/suite/funcs_1/t/is_tables_is.test:
Don't run with embedded server (as results differ)
I added a new test for embedded server
mysql-test/suite/funcs_1/t/is_tables_is_embedded.test:
New test
mysql-test/suite/pbxt/my.cnf:
Allow one to run pbxt tests without having to specify --mysqld=--default-storage-engine=pbxt
mysql-test/suite/pbxt/t/count_distinct3.test:
Speed up test by inserting begin; ... commit;
mysql-test/suite/pbxt/t/subselect.test:
Speed up test by inserting begin; ... commit;
mysys/errors.c:
Added error message for failing chown()
mysys/my_copy.c:
Added error message for failing chown()
mysys/my_redel.c:
Added error message for failing chown()
mysys/safemalloc.c:
Added cast to get rid of compiler warning
sql/ha_partition.cc:
Fixed wrong argument to sql_print_error() (it requires a format string)
sql/log.cc:
Test return value of freopen()
sql/mysqld.cc:
Test return value of freopen()
Added startup option '--debug-flush' to be used when one gets a core dump (easy to explain to people on IRC)
sql/rpl_rli.cc:
Fixed wrong argument to sql_print_error() (it requires a format string)
sql/set_var.cc:
Added {} to get rid of compiler warnings
sql/slave.cc:
Fixed wrong argument to mi->report() and sql_print...() (they require a format string)
sql/sql_cache.cc:
Fixed wrong argument to sql_printinformation() (it requires a format string)
sql/sql_parse.cc:
Test return value of fgets()
sql/sql_plugin.cc:
Fixed wrong argument to sql_print_error() (it requires a format string)
sql/sql_select.cc:
Use unique table name for internal temp tables instead of full path
(Simple speed & space optimization)
sql/udf_example.c:
Removed compiler warning about not used variable
storage/maria/ha_maria.cc:
Fixed wrong argument to sql_print_error() and ma_check_print_error() (they require a format string)
storage/maria/ma_recovery.c:
Create maria_recovery.trace in data directory instead of current directory
storage/maria/unittest/ma_test_loghandler-t.c:
Fixed wrong argument to ok(); Requires a format string
storage/pbxt/src/strutil_xt.cc:
Detect temporary tables by checking if that path for the table is in the mysql data directory.
The database for temporary tables is after this patch, from PBXT point of view, ""
This is needed to stop PBXT from calling filename_to_tablename() with the base directory as an argument, which caused
ERROR: Invalid (old?) table or database name 'mysqld.1'" in the log when running the test suite.
tests/mysql_client_test.c:
Fixed compiler warnings
unittest/mysys/base64-t.c:
Fixed wrong argument to diag() (it requires a format string)
Added a comment that the current 'print' of differing buffers doesn't print the right thing,
but didn't fix this as it's not important (unless we find a bug in the real code)
96 lines
2.7 KiB
C
96 lines
2.7 KiB
C
/* Copyright (C) 2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License as
|
|
published by the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <base64.h>
|
|
#include <tap.h>
|
|
#include <string.h>
|
|
|
|
#define BASE64_LOOP_COUNT 500
|
|
#define BASE64_ROWS 4 /* Number of ok(..) */
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
int i, cmp;
|
|
size_t j, k, l, dst_len, needed_length;
|
|
MY_INIT("base64-t");
|
|
|
|
plan(BASE64_LOOP_COUNT * BASE64_ROWS);
|
|
|
|
for (i= 0; i < BASE64_LOOP_COUNT; i++)
|
|
{
|
|
/* Create source data */
|
|
const size_t src_len= rand() % 1000 + 1;
|
|
|
|
char * src= (char *) malloc(src_len);
|
|
char * s= src;
|
|
char * str;
|
|
char * dst;
|
|
|
|
for (j= 0; j<src_len; j++)
|
|
{
|
|
char c= rand();
|
|
*s++= c;
|
|
}
|
|
|
|
/* Encode */
|
|
needed_length= base64_needed_encoded_length(src_len);
|
|
str= (char *) malloc(needed_length);
|
|
for (k= 0; k < needed_length; k++)
|
|
str[k]= 0xff; /* Fill memory to check correct NUL termination */
|
|
ok(base64_encode(src, src_len, str) == 0,
|
|
"base64_encode: size %d", i);
|
|
ok(needed_length == strlen(str) + 1,
|
|
"base64_needed_encoded_length: size %d", i);
|
|
|
|
/* Decode */
|
|
dst= (char *) malloc(base64_needed_decoded_length(strlen(str)));
|
|
dst_len= base64_decode(str, strlen(str), dst, NULL);
|
|
ok(dst_len == src_len, "Comparing lengths");
|
|
|
|
cmp= memcmp(src, dst, src_len);
|
|
ok(cmp == 0, "Comparing encode-decode result");
|
|
if (cmp != 0)
|
|
{
|
|
/* FIXME: This only prints last value of the compared strings */
|
|
char buf[80];
|
|
diag(" --------- src --------- --------- dst ---------");
|
|
for (k= 0; k<src_len; k+=8)
|
|
{
|
|
sprintf(buf, "%.4x ", (uint) k);
|
|
for (l=0; l<8 && k+l<src_len; l++)
|
|
{
|
|
unsigned char c= src[k+l];
|
|
sprintf(buf, "%.2x ", (unsigned)c);
|
|
}
|
|
|
|
sprintf(buf, " ");
|
|
|
|
for (l=0; l<8 && k+l<dst_len; l++)
|
|
{
|
|
unsigned char c= dst[k+l];
|
|
sprintf(buf, "%.2x ", (unsigned)c);
|
|
}
|
|
diag("%s", buf);
|
|
}
|
|
diag("src length: %.8x, dst length: %.8x\n",
|
|
(uint) src_len, (uint) dst_len);
|
|
}
|
|
}
|
|
return exit_status();
|
|
}
|