You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

1422 lines
36 KiB

Several fixes for Netware. client/client_priv.h: Added option auto close for Netware. client/mysql.cc: Added option auto close for Netware. client/mysqladmin.c: Added option auto close for Netware. client/mysqlbinlog.cc: Added option auto close for Netware. client/mysqlcheck.c: Added option auto close for Netware. client/mysqldump.c: Added option auto close for Netware. client/mysqlimport.c: Added option auto close for Netware. client/mysqlshow.c: Added option auto close for Netware. client/mysqltest.c: Fixed help messages for Netware. extra/my_print_defaults.c: Fixed help messages for Netware. extra/perror.c: Fixed help messages for Netware. extra/resolve_stack_dump.c: Fixed help messages for Netware. include/help_end.h: Fixed help messages for Netware. include/help_start.h: Fixed help messages for Netware. isam/isamchk.c: Added auto close of window for Netware isam/pack_isam.c: Added auto close of window for Netware myisam/myisamchk.c: Added auto close of window for Netware myisam/myisamlog.c: Added help for Netware. myisam/myisampack.c: Added auto close for Netware. netware/myisamchk.def: Scrollable screen patch. netware/mysql.def: Scrollable screen patch. netware/mysql_test_run.c: Fixed strindex for Netware. netware/mysqladmin.def: Scrollable screen patch. netware/mysqlbinlog.def: Scrollable screen patch. netware/mysqlcheck.def: Scrollable screen patch. netware/mysqld_safe.c: Removed debug message for Netware. netware/mysqldump.def: Scrollable screen patch. netware/mysqlimport.def: Scrollable screen patch. netware/mysqlshow.def: Scrollable screen patch. sql/mysqld.cc: Abnormal end patch when shutting down and volume not ready.
21 years ago
Several fixes for Netware. client/client_priv.h: Added option auto close for Netware. client/mysql.cc: Added option auto close for Netware. client/mysqladmin.c: Added option auto close for Netware. client/mysqlbinlog.cc: Added option auto close for Netware. client/mysqlcheck.c: Added option auto close for Netware. client/mysqldump.c: Added option auto close for Netware. client/mysqlimport.c: Added option auto close for Netware. client/mysqlshow.c: Added option auto close for Netware. client/mysqltest.c: Fixed help messages for Netware. extra/my_print_defaults.c: Fixed help messages for Netware. extra/perror.c: Fixed help messages for Netware. extra/resolve_stack_dump.c: Fixed help messages for Netware. include/help_end.h: Fixed help messages for Netware. include/help_start.h: Fixed help messages for Netware. isam/isamchk.c: Added auto close of window for Netware isam/pack_isam.c: Added auto close of window for Netware myisam/myisamchk.c: Added auto close of window for Netware myisam/myisamlog.c: Added help for Netware. myisam/myisampack.c: Added auto close for Netware. netware/myisamchk.def: Scrollable screen patch. netware/mysql.def: Scrollable screen patch. netware/mysql_test_run.c: Fixed strindex for Netware. netware/mysqladmin.def: Scrollable screen patch. netware/mysqlbinlog.def: Scrollable screen patch. netware/mysqlcheck.def: Scrollable screen patch. netware/mysqld_safe.c: Removed debug message for Netware. netware/mysqldump.def: Scrollable screen patch. netware/mysqlimport.def: Scrollable screen patch. netware/mysqlshow.def: Scrollable screen patch. sql/mysqld.cc: Abnormal end patch when shutting down and volume not ready.
21 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Bug #15327: configure: --with-tcp-port option being partially ignored make sure that if builder configured with a non-standard (!= 3306) default TCP port that value actually gets used throughout. if they didn't configure a value, assume "use a sensible default", which will be read from /etc/services or, failing that, from the factory default. That makes the order of preference - command-line option - my.cnf, where applicable - $MYSQL_TCP_PORT environment variable - /etc/services (unless configured --with-tcp-port) - default port (--with-tcp-port=... or factory default) client/mysql.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysql_upgrade.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqladmin.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlbinlog.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlcheck.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqldump.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlimport.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlmanagerc.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear configure.in: Bug #15327: configure: --with-tcp-port option being partially ignored If MYSQL_TCP_PORT defaulted in configure (factory default 3306 at the time of this writing), set MYSQL_TCP_PORT to factory default, then clear factory default after. That way, we lose no information, and we can distinguish between "defaulted" and the pathological case "builder specifically configured a port that coincides with factory default." This can in theory happen if builder configures and builds several servers from a script (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326). Not all that probable, but much preferable to having more "magic" happen in the server when we can solve this without any guesswork. client/mysqlshow.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqltest.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear include/mysql_version.h.in: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) libmysql/libmysql.c: Bug #15327: configure: --with-tcp-port option being partially ignored initialize default tcp port for client, like so: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) - environment variable MYSQL_TCP_PORT overrides this default - command-line option overrides all of the above mysql-test/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) mysql-test/mysql-test-run-shell.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) netware/mysql_test_run.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time netware/mysqld_safe.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time scripts/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) scripts/mysql_config.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) scripts/mysql_fix_privilege_tables.sh: Bug #15327: configure: --with-tcp-port option being partially ignored clarifying notice only scripts/mysqld_safe-watch.sh: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time server-tools/instance-manager/priv.h: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time sql/mysqld.cc: Bug #15327: configure: --with-tcp-port option being partially ignored if builder specifically requested a default port, use that (even if it coincides with our factory default). only if they didn't do we check /etc/services (and, failing on that, fall back to the factory default of 3306). either default can be overridden by the environment variable MYSQL_TCP_PORT, which in turn can be overridden with command line options. tests/mysql_client_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear tests/ssl_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time tests/thread_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear
19 years ago
Several Netware specific fixes. configure.in: To configure InnoDB for cross compilation. include/config-netware.h: NetWare specific change to fix the compilation errors caused by event.h NetWare specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3) netware/BUILD/compile-AUTOTOOLS: Netware specific change reflecting the change in source code directory structure. netware/BUILD/compile-linux-tools: Netware specific change to fix the location where gen_lex_hash gets created. Fixed also directory structure reflecting changes. netware/BUILD/compile-netware-END: Netware specific change for creating mysqld_error.h netware/BUILD/mwenv: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/BUILD/nwbootstrap: NetWare Specific change to produce absoulte path for XDC file. netware/Makefile.am: Netware specific changes to fix to match new directory structure. netware/my_manage.h: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/mysql_test_run.c: Netware specific change, added --autoclose option for mysql_test_run.nlm. scripts/make_binary_distribution.sh: Fix to reflect change in directory structure. sql/mysqld.cc: Stacksize change for Netware. Netware specific change to fix the compilation errors caused by event.h sql/set_var.cc: Minor indending related fix. sql/sql_class.cc: Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro. storage/innobase/os/os0thread.c: Netware specific change to increase the thread stack size. storage/myisam/mi_locking.c: Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
20 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
Several Netware specific fixes. configure.in: To configure InnoDB for cross compilation. include/config-netware.h: NetWare specific change to fix the compilation errors caused by event.h NetWare specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3) netware/BUILD/compile-AUTOTOOLS: Netware specific change reflecting the change in source code directory structure. netware/BUILD/compile-linux-tools: Netware specific change to fix the location where gen_lex_hash gets created. Fixed also directory structure reflecting changes. netware/BUILD/compile-netware-END: Netware specific change for creating mysqld_error.h netware/BUILD/mwenv: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/BUILD/nwbootstrap: NetWare Specific change to produce absoulte path for XDC file. netware/Makefile.am: Netware specific changes to fix to match new directory structure. netware/my_manage.h: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/mysql_test_run.c: Netware specific change, added --autoclose option for mysql_test_run.nlm. scripts/make_binary_distribution.sh: Fix to reflect change in directory structure. sql/mysqld.cc: Stacksize change for Netware. Netware specific change to fix the compilation errors caused by event.h sql/set_var.cc: Minor indending related fix. sql/sql_class.cc: Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro. storage/innobase/os/os0thread.c: Netware specific change to increase the thread stack size. storage/myisam/mi_locking.c: Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
20 years ago
Several Netware specific fixes. configure.in: To configure InnoDB for cross compilation. include/config-netware.h: NetWare specific change to fix the compilation errors caused by event.h NetWare specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3) netware/BUILD/compile-AUTOTOOLS: Netware specific change reflecting the change in source code directory structure. netware/BUILD/compile-linux-tools: Netware specific change to fix the location where gen_lex_hash gets created. Fixed also directory structure reflecting changes. netware/BUILD/compile-netware-END: Netware specific change for creating mysqld_error.h netware/BUILD/mwenv: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/BUILD/nwbootstrap: NetWare Specific change to produce absoulte path for XDC file. netware/Makefile.am: Netware specific changes to fix to match new directory structure. netware/my_manage.h: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/mysql_test_run.c: Netware specific change, added --autoclose option for mysql_test_run.nlm. scripts/make_binary_distribution.sh: Fix to reflect change in directory structure. sql/mysqld.cc: Stacksize change for Netware. Netware specific change to fix the compilation errors caused by event.h sql/set_var.cc: Minor indending related fix. sql/sql_class.cc: Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro. storage/innobase/os/os0thread.c: Netware specific change to increase the thread stack size. storage/myisam/mi_locking.c: Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
20 years ago
Several Netware specific fixes. configure.in: To configure InnoDB for cross compilation. include/config-netware.h: NetWare specific change to fix the compilation errors caused by event.h NetWare specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3) netware/BUILD/compile-AUTOTOOLS: Netware specific change reflecting the change in source code directory structure. netware/BUILD/compile-linux-tools: Netware specific change to fix the location where gen_lex_hash gets created. Fixed also directory structure reflecting changes. netware/BUILD/compile-netware-END: Netware specific change for creating mysqld_error.h netware/BUILD/mwenv: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/BUILD/nwbootstrap: NetWare Specific change to produce absoulte path for XDC file. netware/Makefile.am: Netware specific changes to fix to match new directory structure. netware/my_manage.h: Netware specific change required for WINE PATH and for new versions LibC(Jun 05) and zlib(1.2.3). netware/mysql_test_run.c: Netware specific change, added --autoclose option for mysql_test_run.nlm. scripts/make_binary_distribution.sh: Fix to reflect change in directory structure. sql/mysqld.cc: Stacksize change for Netware. Netware specific change to fix the compilation errors caused by event.h sql/set_var.cc: Minor indending related fix. sql/sql_class.cc: Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro. storage/innobase/os/os0thread.c: Netware specific change to increase the thread stack size. storage/myisam/mi_locking.c: Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
20 years ago
Changed prototype of killed_ptr() to make it more portable Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
22 years ago
  1. /*
  2. Copyright (c) 2002, 2003 Novell, Inc. All Rights Reserved.
  3. This program is free software; you can redistribute it and/or modify
  4. it under the terms of the GNU General Public License as published by
  5. the Free Software Foundation; either version 2 of the License, or
  6. (at your option) any later version.
  7. This program is distributed in the hope that it will be useful,
  8. but WITHOUT ANY WARRANTY; without even the implied warranty of
  9. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  10. GNU General Public License for more details.
  11. You should have received a copy of the GNU General Public License
  12. along with this program; if not, write to the Free Software
  13. Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  14. */
  15. #include <my_global.h>
  16. #include <m_string.h>
  17. #include <dirent.h>
  18. #include <screen.h>
  19. #include <nks/vm.h>
  20. #include <ctype.h>
  21. #include <sys/stat.h>
  22. #include <sys/mode.h>
  23. #include "my_manage.h"
  24. #include "mysql_version.h"
  25. #ifdef __NETWARE__
  26. #define strindex(a,b) ((char*)strindex(a,b))
  27. #define strstr(a,b) ((char*)strstr(a,b))
  28. #endif
  29. /******************************************************************************
  30. macros
  31. ******************************************************************************/
  32. #define HEADER "TEST ELAPSED RESULT \n"
  33. #define DASH "------------------------------------------------------------------------\n"
  34. #define NW_TEST_SUFFIX ".nw-test"
  35. #define NW_RESULT_SUFFIX ".nw-result"
  36. #define TEST_SUFFIX ".test"
  37. #define RESULT_SUFFIX ".result"
  38. #define REJECT_SUFFIX ".reject"
  39. #define OUT_SUFFIX ".out"
  40. #define ERR_SUFFIX ".err"
  41. #define TEST_PASS "[ pass ]"
  42. #define TEST_SKIP "[ skip ]"
  43. #define TEST_FAIL "[ fail ]"
  44. #define TEST_BAD "[ bad ]"
  45. #define TEST_IGNORE "[ignore]"
  46. /******************************************************************************
  47. global variables
  48. ******************************************************************************/
  49. char base_dir[PATH_MAX] = "sys:/mysql";
  50. char db[PATH_MAX] = "test";
  51. char user[PATH_MAX] = "root";
  52. char password[PATH_MAX] = "";
  53. int master_port = 9306;
  54. int slave_port = 9307;
  55. // comma delimited list of tests to skip or empty string
  56. char skip_test[PATH_MAX] = " lowercase_table3 , system_mysql_db_fix ";
  57. char ignore_test[PATH_MAX] = "";
  58. char bin_dir[PATH_MAX];
  59. char mysql_test_dir[PATH_MAX];
  60. char test_dir[PATH_MAX];
  61. char mysql_tmp_dir[PATH_MAX];
  62. char result_dir[PATH_MAX];
  63. char master_dir[PATH_MAX];
  64. char slave_dir[PATH_MAX];
  65. char lang_dir[PATH_MAX];
  66. char char_dir[PATH_MAX];
  67. char mysqladmin_file[PATH_MAX];
  68. char mysqld_file[PATH_MAX];
  69. char mysqltest_file[PATH_MAX];
  70. char master_pid[PATH_MAX];
  71. char slave_pid[PATH_MAX];
  72. char master_opt[PATH_MAX] = "";
  73. char slave_opt[PATH_MAX] = "";
  74. char slave_master_info[PATH_MAX] = "";
  75. char master_init_script[PATH_MAX] = "";
  76. char slave_init_script[PATH_MAX] = "";
  77. // OpenSSL
  78. char ca_cert[PATH_MAX];
  79. char server_cert[PATH_MAX];
  80. char server_key[PATH_MAX];
  81. char client_cert[PATH_MAX];
  82. char client_key[PATH_MAX];
  83. int total_skip = 0;
  84. int total_pass = 0;
  85. int total_fail = 0;
  86. int total_test = 0;
  87. int total_ignore = 0;
  88. double total_time = 0;
  89. int use_openssl = FALSE;
  90. int master_running = FALSE;
  91. int slave_running = FALSE;
  92. int skip_slave = TRUE;
  93. int single_test = TRUE;
  94. int restarts = 0;
  95. FILE *log_fd = NULL;
  96. /******************************************************************************
  97. functions
  98. ******************************************************************************/
  99. /******************************************************************************
  100. prototypes
  101. ******************************************************************************/
  102. void report_stats();
  103. void install_db(char *);
  104. void mysql_install_db();
  105. void start_master();
  106. void start_slave();
  107. void mysql_start();
  108. void stop_slave();
  109. void stop_master();
  110. void mysql_stop();
  111. void mysql_restart();
  112. int read_option(char *, char *);
  113. void run_test(char *);
  114. void setup(char *);
  115. void vlog(char *, va_list);
  116. void log_msg(char *, ...);
  117. void log_info(char *, ...);
  118. void log_error(char *, ...);
  119. void log_errno(char *, ...);
  120. void die(char *);
  121. char *str_tok(char *string, const char *delim);
  122. /******************************************************************************
  123. report_stats()
  124. Report the gathered statistics.
  125. ******************************************************************************/
  126. void report_stats()
  127. {
  128. if (total_fail == 0)
  129. {
  130. log_msg("\nAll %d test(s) were successful.\n", total_test);
  131. }
  132. else
  133. {
  134. double percent = ((double)total_pass / total_test) * 100;
  135. log_msg("\nFailed %u/%u test(s), %.02f%% successful.\n",
  136. total_fail, total_test, percent);
  137. log_msg("\nThe .out and .err files in %s may give you some\n", result_dir);
  138. log_msg("hint of what went wrong.\n");
  139. log_msg("\nIf you want to report this error, please first read the documentation\n");
  140. log_msg("at: http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html\n");
  141. }
  142. log_msg("\n%.02f total minutes elapsed in the test cases\n\n", total_time / 60);
  143. }
  144. /******************************************************************************
  145. install_db()
  146. Install the a database.
  147. ******************************************************************************/
  148. void install_db(char *datadir)
  149. {
  150. arg_list_t al;
  151. int err, i;
  152. char input[PATH_MAX];
  153. char output[PATH_MAX];
  154. char error[PATH_MAX];
  155. // input file
  156. snprintf(input, PATH_MAX, "%s/bin/test_db.sql", base_dir);
  157. snprintf(output, PATH_MAX, "%s/install.out", datadir);
  158. snprintf(error, PATH_MAX, "%s/install.err", datadir);
  159. // args
  160. init_args(&al);
  161. add_arg(&al, mysqld_file);
  162. add_arg(&al, "--no-defaults");
  163. add_arg(&al, "--bootstrap");
  164. add_arg(&al, "--skip-grant-tables");
  165. add_arg(&al, "--basedir=%s", base_dir);
  166. add_arg(&al, "--datadir=%s", datadir);
  167. add_arg(&al, "--skip-innodb");
  168. // spawn
  169. if ((err = spawn(mysqld_file, &al, TRUE, input, output, error)) != 0)
  170. {
  171. die("Unable to create database.");
  172. }
  173. // free args
  174. free_args(&al);
  175. }
  176. /******************************************************************************
  177. mysql_install_db()
  178. Install the test databases.
  179. ******************************************************************************/
  180. void mysql_install_db()
  181. {
  182. char temp[PATH_MAX];
  183. // var directory
  184. snprintf(temp, PATH_MAX, "%s/var", mysql_test_dir);
  185. // clean up old direcotry
  186. del_tree(temp);
  187. // create var directory
  188. mkdir(temp, S_IRWXU);
  189. // create subdirectories
  190. log_msg("Creating test-suite folders...\n");
  191. snprintf(temp, PATH_MAX, "%s/var/run", mysql_test_dir);
  192. mkdir(temp, S_IRWXU);
  193. snprintf(temp, PATH_MAX, "%s/var/tmp", mysql_test_dir);
  194. mkdir(temp, S_IRWXU);
  195. snprintf(temp, PATH_MAX, "%s/var/master-data", mysql_test_dir);
  196. mkdir(temp, S_IRWXU);
  197. snprintf(temp, PATH_MAX, "%s/var/master-data/mysql", mysql_test_dir);
  198. mkdir(temp, S_IRWXU);
  199. snprintf(temp, PATH_MAX, "%s/var/master-data/test", mysql_test_dir);
  200. mkdir(temp, S_IRWXU);
  201. snprintf(temp, PATH_MAX, "%s/var/slave-data", mysql_test_dir);
  202. mkdir(temp, S_IRWXU);
  203. snprintf(temp, PATH_MAX, "%s/var/slave-data/mysql", mysql_test_dir);
  204. mkdir(temp, S_IRWXU);
  205. snprintf(temp, PATH_MAX, "%s/var/slave-data/test", mysql_test_dir);
  206. mkdir(temp, S_IRWXU);
  207. // install databases
  208. log_msg("Creating test databases for master... \n");
  209. install_db(master_dir);
  210. log_msg("Creating test databases for slave... \n");
  211. install_db(slave_dir);
  212. }
  213. /******************************************************************************
  214. start_master()
  215. Start the master server.
  216. ******************************************************************************/
  217. void start_master()
  218. {
  219. arg_list_t al;
  220. int err, i;
  221. char master_out[PATH_MAX];
  222. char master_err[PATH_MAX];
  223. char temp[PATH_MAX], temp2[PATH_MAX];
  224. // remove old berkeley db log files that can confuse the server
  225. removef("%s/log.*", master_dir);
  226. // remove stale binary logs
  227. removef("%s/var/log/*-bin.*", mysql_test_dir);
  228. // remove stale binary logs
  229. removef("%s/var/log/*.index", mysql_test_dir);
  230. // remove master.info file
  231. removef("%s/master.info", master_dir);
  232. // remove relay files
  233. removef("%s/var/log/*relay*", mysql_test_dir);
  234. // remove relay-log.info file
  235. removef("%s/relay-log.info", master_dir);
  236. // init script
  237. if (master_init_script[0] != NULL)
  238. {
  239. // run_init_script(master_init_script);
  240. // TODO: use the scripts
  241. if (strindex(master_init_script, "repair_part2-master.sh") != NULL)
  242. {
  243. FILE *fp;
  244. // create an empty index file
  245. snprintf(temp, PATH_MAX, "%s/test/t1.MYI", master_dir);
  246. fp = fopen(temp, "wb+");
  247. fputs("1", fp);
  248. fclose(fp);
  249. }
  250. }
  251. // redirection files
  252. snprintf(master_out, PATH_MAX, "%s/var/run/master%u.out",
  253. mysql_test_dir, restarts);
  254. snprintf(master_err, PATH_MAX, "%s/var/run/master%u.err",
  255. mysql_test_dir, restarts);
  256. snprintf(temp2,PATH_MAX,"%s/var",mysql_test_dir);
  257. mkdir(temp2,0);
  258. snprintf(temp2,PATH_MAX,"%s/var/log",mysql_test_dir);
  259. mkdir(temp2,0);
  260. // args
  261. init_args(&al);
  262. add_arg(&al, "%s", mysqld_file);
  263. add_arg(&al, "--no-defaults");
  264. add_arg(&al, "--log-bin=%s/var/log/master-bin",mysql_test_dir);
  265. add_arg(&al, "--server-id=1");
  266. add_arg(&al, "--basedir=%s", base_dir);
  267. add_arg(&al, "--port=%u", master_port);
  268. add_arg(&al, "--local-infile");
  269. add_arg(&al, "--core");
  270. add_arg(&al, "--datadir=%s", master_dir);
  271. add_arg(&al, "--pid-file=%s", master_pid);
  272. add_arg(&al, "--character-sets-dir=%s", char_dir);
  273. add_arg(&al, "--tmpdir=%s", mysql_tmp_dir);
  274. add_arg(&al, "--language=%s", lang_dir);
  275. add_arg(&al, "--log-bin-trust-routine-creators");
  276. add_arg(&al, "--log-slow-queries");
  277. add_arg(&al, "--log-queries-not-using-indexes");
  278. #ifdef DEBUG //only for debug builds
  279. add_arg(&al, "--debug");
  280. #endif
  281. if (use_openssl)
  282. {
  283. add_arg(&al, "--ssl-ca=%s", ca_cert);
  284. add_arg(&al, "--ssl-cert=%s", server_cert);
  285. add_arg(&al, "--ssl-key=%s", server_key);
  286. }
  287. // $MASTER_40_ARGS
  288. add_arg(&al, "--rpl-recovery-rank=1");
  289. add_arg(&al, "--init-rpl-role=master");
  290. // $SMALL_SERVER
  291. add_arg(&al, "-O");
  292. add_arg(&al, "key_buffer_size=1M");
  293. add_arg(&al, "-O");
  294. add_arg(&al, "sort_buffer=256K");
  295. add_arg(&al, "-O");
  296. add_arg(&al, "max_heap_table_size=1M");
  297. // $EXTRA_MASTER_OPT
  298. if (master_opt[0] != NULL)
  299. {
  300. char *p;
  301. p = (char *)str_tok(master_opt, " \t");
  302. if (!strstr(master_opt, "timezone"))
  303. {
  304. while (p)
  305. {
  306. add_arg(&al, "%s", p);
  307. p = (char *)str_tok(NULL, " \t");
  308. }
  309. }
  310. }
  311. // remove the pid file if it exists
  312. remove(master_pid);
  313. // spawn
  314. if ((err= spawn(mysqld_file, &al, FALSE, NULL, master_out, master_err)) == 0)
  315. {
  316. sleep_until_file_exists(master_pid);
  317. if ((err = wait_for_server_start(bin_dir, user, password, master_port,
  318. mysql_tmp_dir)) == 0)
  319. {
  320. master_running = TRUE;
  321. }
  322. else
  323. {
  324. log_error("The master server went down early.");
  325. }
  326. }
  327. else
  328. {
  329. log_error("Unable to start master server.");
  330. }
  331. // free_args
  332. free_args(&al);
  333. }
  334. /******************************************************************************
  335. start_slave()
  336. Start the slave server.
  337. ******************************************************************************/
  338. void start_slave()
  339. {
  340. arg_list_t al;
  341. int err, i;
  342. char slave_out[PATH_MAX];
  343. char slave_err[PATH_MAX];
  344. char temp[PATH_MAX];
  345. // skip?
  346. if (skip_slave) return;
  347. // remove stale binary logs
  348. removef("%s/*-bin.*", slave_dir);
  349. // remove stale binary logs
  350. removef("%s/*.index", slave_dir);
  351. // remove master.info file
  352. removef("%s/master.info", slave_dir);
  353. // remove relay files
  354. removef("%s/var/log/*relay*", mysql_test_dir);
  355. // remove relay-log.info file
  356. removef("%s/relay-log.info", slave_dir);
  357. // init script
  358. if (slave_init_script[0] != NULL)
  359. {
  360. // run_init_script(slave_init_script);
  361. // TODO: use the scripts
  362. if (strindex(slave_init_script, "rpl000016-slave.sh") != NULL)
  363. {
  364. // create empty master.info file
  365. snprintf(temp, PATH_MAX, "%s/master.info", slave_dir);
  366. close(open(temp, O_WRONLY | O_CREAT,S_IRWXU|S_IRWXG|S_IRWXO));
  367. }
  368. else if (strindex(slave_init_script, "rpl000017-slave.sh") != NULL)
  369. {
  370. FILE *fp;
  371. // create a master.info file
  372. snprintf(temp, PATH_MAX, "%s/master.info", slave_dir);
  373. fp = fopen(temp, "wb+");
  374. fputs("master-bin.000001\n", fp);
  375. fputs("4\n", fp);
  376. fputs("127.0.0.1\n", fp);
  377. fputs("replicate\n", fp);
  378. fputs("aaaaaaaaaaaaaaab\n", fp);
  379. fputs("9306\n", fp);
  380. fputs("1\n", fp);
  381. fputs("0\n", fp);
  382. fclose(fp);
  383. }
  384. else if (strindex(slave_init_script, "rpl_rotate_logs-slave.sh") != NULL)
  385. {
  386. // create empty master.info file
  387. snprintf(temp, PATH_MAX, "%s/master.info", slave_dir);
  388. close(open(temp, O_WRONLY | O_CREAT,S_IRWXU|S_IRWXG|S_IRWXO));
  389. }
  390. }
  391. // redirection files
  392. snprintf(slave_out, PATH_MAX, "%s/var/run/slave%u.out",
  393. mysql_test_dir, restarts);
  394. snprintf(slave_err, PATH_MAX, "%s/var/run/slave%u.err",
  395. mysql_test_dir, restarts);
  396. // args
  397. init_args(&al);
  398. add_arg(&al, "%s", mysqld_file);
  399. add_arg(&al, "--no-defaults");
  400. add_arg(&al, "--log-bin=slave-bin");
  401. add_arg(&al, "--relay_log=slave-relay-bin");
  402. add_arg(&al, "--basedir=%s", base_dir);
  403. add_arg(&al, "--port=%u", slave_port);
  404. add_arg(&al, "--datadir=%s", slave_dir);
  405. add_arg(&al, "--pid-file=%s", slave_pid);
  406. add_arg(&al, "--character-sets-dir=%s", char_dir);
  407. add_arg(&al, "--core");
  408. add_arg(&al, "--tmpdir=%s", mysql_tmp_dir);
  409. add_arg(&al, "--language=%s", lang_dir);
  410. add_arg(&al, "--exit-info=256");
  411. add_arg(&al, "--log-slave-updates");
  412. add_arg(&al, "--init-rpl-role=slave");
  413. add_arg(&al, "--skip-innodb");
  414. add_arg(&al, "--skip-slave-start");
  415. add_arg(&al, "--slave-load-tmpdir=../../var/tmp");
  416. add_arg(&al, "--report-user=%s", user);
  417. add_arg(&al, "--report-host=127.0.0.1");
  418. add_arg(&al, "--report-port=%u", slave_port);
  419. add_arg(&al, "--master-retry-count=10");
  420. add_arg(&al, "-O");
  421. add_arg(&al, "slave_net_timeout=10");
  422. add_arg(&al, "--log-bin-trust-routine-creators");
  423. add_arg(&al, "--log-slow-queries");
  424. add_arg(&al, "--log-queries-not-using-indexes");
  425. #ifdef DEBUG //only for debug builds
  426. add_arg(&al, "--debug");
  427. #endif
  428. if (use_openssl)
  429. {
  430. add_arg(&al, "--ssl-ca=%s", ca_cert);
  431. add_arg(&al, "--ssl-cert=%s", server_cert);
  432. add_arg(&al, "--ssl-key=%s", server_key);
  433. }
  434. // slave master info
  435. if (slave_master_info[0] != NULL)
  436. {
  437. char *p;
  438. p = (char *)str_tok(slave_master_info, " \t");
  439. while(p)
  440. {
  441. add_arg(&al, "%s", p);
  442. p = (char *)str_tok(NULL, " \t");
  443. }
  444. }
  445. else
  446. {
  447. add_arg(&al, "--master-user=%s", user);
  448. add_arg(&al, "--master-password=%s", password);
  449. add_arg(&al, "--master-host=127.0.0.1");
  450. add_arg(&al, "--master-port=%u", master_port);
  451. add_arg(&al, "--master-connect-retry=1");
  452. add_arg(&al, "--server-id=2");
  453. add_arg(&al, "--rpl-recovery-rank=2");
  454. }
  455. // small server
  456. add_arg(&al, "-O");
  457. add_arg(&al, "key_buffer_size=1M");
  458. add_arg(&al, "-O");
  459. add_arg(&al, "sort_buffer=256K");
  460. add_arg(&al, "-O");
  461. add_arg(&al, "max_heap_table_size=1M");
  462. // opt args
  463. if (slave_opt[0] != NULL)
  464. {
  465. char *p;
  466. p = (char *)str_tok(slave_opt, " \t");
  467. while(p)
  468. {
  469. add_arg(&al, "%s", p);
  470. p = (char *)str_tok(NULL, " \t");
  471. }
  472. }
  473. // remove the pid file if it exists
  474. remove(slave_pid);
  475. // spawn
  476. if ((err = spawn(mysqld_file, &al, FALSE, NULL, slave_out, slave_err)) == 0)
  477. {
  478. sleep_until_file_exists(slave_pid);
  479. if ((err = wait_for_server_start(bin_dir, user, password, slave_port,
  480. mysql_tmp_dir)) == 0)
  481. {
  482. slave_running = TRUE;
  483. }
  484. else
  485. {
  486. log_error("The slave server went down early.");
  487. }
  488. }
  489. else
  490. {
  491. log_error("Unable to start slave server.");
  492. }
  493. // free args
  494. free_args(&al);
  495. }
  496. /******************************************************************************
  497. mysql_start()
  498. Start the mysql servers.
  499. ******************************************************************************/
  500. void mysql_start()
  501. {
  502. log_info("Starting the MySQL server(s): %u", ++restarts);
  503. start_master();
  504. start_slave();
  505. // activate the test screen
  506. ActivateScreen(getscreenhandle());
  507. }
  508. /******************************************************************************
  509. stop_slave()
  510. Stop the slave server.
  511. ******************************************************************************/
  512. void stop_slave()
  513. {
  514. int err;
  515. // running?
  516. if (!slave_running) return;
  517. // stop
  518. if ((err = stop_server(bin_dir, user, password, slave_port, slave_pid,
  519. mysql_tmp_dir)) == 0)
  520. {
  521. slave_running = FALSE;
  522. }
  523. else
  524. {
  525. log_error("Unable to stop slave server.");
  526. }
  527. }
  528. /******************************************************************************
  529. stop_master()
  530. Stop the master server.
  531. ******************************************************************************/
  532. void stop_master()
  533. {
  534. int err;
  535. // running?
  536. if (!master_running) return;
  537. if ((err = stop_server(bin_dir, user, password, master_port, master_pid,
  538. mysql_tmp_dir)) == 0)
  539. {
  540. master_running = FALSE;
  541. }
  542. else
  543. {
  544. log_error("Unable to stop master server.");
  545. }
  546. }
  547. /******************************************************************************
  548. mysql_stop()
  549. Stop the mysql servers.
  550. ******************************************************************************/
  551. void mysql_stop()
  552. {
  553. log_info("Stopping the MySQL server(s)...");
  554. stop_master();
  555. stop_slave();
  556. // activate the test screen
  557. ActivateScreen(getscreenhandle());
  558. }
  559. /******************************************************************************
  560. mysql_restart()
  561. Restart the mysql servers.
  562. ******************************************************************************/
  563. void mysql_restart()
  564. {
  565. log_info("Restarting the MySQL server(s): %u", ++restarts);
  566. mysql_stop();
  567. mysql_start();
  568. }
  569. /******************************************************************************
  570. read_option()
  571. Read the option file.
  572. ******************************************************************************/
  573. int read_option(char *opt_file, char *opt)
  574. {
  575. int fd, err;
  576. int result;
  577. char *p;
  578. char buf[PATH_MAX];
  579. // copy current option
  580. strncpy(buf, opt, PATH_MAX);
  581. // open options file
  582. fd = open(opt_file, O_RDONLY);
  583. err = read(fd, opt, PATH_MAX);
  584. close(fd);
  585. if (err > 0)
  586. {
  587. // terminate string
  588. if ((p = strchr(opt, '\n')) != NULL)
  589. {
  590. *p = NULL;
  591. // check for a '\r'
  592. if ((p = strchr(opt, '\r')) != NULL)
  593. {
  594. *p = NULL;
  595. }
  596. }
  597. else
  598. {
  599. opt[err] = NULL;
  600. }
  601. // check for $MYSQL_TEST_DIR
  602. if ((p = strstr(opt, "$MYSQL_TEST_DIR")) != NULL)
  603. {
  604. char temp[PATH_MAX];
  605. *p = NULL;
  606. strcpy(temp, p + strlen("$MYSQL_TEST_DIR"));
  607. strcat(opt, mysql_test_dir);
  608. strcat(opt, temp);
  609. }
  610. // Check for double backslash and replace it with single bakslash
  611. if ((p = strstr(opt, "\\\\")) != NULL)
  612. {
  613. /* bmove is guranteed to work byte by byte */
  614. bmove(p, p+1, strlen(p+1));
  615. }
  616. }
  617. else
  618. {
  619. // clear option
  620. *opt = NULL;
  621. }
  622. // compare current option with previous
  623. return strcmp(opt, buf);
  624. }
  625. /******************************************************************************
  626. run_test()
  627. Run the given test case.
  628. ******************************************************************************/
  629. void run_test(char *test)
  630. {
  631. char temp[PATH_MAX];
  632. char *rstr;
  633. double elapsed = 0;
  634. int skip = FALSE, ignore=FALSE;
  635. int restart = FALSE;
  636. int flag = FALSE;
  637. struct stat info;
  638. // skip tests in the skip list
  639. snprintf(temp, PATH_MAX, " %s ", test);
  640. skip = (strindex(skip_test, temp) != NULL);
  641. if (skip == FALSE)
  642. ignore = (strindex(ignore_test, temp) != NULL);
  643. if (ignore)
  644. {
  645. // show test
  646. log_msg("%-46s ", test);
  647. // ignore
  648. rstr = TEST_IGNORE;
  649. ++total_ignore;
  650. }
  651. else if (!skip) // skip test?
  652. {
  653. char test_file[PATH_MAX];
  654. char master_opt_file[PATH_MAX];
  655. char slave_opt_file[PATH_MAX];
  656. char slave_master_info_file[PATH_MAX];
  657. char result_file[PATH_MAX];
  658. char reject_file[PATH_MAX];
  659. char out_file[PATH_MAX];
  660. char err_file[PATH_MAX];
  661. int err;
  662. arg_list_t al;
  663. NXTime_t start, stop;
  664. // skip slave?
  665. flag = skip_slave;
  666. skip_slave = (strncmp(test, "rpl", 3) != 0);
  667. if (flag != skip_slave) restart = TRUE;
  668. // create files
  669. snprintf(master_opt_file, PATH_MAX, "%s/%s-master.opt", test_dir, test);
  670. snprintf(slave_opt_file, PATH_MAX, "%s/%s-slave.opt", test_dir, test);
  671. snprintf(slave_master_info_file, PATH_MAX, "%s/%s.slave-mi", test_dir, test);
  672. snprintf(reject_file, PATH_MAX, "%s/%s%s", result_dir, test, REJECT_SUFFIX);
  673. snprintf(out_file, PATH_MAX, "%s/%s%s", result_dir, test, OUT_SUFFIX);
  674. snprintf(err_file, PATH_MAX, "%s/%s%s", result_dir, test, ERR_SUFFIX);
  675. // netware specific files
  676. snprintf(test_file, PATH_MAX, "%s/%s%s", test_dir, test, NW_TEST_SUFFIX);
  677. if (stat(test_file, &info))
  678. {
  679. snprintf(test_file, PATH_MAX, "%s/%s%s", test_dir, test, TEST_SUFFIX);
  680. if (access(test_file,0))
  681. {
  682. printf("Invalid test name %s, %s file not found\n",test,test_file);
  683. return;
  684. }
  685. }
  686. snprintf(result_file, PATH_MAX, "%s/%s%s", result_dir, test, NW_RESULT_SUFFIX);
  687. if (stat(result_file, &info))
  688. {
  689. snprintf(result_file, PATH_MAX, "%s/%s%s", result_dir, test, RESULT_SUFFIX);
  690. }
  691. // init scripts
  692. snprintf(master_init_script, PATH_MAX, "%s/%s-master.sh", test_dir, test);
  693. if (stat(master_init_script, &info))
  694. master_init_script[0] = NULL;
  695. else
  696. restart = TRUE;
  697. snprintf(slave_init_script, PATH_MAX, "%s/%s-slave.sh", test_dir, test);
  698. if (stat(slave_init_script, &info))
  699. slave_init_script[0] = NULL;
  700. else
  701. restart = TRUE;
  702. // read options
  703. if (read_option(master_opt_file, master_opt)) restart = TRUE;
  704. if (read_option(slave_opt_file, slave_opt)) restart = TRUE;
  705. if (read_option(slave_master_info_file, slave_master_info)) restart = TRUE;
  706. // cleanup previous run
  707. remove(reject_file);
  708. remove(out_file);
  709. remove(err_file);
  710. // start or restart?
  711. if (!master_running) mysql_start();
  712. else if (restart) mysql_restart();
  713. // let the system stabalize
  714. sleep(1);
  715. // show test
  716. log_msg("%-46s ", test);
  717. // args
  718. init_args(&al);
  719. add_arg(&al, "%s", mysqltest_file);
  720. add_arg(&al, "--no-defaults");
  721. add_arg(&al, "--port=%u", master_port);
  722. add_arg(&al, "--database=%s", db);
  723. add_arg(&al, "--user=%s", user);
  724. add_arg(&al, "--password=%s", password);
  725. add_arg(&al, "--silent");
  726. add_arg(&al, "--basedir=%s/", mysql_test_dir);
  727. add_arg(&al, "--host=127.0.0.1");
  728. add_arg(&al, "-v");
  729. add_arg(&al, "-R");
  730. add_arg(&al, "%s", result_file);
  731. if (use_openssl)
  732. {
  733. add_arg(&al, "--ssl-ca=%s", ca_cert);
  734. add_arg(&al, "--ssl-cert=%s", client_cert);
  735. add_arg(&al, "--ssl-key=%s", client_key);
  736. }
  737. // start timer
  738. NXGetTime(NX_SINCE_BOOT, NX_USECONDS, &start);
  739. // spawn
  740. err = spawn(mysqltest_file, &al, TRUE, test_file, out_file, err_file);
  741. // stop timer
  742. NXGetTime(NX_SINCE_BOOT, NX_USECONDS, &stop);
  743. // calculate
  744. elapsed = ((double)(stop - start)) / NX_USECONDS;
  745. total_time += elapsed;
  746. // free args
  747. free_args(&al);
  748. if (err == 0)
  749. {
  750. // pass
  751. rstr = TEST_PASS;
  752. ++total_pass;
  753. // increment total
  754. ++total_test;
  755. }
  756. else if (err == 62)
  757. {
  758. // skip
  759. rstr = TEST_SKIP;
  760. ++total_skip;
  761. }
  762. else if (err == 1)
  763. {
  764. // fail
  765. rstr = TEST_FAIL;
  766. ++total_fail;
  767. // increment total
  768. ++total_test;
  769. }
  770. else
  771. {
  772. rstr = TEST_BAD;
  773. }
  774. }
  775. else // early skips
  776. {
  777. // show test
  778. log_msg("%-46s ", test);
  779. // skip
  780. rstr = TEST_SKIP;
  781. ++total_skip;
  782. }
  783. // result
  784. log_msg("%10.06f %-14s\n", elapsed, rstr);
  785. }
  786. /******************************************************************************
  787. vlog()
  788. Log the message.
  789. ******************************************************************************/
  790. void vlog(char *format, va_list ap)
  791. {
  792. vfprintf(stdout, format, ap);
  793. fflush(stdout);
  794. if (log_fd)
  795. {
  796. vfprintf(log_fd, format, ap);
  797. fflush(log_fd);
  798. }
  799. }
  800. /******************************************************************************
  801. log()
  802. Log the message.
  803. ******************************************************************************/
  804. void log_msg(char *format, ...)
  805. {
  806. va_list ap;
  807. va_start(ap, format);
  808. vlog(format, ap);
  809. va_end(ap);
  810. }
  811. /******************************************************************************
  812. log_info()
  813. Log the given information.
  814. ******************************************************************************/
  815. void log_info(char *format, ...)
  816. {
  817. va_list ap;
  818. va_start(ap, format);
  819. log_msg("-- INFO : ");
  820. vlog(format, ap);
  821. log_msg("\n");
  822. va_end(ap);
  823. }
  824. /******************************************************************************
  825. log_error()
  826. Log the given error.
  827. ******************************************************************************/
  828. void log_error(char *format, ...)
  829. {
  830. va_list ap;
  831. va_start(ap, format);
  832. log_msg("-- ERROR: ");
  833. vlog(format, ap);
  834. log_msg("\n");
  835. va_end(ap);
  836. }
  837. /******************************************************************************
  838. log_errno()
  839. Log the given error and errno.
  840. ******************************************************************************/
  841. void log_errno(char *format, ...)
  842. {
  843. va_list ap;
  844. va_start(ap, format);
  845. log_msg("-- ERROR: (%003u) ", errno);
  846. vlog(format, ap);
  847. log_msg("\n");
  848. va_end(ap);
  849. }
  850. /******************************************************************************
  851. die()
  852. Exit the application.
  853. ******************************************************************************/
  854. void die(char *msg)
  855. {
  856. log_error(msg);
  857. pressanykey();
  858. exit(-1);
  859. }
  860. /******************************************************************************
  861. setup()
  862. Setup the mysql test enviornment.
  863. ******************************************************************************/
  864. void setup(char *file)
  865. {
  866. char temp[PATH_MAX];
  867. char file_path[PATH_MAX*2];
  868. char *p;
  869. // set the timezone for the timestamp test
  870. setenv("TZ", "GMT-3", TRUE);
  871. // find base dir
  872. strcpy(temp, strlwr(file));
  873. while((p = strchr(temp, '\\')) != NULL) *p = '/';
  874. if ((p = strindex(temp, "/mysql-test/")) != NULL)
  875. {
  876. *p = NULL;
  877. strcpy(base_dir, temp);
  878. }
  879. // setup paths
  880. snprintf(bin_dir, PATH_MAX, "%s/bin", base_dir);
  881. snprintf(mysql_test_dir, PATH_MAX, "%s/mysql-test", base_dir);
  882. snprintf(test_dir, PATH_MAX, "%s/t", mysql_test_dir);
  883. snprintf(mysql_tmp_dir, PATH_MAX, "%s/var/tmp", mysql_test_dir);
  884. snprintf(result_dir, PATH_MAX, "%s/r", mysql_test_dir);
  885. snprintf(master_dir, PATH_MAX, "%s/var/master-data", mysql_test_dir);
  886. snprintf(slave_dir, PATH_MAX, "%s/var/slave-data", mysql_test_dir);
  887. snprintf(lang_dir, PATH_MAX, "%s/share/english", base_dir);
  888. snprintf(char_dir, PATH_MAX, "%s/share/charsets", base_dir);
  889. #ifdef HAVE_OPENSSL
  890. use_openssl = TRUE;
  891. #endif // HAVE_OPENSSL
  892. // OpenSSL paths
  893. snprintf(ca_cert, PATH_MAX, "%s/SSL/cacert.pem", base_dir);
  894. snprintf(server_cert, PATH_MAX, "%s/SSL/server-cert.pem", base_dir);
  895. snprintf(server_key, PATH_MAX, "%s/SSL/server-key.pem", base_dir);
  896. snprintf(client_cert, PATH_MAX, "%s/SSL/client-cert.pem", base_dir);
  897. snprintf(client_key, PATH_MAX, "%s/SSL/client-key.pem", base_dir);
  898. // setup files
  899. snprintf(mysqld_file, PATH_MAX, "%s/mysqld", bin_dir);
  900. snprintf(mysqltest_file, PATH_MAX, "%s/mysqltest", bin_dir);
  901. snprintf(mysqladmin_file, PATH_MAX, "%s/mysqladmin", bin_dir);
  902. snprintf(master_pid, PATH_MAX, "%s/var/run/master.pid", mysql_test_dir);
  903. snprintf(slave_pid, PATH_MAX, "%s/var/run/slave.pid", mysql_test_dir);
  904. // create log file
  905. snprintf(temp, PATH_MAX, "%s/mysql-test-run.log", mysql_test_dir);
  906. if ((log_fd = fopen(temp, "w+")) == NULL)
  907. {
  908. log_errno("Unable to create log file.");
  909. }
  910. // prepare skip test list
  911. while((p = strchr(skip_test, ',')) != NULL) *p = ' ';
  912. strcpy(temp, strlwr(skip_test));
  913. snprintf(skip_test, PATH_MAX, " %s ", temp);
  914. // environment
  915. setenv("MYSQL_TEST_DIR", mysql_test_dir, 1);
  916. snprintf(file_path, PATH_MAX*2, "%s/mysqldump --no-defaults -u root --port=%u", bin_dir, master_port);
  917. setenv("MYSQL_DUMP", file_path, 1);
  918. snprintf(file_path, PATH_MAX*2, "%s/mysqlbinlog --no-defaults --local-load=%s", bin_dir, mysql_tmp_dir);
  919. setenv("MYSQL_BINLOG", file_path, 1);
  920. setenv("MASTER_MYPORT", "9306", 1);
  921. setenv("SLAVE_MYPORT", "9307", 1);
  922. snprintf(file_path, PATH_MAX*2, "%d", MYSQL_PORT);
  923. setenv("MYSQL_TCP_PORT", file_path, 1);
  924. snprintf(file_path, PATH_MAX*2, "%s/mysql_client_test --no-defaults --testcase--user=root --port=%u ", bin_dir, master_port);
  925. setenv("MYSQL_CLIENT_TEST",file_path,1);
  926. snprintf(file_path, PATH_MAX*2, "%s/mysql --no-defaults --user=root --port=%u ", bin_dir, master_port);
  927. setenv("MYSQL",file_path,1);
  928. snprintf(file_path, PATH_MAX*2, "%s/mysqlshow --no-defaults --user=root --port=%u", bin_dir, master_port);
  929. setenv("MYSQL_SHOW",file_path,1);
  930. snprintf(file_path, PATH_MAX*2, "%s/mysqlcheck --no-defaults -uroot --port=%u", bin_dir, master_port);
  931. setenv("MYSQL_CHECK",file_path,1);
  932. }
  933. /******************************************************************************
  934. main()
  935. ******************************************************************************/
  936. int main(int argc, char **argv)
  937. {
  938. int is_ignore_list= 0, autoclose= 0, individual_execution= 0;
  939. // setup
  940. setup(argv[0]);
  941. /* The --ignore option is comma saperated list of test cases to skip and
  942. should be very first command line option to the test suite.
  943. The usage is now:
  944. mysql_test_run --ignore=test1,test2 test3 test4
  945. where test1 and test2 are test cases to ignore
  946. and test3 and test4 are test cases to run.
  947. */
  948. if (argc >= 2 && !strnicmp(argv[1], "--ignore=", sizeof("--ignore=")-1))
  949. {
  950. char *temp, *token;
  951. temp= strdup(strchr(argv[1],'=') + 1);
  952. for (token=str_tok(temp, ","); token != NULL; token=str_tok(NULL, ","))
  953. {
  954. if (strlen(ignore_test) + strlen(token) + 2 <= PATH_MAX-1)
  955. sprintf(ignore_test+strlen(ignore_test), " %s ", token);
  956. else
  957. {
  958. free(temp);
  959. die("ignore list too long.");
  960. }
  961. }
  962. free(temp);
  963. is_ignore_list = 1;
  964. }
  965. // header
  966. log_msg("MySQL Server %s, for %s (%s)\n\n", VERSION, SYSTEM_TYPE, MACHINE_TYPE);
  967. log_msg("Initializing Tests...\n");
  968. // install test databases
  969. mysql_install_db();
  970. log_msg("Starting Tests...\n");
  971. log_msg("\n");
  972. log_msg(HEADER);
  973. log_msg(DASH);
  974. if ( argc > 1 + is_ignore_list )
  975. {
  976. int i;
  977. for (i = 1 + is_ignore_list; i < argc; i++)
  978. {
  979. if (!strncasecmp(argv[i], "--autoclose", 11))
  980. {
  981. autoclose= 1;
  982. continue;
  983. }
  984. // single test
  985. single_test= TRUE;
  986. individual_execution= 1;
  987. // run given test
  988. run_test(argv[i]);
  989. }
  990. }
  991. if (!individual_execution)
  992. {
  993. // run all tests
  994. DIR *dir = opendir(test_dir);
  995. DIR *entry;
  996. char test[NAME_MAX];
  997. char *p;
  998. // single test
  999. single_test = FALSE;
  1000. if (dir == NULL)
  1001. {
  1002. die("Unable to open tests directory.");
  1003. }
  1004. while((entry = readdir(dir)) != NULL)
  1005. {
  1006. if (!S_ISDIR(entry->d_type))
  1007. {
  1008. strcpy(test, strlwr(entry->d_name));
  1009. // find the test suffix
  1010. if ((p = strindex(test, TEST_SUFFIX)) != NULL)
  1011. {
  1012. // null terminate at the suffix
  1013. *p = '\0';
  1014. // run test
  1015. run_test(test);
  1016. }
  1017. }
  1018. }
  1019. closedir(dir);
  1020. }
  1021. // stop server
  1022. mysql_stop();
  1023. log_msg(DASH);
  1024. log_msg("\n");
  1025. log_msg("Ending Tests...\n");
  1026. // report stats
  1027. report_stats();
  1028. // close log
  1029. if (log_fd) fclose(log_fd);
  1030. // keep results up
  1031. if (!autoclose)
  1032. pressanykey();
  1033. return 0;
  1034. }
  1035. /*
  1036. Synopsis:
  1037. This function breaks the string into a sequence of tokens. The difference
  1038. between this function and strtok is that it respects the quoted string i.e.
  1039. it skips any delimiter character within the quoted part of the string.
  1040. It return tokens by eliminating quote character. It modifies the input string
  1041. passed. It will work with whitespace delimeter but may not work properly with
  1042. other delimeter. If the delimeter will contain any quote character, then
  1043. function will not tokenize and will return null string.
  1044. e.g. if input string is
  1045. --init-slave="set global max_connections=500" --skip-external-locking
  1046. then the output will two string i.e.
  1047. --init-slave=set global max_connections=500
  1048. --skip-external-locking
  1049. Arguments:
  1050. string: input string
  1051. delim: set of delimiter character
  1052. Output:
  1053. return the null terminated token of NULL.
  1054. */
  1055. char *str_tok(char *string, const char *delim)
  1056. {
  1057. char *token; /* current token received from strtok */
  1058. char *qt_token; /* token delimeted by the matching pair of quote */
  1059. /*
  1060. if there are any quote chars found in the token then this variable
  1061. will hold the concatenated string to return to the caller
  1062. */
  1063. char *ptr_token=NULL;
  1064. /* pointer to the quote character in the token from strtok */
  1065. char *ptr_quote=NULL;
  1066. /* See if the delimeter contains any quote character */
  1067. if (strchr(delim,'\'') || strchr(delim,'\"'))
  1068. return NULL;
  1069. /* repeate till we are getting some token from strtok */
  1070. while ((token = (char*)strtok(string, delim) ) != NULL)
  1071. {
  1072. /*
  1073. make the input string NULL so that next time onward strtok can
  1074. be called with NULL input string.
  1075. */
  1076. string = NULL;
  1077. /* check if the current token contain double quote character*/
  1078. if ((ptr_quote = (char*)strchr(token,'\"')) != NULL)
  1079. {
  1080. /*
  1081. get the matching the matching double quote in the remaining
  1082. input string
  1083. */
  1084. qt_token = (char*)strtok(NULL,"\"");
  1085. }
  1086. /* check if the current token contain single quote character*/
  1087. else if ((ptr_quote = (char*)strchr(token,'\'')) != NULL)
  1088. {
  1089. /*
  1090. get the matching the matching single quote in the remaining
  1091. input string
  1092. */
  1093. qt_token = (char*)strtok(NULL,"\'");
  1094. }
  1095. /*
  1096. if the current token does not contains any quote character then
  1097. return to the caller.
  1098. */
  1099. if (ptr_quote == NULL)
  1100. {
  1101. /*
  1102. if there is any earlier token i.e. ptr_token then append the
  1103. current token in it and return it else return the current
  1104. token directly
  1105. */
  1106. return ptr_token ? strcat(ptr_token,token) : token;
  1107. }
  1108. /*
  1109. remove the quote character i.e. make NULL so that the token will
  1110. be devided in two part and later both part can be concatenated
  1111. and hence quote will be removed
  1112. */
  1113. *ptr_quote= 0;
  1114. /* check if ptr_token has been initialized or not */
  1115. if (ptr_token == NULL)
  1116. {
  1117. /* initialize the ptr_token with current token */
  1118. ptr_token= token;
  1119. /* copy entire string between matching pair of quote*/
  1120. sprintf(ptr_token+strlen(ptr_token),"%s %s", ptr_quote+1, qt_token);
  1121. }
  1122. else
  1123. {
  1124. /*
  1125. copy the current token and entire string between matching pair
  1126. of quote
  1127. */
  1128. sprintf(ptr_token+strlen(ptr_token),"%s%s %s", token, ptr_quote+1,
  1129. qt_token );
  1130. }
  1131. }
  1132. /* return the concatenated token */
  1133. return ptr_token;
  1134. }