Commit graph

54 commits

Author SHA1 Message Date
unknown
b0701a5c3b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck


Makefile.am:
  Auto merged
configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
2005-11-04 01:15:35 +01:00
unknown
54fd083507 Makefile.am:
Copy "disabled.def"


mysql-test/Makefile.am:
  Copy "disabled.def"
2005-10-10 00:21:10 +02:00
unknown
5409f2554f Makefile.am, configure.in:
Enable "make distcheck" to work


configure.in:
  Enable "make distcheck" to work
Docs/Makefile.am:
  Enable "make distcheck" to work
Makefile.am:
  Enable "make distcheck" to work
client/Makefile.am:
  Enable "make distcheck" to work
cmd-line-utils/libedit/Makefile.am:
  Enable "make distcheck" to work
include/Makefile.am:
  Enable "make distcheck" to work
libmysql/Makefile.am:
  Enable "make distcheck" to work
libmysql_r/Makefile.am:
  Enable "make distcheck" to work
libmysqld/Makefile.am:
  Enable "make distcheck" to work
libmysqld/examples/Makefile.am:
  Enable "make distcheck" to work
mysql-test/Makefile.am:
  Enable "make distcheck" to work
ndb/docs/Makefile.am:
  Enable "make distcheck" to work
netware/Makefile.am:
  Enable "make distcheck" to work
pstack/Makefile.am:
  Enable "make distcheck" to work
scripts/Makefile.am:
  Enable "make distcheck" to work
sql-bench/Makefile.am:
  Enable "make distcheck" to work
sql/Makefile.am:
  Enable "make distcheck" to work
sql/share/Makefile.am:
  Enable "make distcheck" to work
support-files/Makefile.am:
  Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
unknown
b0a6a8e137 Makefile.am:
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir


client/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
cmd-line-utils/libedit/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
dbug/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
extra/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
heap/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
isam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql_r/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/examples/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
merge/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisammrg/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysql-test/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysys/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
netware/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
regex/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
sql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
strings/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tests/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
vio/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tools/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
unknown
3e4082cd8e BSD make compatibility. bug#9828 2005-06-18 18:14:28 +02:00
unknown
9b294f596a - added missing files std_data/server-cert.pem and std_data/server-key.pem to make
the SSL tests pass
2005-06-10 15:30:16 +02:00
unknown
4a5edc965f Remove references to result.es files
mysql-test/Makefile.am:
  Remove reference to result.es
scripts/make_binary_distribution.sh:
  Remove references to result.es
2005-04-12 18:04:32 -07:00
unknown
1216986050 Makefile.am:
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed


mysql-test/mysql-test-run.pl:
  Embedded result files no longer needed
mysql-test/r/rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test/t/rpl_rewrite_db.test:
  Added missing database cleanup
mysql-test/Makefile.am:
  Include the Perl version of mysql-test-run
2005-04-06 12:20:55 +02:00
unknown
3896219684 mysql-test-run to default run with ndbcluster if compiled with that support 2005-03-07 13:42:01 +01:00
unknown
e9da057b08 - make sure to include the embedded test results in the source distribution 2005-02-09 17:49:43 +01:00
unknown
820d68d903 corrected mysqltest.dsp
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script


BitKeeper/etc/ignore:
  Added mysql-4.1.8-win-src.zip to the ignore list
VC++Files/client/mysqltest.dsp:
  corrected dsp file
VC++Files/mysql-test/mysql_test_run_new.dsp:
  corrected mysql_test_run_new.dsp
VC++Files/mysql.dsw:
  added dependency
  corrected path of mysql_test_run_new.dsp
client/mysqltest.c:
  fixed wrong code
mysql-test/Makefile.am:
  added my_create_tables.c
mysql-test/my_manage.c:
  removed command_line
  fixed #elif
mysql-test/my_manage.h:
  restored NAME_MAX and MAX_FNAME
mysql-test/mysql_test_run_new.c:
  added create_system_files()
  added compare for windows
scripts/make_win_src_distribution.sh:
  added all files of testes
  added mysql-test
2004-12-14 18:46:55 +05:00
unknown
44070705ea merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-Makefile.am:
  Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
  Auto merged
Docs/Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log.cc:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
client/mysqldump.c:
  merge with 4.0
  (This only reorders options)
sql/ha_innodb.cc:
  merge with 4.0 (Keep original code)
sql/time.cc:
  Note that part of this patch is done in my_time.c
2004-11-12 11:17:53 +02:00
unknown
2ab265d0eb Makefile.am:
added so that it is possible to make mysql_test_run_new
  but not done for target all do:
   make mysql_test_run_new


mysql-test/Makefile.am:
  added so that it is possible to make mysql_test_run_new
  but not done for target all do:
   make mysql_test_run_new
2004-11-08 10:53:48 +00:00
unknown
61838e4c37 Makefile.am:
remove mysql_test_run_new for now, it breaks the make


mysql-test/Makefile.am:
  remove mysql_test_run_new for now, it breaks the make
2004-11-08 10:41:59 +00:00
unknown
00d05c1e6d Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the source tar-ball.
BitKeeper/etc/ignore:
  Added mysql-test/mysql_test_run_new to the ignore list
mysql-test/Makefile.am:
  All source files must be contained in their respective macros in order to be contained
  in the DISTFILES macro so that they get included in the source file tar-ball.
  "my_manage.h" was missing.
2004-11-05 15:50:53 +01:00
unknown
60d8ff97a8 autocommit and changed name mysql_test_run_new
client/mysqltest.c:
  autocommit
mysql-test/Makefile.am:
  changed mysql_test_run to mysql_test_run_new
2004-11-04 21:25:51 +05:00
unknown
d259ba4006 Fix for bug #6387 "Queried timestamp values do not match the inserted
value if server runs in time zone with leap seconds".

Now in my_gmt_sec() function we take into account difference between
our target and estimation in seconds part.


mysql-test/Makefile.am:
  Added mysql-test/std_data/Moscow_leap reuired by new timezone3.test
  to source distribution.
sql/time.cc:
  my_gmt_sec():
   When comparing our target broken-down datetime t value and proper 
   representation of our estimation *l_time we should take into account
   that they could differ in second part if we have time zone leap seconds.
   
   Also added comments about some assumptions used in this function.
2004-11-03 17:59:03 +00:00
unknown
931f6da622 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1mysqltest


client/mysqltest.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
2004-09-16 00:50:05 +06:00
unknown
7d94788c1a WL#964
porting mysql_test_run on Linux and Windows


client/mysqltest.c:
  added windows code
mysql-test/Makefile.am:
  added code of creating make file
mysql-test/r/fulltext.result:
  added FORMAT() for compatible with Windows version
mysql-test/r/fulltext_cache.result:
  added FORMAT()
mysql-test/r/fulltext_multi.result:
  added FORMAT()
mysql-test/r/fulltext_order_by.result:
  added FORMAT()
mysql-test/r/type_float.result:
  added --replace-result
mysql-test/t/fulltext.test:
  added FORMAT()
mysql-test/t/fulltext_cache.test:
  added FORMAT()
mysql-test/t/fulltext_multi.test:
  added FORMAT()
mysql-test/t/fulltext_order_by.test:
  added FORMAT()
mysql-test/t/innodb.test:
  added --replace-result
mysql-test/t/insert.test:
  added --replace_result
mysql-test/t/type_float.test:
  added --replace-result
mysql-test/t/variables.test:
  added --replace_result
2004-09-16 00:47:45 +06:00
unknown
945625ebaa manually merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0dbg.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/conf_to_src.c:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_uint.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-08-18 19:57:55 +02:00
unknown
f95c6fb5c0 Fix for BUG#5050 "mysql-test-run fails on rpl_trunc_binlog after 'make install'":
The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.


mysql-test/Makefile.am:
  The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
  Putting a * before 001 so that it works for 6-digit extensions of 4.1.
2004-08-14 15:24:40 +02:00
unknown
3b79bf10e2 Fix for 'make dist' 'make distclean' goals work even if ./configure
called without NDB enabled.
2004-06-25 23:21:14 +04:00
unknown
eb70dc5593 merged
configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
2004-06-23 12:36:07 +02:00
unknown
9a554b4751 handler interface cleanups:
more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing


include/myisam.h:
  increasing myisam_max_temp_file_length
include/my_base.h:
  handler interface cleanup
myisam/mi_static.c:
  warning removed
mysql-test/Makefile.am:
  followup
mysql-test/r/fulltext.result:
  fulltext indexes are not ordered
mysql-test/r/rpl_user_variables.result:
  followup
sql/field.cc:
  index_flags
sql/filesort.cc:
  rnd_init -> ha_rnd_init
  rnd_end -> ha_rnd_end
sql/ha_berkeley.cc:
  cleanup
sql/ha_berkeley.h:
  table/index_flags revamped
sql/ha_heap.cc:
  ensure index is accessed only after index_init (esp. important for temp tables)
sql/ha_heap.h:
  table/index_flags revamped
sql/ha_innodb.cc:
  don't workaround MySQL sloppiness
sql/ha_innodb.h:
  table/index_flags revamped
sql/ha_isam.h:
  table/index_flags revamped
sql/ha_isammrg.h:
  table/index_flags revamped
sql/ha_myisam.cc:
  ensure index is accessed only after index_init (esp. important for temp tables)
sql/ha_myisam.h:
  table/index_flags revamped
sql/ha_myisammrg.h:
  table/index_flags revamped
sql/handler.cc:
  handler interface cleanups
sql/handler.h:
  handler interface cleanups:
    more logical table/index_flags
    return  HA_ERR_WRONG_COMMAND instead of abstract methods
    max_keys and other limits renamed to max_supported_keys/etc
    max_keys/etc are now wrappers to max_supported_keys/etc 
    ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to enforce strict pairing
sql/item_subselect.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/lex.h:
  renamed to avoid conflicts
sql/opt_range.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
  table/index_flags cleanup
sql/opt_range.h:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/opt_sum.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
  table/index_flags cleanup
sql/records.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_acl.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_cache.cc:
  cleanup
sql/sql_delete.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_handler.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_help.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_insert.cc:
  table/index_flags cleanup
sql/sql_select.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
  table/index_flags cleanup
sql/sql_table.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
  table/index_flags cleanup
sql/sql_update.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_yacc.yy:
  INDEX -> INDEX_SYM
sql/table.cc:
  table/index_flags cleanup
2004-06-23 12:29:05 +02:00
unknown
fe94000324 after merge fix 2004-06-11 22:00:08 +02:00
unknown
2e8fc0cae2 one more ndb-isolating fix 2004-06-05 13:16:29 +02:00
unknown
9e833b2a7a ndb in mysql-test fix 2004-05-27 08:05:10 +00:00
unknown
18665803f4 Cleanups (comments and compiler warnings)
dded init of variable to fix core dump on startup errors


mysql-test/Makefile.am:
  Added transformation of socket address for mysql-test-run
mysql-test/mysql-test-run.sh:
  Added option --socket
sql/derror.cc:
  Removed compiler warning
sql/mysql_priv.h:
  Moved assert up to be able to use asserts in other header files
sql/mysqld.cc:
  Fixed comment
sql/sql_bitmap.h:
  Added copyright notice
  Removed not needed header files
sql/sql_class.cc:
  Added init of variable to fix core dump on startup errors
sql/sql_test.cc:
  Fixed compiler errors (from key_map code)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-11-02 14:00:25 +02:00
unknown
8a548ffd9c Implemented replication over SSL
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file


include/mysqld_error.h:
  Added error code for "slave without SSL ignored SSL params warning"
mysql-test/Makefile.am:
  Copy files required for rpl_openssl test during the make process
mysql-test/r/rpl000015.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_empty_master_crash.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_flush_log_loop.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_log.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_log_pos.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_redirect.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_replicate_do.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_rotate_logs.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
sql/lex.h:
  Added MASTER_SSL lexems for CHANGE MASTER
sql/mysqld.cc:
  Added --master-ssl-ca parameter. Fixed description of other master-ssl parameters
sql/repl_failsafe.cc:
  Added SSL support to connect_to_master()
sql/share/czech/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/danish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/dutch/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/english/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/estonian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/french/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/german/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/greek/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/hungarian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/italian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/japanese/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/korean/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/norwegian-ny/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/norwegian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/polish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/portuguese/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/romanian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/russian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/serbian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/slovak/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/spanish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/swedish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/ukrainian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/slave.cc:
  Introduced new format of master.info file
  Added support of SSL params in master.info and SHOW SLAVE STATUS
  Added support of SSL connections
sql/slave.h:
  Added SSL parameters to MASTER_INFO
sql/sql_lex.h:
  Added SSL parameters for CHANGE MASTER TO
sql/sql_repl.cc:
  Added SSL parameters for CHANGE MASTER TO
sql/sql_yacc.yy:
  Added SSL parameters for CHANGE MASTER TO
2003-09-01 15:16:20 +04:00
unknown
b7b75213dc - typo fix (replaced blanks with a tab) 2003-03-05 08:13:37 +01:00
unknown
b10c79a889 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 22:24:00 +01:00
unknown
37d1dd03d8 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 18:18:05 +01:00
unknown
21a32d758e Merge with 3.23 -> 4.0
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/thr_lock.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/log_event.cc:
  merge
sql/mysqld.cc:
  merge
2003-02-28 13:29:48 +02:00
unknown
654878ac74 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
mysql-test/Makefile.am:
  Auto merged
2003-02-28 12:33:10 +02:00
unknown
41e10e728e Added copying of *.slave-mi mysql-test files 2003-02-28 12:32:37 +02:00
unknown
46cd8ff4e4 Changed binlog name padding from binlog.001 to binlog.000001
mysql-test/Makefile.am:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl000015.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl000018.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_flush_log_loop.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_log.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_log_pos.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_rotate_logs.result:
  Changed binlog.001 to be binlog.000001
mysql-test/t/rpl000017-slave.sh:
  Changed binlog.001 to be binlog.000001
mysql-test/t/rpl_log.test:
  Changed binlog.001 to be binlog.000001
mysql-test/t/rpl_rotate_logs.test:
  Changed binlog.001 to be binlog.000001
sql/log.cc:
  Changed binlog.001 to be binlog.000001
2002-10-29 15:11:13 -07:00
unknown
3dd6cce989 Fixed missing table_list->name -> table_list->alias convert
myisam/mi_open.c:
  Fixed problem with wrongly calculated max_data_file_length
mysql-test/Makefile.am:
  Added  missing .require test files
scripts/mysqlhotcopy.sh:
  Remove end / from directory names (portability fix)
tests/grant.res:
  Update of test results
2002-10-08 17:58:43 +03:00
unknown
fc2634d04b small fix from bugs@.. list
mysql-test/Makefile.am:
  small fix based on user's input ..
2002-10-07 16:30:39 +03:00
unknown
bd286b23f9 support for eval_result and let $var = query syntax in mysql-test
fixes for rpl_log test to make it config-independent


BitKeeper/etc/ignore:
  Added mysql-test/r/rpl_log.eval to the ignore list
client/mysqltest.c:
  support for eval_result and let $var = `query` syntax
mysql-test/Makefile.am:
  import more variables into mysql-test-run
mysql-test/mysql-test-run.sh:
  if we got wrong result on eval_result test case, diff against the
  expanded result, not the template
mysql-test/r/rpl_log.result:
  change config-dependent parts of the result to dynamic variables
mysql-test/t/rpl_log.test:
  get server version from the server
  remove obsoleted replace hack to solve port problem - use eval_result
  instead
2001-06-30 13:08:35 -06:00
unknown
0574441192 Fixed probelm with count(*) and normal functions when no matchin rows.
Changed 'lib' to 'master-data'
Fix for slow slaves


Docs/manual.texi:
  Changelog
include/mysql.h:
  Fixes for Cygwin
libmysql/libmysql.c:
  Fixes for Cygwin
mysql-test/Makefile.am:
  Include missing test files
mysql-test/include/master-slave.inc:
  Fixes for slow slaves
mysql-test/install_test_db.sh:
  Change 'lib' to 'master-data'
mysql-test/mysql-test-run.sh:
  Change 'lib' to 'master-data'
mysql-test/r/group_by.result:
  Test case for count(*) problem
mysql-test/t/group_by.test:
  Test case for count(*) problem
mysql-test/t/rpl000018-master.sh:
  Change 'lib' to 'master-data'
sql/sql_select.cc:
  Fix for count(*) problem
2001-04-21 17:12:59 +03:00
unknown
50dff2bc48 distribution did not include *.sh files in mysql-test/t
mysql-test/Makefile.am:
  fixed bug in distribution build
scripts/make_binary_distribution.sh:
  fixed bug in the distribution build
2001-04-18 18:01:56 -06:00
unknown
a556607baf Use INSTALL_DATA instead of cp.
mysql.server is a script, not data.


Docs/Makefile.am:
  Use INSTALL_DATA instead of cp
libmysql/Makefile.am:
  Use INSTALL_DATA instead of cp
mysql-test/Makefile.am:
  Use INSTALL_DATA instead of cp
sql-bench/Makefile.am:
  Use INSTALL_DATA instead of cp
support-files/Makefile.am:
  mysql.server is a script, not data.
2001-02-01 20:49:04 -05:00
unknown
0e30cd0996 Use $(INSTALL_DATA) instead of cp -p in mysql-test and sql-bench.
Clean up $(INSTALL_DATA) use in sql/share.


mysql-test/Makefile.am:
  Use $(INSTALL_DATA) instead of cp -p.
sql-bench/Makefile.am:
  Use $(INSTALL_DATA) instead of cp -p.
sql/share/Makefile.am:
  Use $(INSTALL_DATA), instead of for loop + basename.
2001-01-31 15:01:16 -05:00
unknown
ab9646ca6c Remove removed files from Makefile.am
mysql-test/Makefile.am:
  Remove removed files
2001-01-21 17:29:59 +02:00
unknown
ab7afc8c36 Changes for --with-server-suffix
Fixed mutex bug in logging (crash on windows when doing SET PASSWORD=)
Changed MERGE  tables to not use FILE


BitKeeper/deleted/.del-m.MRG~3f5632c37af00f18:
  Delete: mysql-test/std_data/m.MRG
BitKeeper/deleted/.del-m.frm~e351dfe0b6824c0c:
  Delete: mysql-test/std_data/m.frm
Docs/manual.texi:
  Added DNS section
configure.in:
  Update to 3.23.32
include/Makefile.am:
  Added my_config.h
include/mysql_com.h:
  Changes for --with-server-suffix
include/mysql_version.h.in:
  cleanup
merge/open.c:
  Don't use FILE
mysql-test/Makefile.am:
  removed not needed data files
mysql-test/r/merge.result:
  generate merge file
mysql-test/t/merge.test:
  generate merge file
sql-bench/Results/ATIS-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/RUN-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/alter-table-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/big-tables-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/connect-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/create-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/insert-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/select-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  New benchmark results
sql/log.cc:
  Ensure that mutex are initialized before used
sql/log_event.h:
  Changes for --with-server-suffix
sql/mysql_priv.h:
  Changes for --with-server-suffix
sql/mysqlbinlog.cc:
  Changes for --with-server-suffix
sql/mysqld.cc:
  changed strnmov -> strmake
sql/net_pkg.cc:
  Prepare for adding char-set conversion to SHOW commands
2001-01-21 16:30:16 +02:00
unknown
c25f29bcdf Add --with-server-suffix (MYSQL_SERVER_SUFFIX).
configure.in:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
include/mysql_version.h.in:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
myisam/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
mysql-test/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
scripts/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
scripts/mysqlbug.sh:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
sql-bench/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
sql/mysqld.cc:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
support-files/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
2001-01-19 02:46:13 +02:00
unknown
40847806a0 Added missing .require files 2001-01-02 15:17:11 +02:00
unknown
6cfd66f0f8 Fixes to get mysql-test included in the distributions
client/mysqldump.c:
  Fixed to not use strncasecmp
client/mysqlimport.c:
  Fixed to not use strncasecmp
mysql-test/Makefile.am:
  Changes needed for RPM
mysql-test/mysql-test-run.sh:
  Changes to work with binary installations
scripts/make_binary_distribution.sh:
  Added missing mysql-test files
sql-bench/Makefile.am:
  Changes needed for RPM
sql/mysqld.cc:
  Portability fix
support-files/mysql.spec.sh:
  Added mysql-test to sql-bench
2001-01-02 14:29:47 +02:00
unknown
123946665c fixed typo
BitKeeper/etc/ignore:
  Added BitKeeper/tmp/gone to the ignore list
2000-12-13 17:17:19 -07:00
unknown
1c0f675a60 mysql-test/Makefile.am
fixed typo
scripts/make_binary_distribution.sh
    added .MRG and .frm files


mysql-test/Makefile.am:
  fixed typo
scripts/make_binary_distribution.sh:
  added .MRG and .frm files
2000-12-13 12:42:59 -07:00