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

Don't read ~/.my.cnf in mysqldump.test

Browse Source
This commit is contained in:
monty@mysql.com
2006-06-30 04:10:27 +03:00
parent 8e2099295d
commit a267b8f33c
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
heap/hp_test1.c
View File

@@ -59,7 +59,7 @@ int main(int argc, char **argv)
bzero((gptr) flags,sizeof(flags)); bzero((gptr) flags,sizeof(flags));
printf("- Creating heap-file\n"); printf("- Creating heap-file\n");
if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,101L, if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,10L,
&hp_create_info) || &hp_create_info) ||
!(file= heap_open(filename, 2))) !(file= heap_open(filename, 2)))
goto err; goto err;

18
mysql-test/mysql-test-run.sh
View File

@@ -1252,16 +1252,16 @@ start_master()
if [ x$DO_DDD = x1 ] if [ x$DO_DDD = x1 ]
then then
$ECHO "set args $master_args" > $GDB_MASTER_INIT $ECHO "set args $master_args" > $GDB_MASTER_INIT$1
manager_launch master ddd -display $DISPLAY --debugger \ manager_launch master ddd -display $DISPLAY --debugger \
"gdb -x $GDB_MASTER_INIT" $MASTER_MYSQLD "gdb -x $GDB_MASTER_INIT$1" $MASTER_MYSQLD
elif [ x$DO_GDB = x1 ] elif [ x$DO_GDB = x1 ]
then then
if [ x$MANUAL_GDB = x1 ] if [ x$MANUAL_GDB = x1 ]
then then
$ECHO "set args $master_args" > $GDB_MASTER_INIT $ECHO "set args $master_args" > $GDB_MASTER_INIT$1
$ECHO "To start gdb for the master , type in another window:" $ECHO "To start gdb for the master , type in another window:"
$ECHO "cd $CWD ; gdb -x $GDB_MASTER_INIT $MASTER_MYSQLD" $ECHO "cd $CWD ; gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD"
wait_for_master=1500 wait_for_master=1500
else else
( $ECHO set args $master_args; ( $ECHO set args $master_args;
@@ -1273,9 +1273,9 @@ disa 1
end end
r r
EOF EOF
fi ) > $GDB_MASTER_INIT fi ) > $GDB_MASTER_INIT$1
manager_launch master $XTERM -display $DISPLAY \ manager_launch master $XTERM -display $DISPLAY \
-title "Master" -e gdb -x $GDB_MASTER_INIT $MASTER_MYSQLD -title "Master" -e gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD
fi fi
else else
manager_launch master $MASTER_MYSQLD $master_args manager_launch master $MASTER_MYSQLD $master_args
@@ -1810,13 +1810,7 @@ then
mysql_install_db mysql_install_db
start_manager start_manager
# Do not automagically start daemons if we are in gdb or running only one test
# case
if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ]
then
mysql_start mysql_start
fi
$ECHO "Loading Standard Test Databases" $ECHO "Loading Standard Test Databases"
mysql_loadstd mysql_loadstd
fi fi

2
mysql-test/t/mysqldump.test
View File

@@ -652,7 +652,7 @@ drop table t1;
# BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence # BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
# #
--exec $MYSQL_MY_PRINT_DEFAULTS --defaults-extra-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump --exec $MYSQL_MY_PRINT_DEFAULTS --defaults-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump
# BUG #19025 mysqldump doesn't correctly dump "auto_increment = [int]" # BUG #19025 mysqldump doesn't correctly dump "auto_increment = [int]"

6
sql/ha_ndbcluster.cc
View File

@@ -2300,12 +2300,14 @@ void ha_ndbcluster::unpack_record(byte* buf)
{ {
// Table with hidden primary key // Table with hidden primary key
int hidden_no= table->fields; int hidden_no= table->fields;
char buff[22];
const NDBTAB *tab= (const NDBTAB *) m_table; const NDBTAB *tab= (const NDBTAB *) m_table;
const NDBCOL *hidden_col= tab->getColumn(hidden_no); const NDBCOL *hidden_col= tab->getColumn(hidden_no);
NdbRecAttr* rec= m_value[hidden_no].rec; NdbRecAttr* rec= m_value[hidden_no].rec;
DBUG_ASSERT(rec); DBUG_ASSERT(rec);
DBUG_PRINT("hidden", ("%d: %s \"%llu\"", hidden_no, DBUG_PRINT("hidden", ("%d: %s \"%s\"", hidden_no,
hidden_col->getName(), rec->u_64_value())); hidden_col->getName(),
llstr(rec->u_64_value(), buff)));
} }
print_results(); print_results();
#endif #endif