mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34222 commits 2776 branches 343 tags 1.6 GiB
Commit graph

34222 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
0a745f26f7 Updated after review 
mysql-test/lib/mtr_process.pl:
  Fix spelling errors
mysql-test/lib/mtr_report.pl:
  Fix spelling errors
mysql-test/mysql-test-run.pl:
  Remove debug code
  Fix spelling errors
  Check if slave cluster installed ok if test needs it
 2006-05-23 15:59:52 +02:00
unknown
effac570d4 Add loop to wait for servers to start before continuing with test 
Remove workarounds for "hang in select"
 2006-05-23 15:27:56 +02:00
unknown
78a249f503 Use mtr_kill_process from mtr_kill_processes 
Change to use 0.1 second sleep between kill attempt
 2006-05-23 15:25:17 +02:00
unknown
4f0bda6a60 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


storage/ndb/tools/waiter.cpp:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
 2006-05-19 17:19:57 +02:00
unknown
946f0c839a Wait until first mysqld in slave cluster has created cluster/apply_status.ndb, put workaround in function workaround_hang_in_select 
Add verbose printouts


mysql-test/lib/mtr_process.pl:
  Add verbose printouts
mysql-test/mysql-test-run.pl:
  Wait until first mysqld in slave cluster has created cluster/apply_status.ndb, put workaround in function workaround_hang_in_select
 2006-05-19 16:28:08 +02:00
unknown
fe7751cb8e Add mtr_verbose to print more verbose output when --verbose flag is used 2006-05-19 11:42:53 +02:00
unknown
13a4ea4098 Remove printout when restart is skipped 2006-05-19 09:13:25 +02:00
unknown
cddacf429e Make ndb_waiter poll the ndb_mgmd for status more often 2006-05-18 23:41:07 +02:00
unknown
919f8e69e3 Make safe_connect retry faster after connect failure 2006-05-18 23:36:55 +02:00
unknown
fd74518e67 Start servers in parallel 
Add list of clusters and nodes


mysql-test/lib/mtr_process.pl:
  Start servers in parallell
mysql-test/lib/mtr_report.pl:
  Report about number of restarts
mysql-test/lib/mtr_stress.pl:
  Update args to pass to mysqld_start
mysql-test/mysql-test-run.pl:
  Start servers in  parallell
  Add lists for clusters and it's nodes to keep track of things
 2006-05-18 23:35:17 +02:00
unknown
393c867f59 Use --with-ssl 
BUILD/compile-dist:
  Use --with-ssl instead of --with-yassl
config/ac-macros/ssl.m4:
  Change variable name to with_bundled_yassl
 2006-05-18 23:31:49 +02:00
unknown
d2f5a10444 Merge neptunus:mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-05-18 20:24:46 +02:00
unknown
f6115fb44f Merge bk-internal:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
 2006-05-18 20:21:43 +02:00
unknown
a19fdb2b65 Tests uses innodb, add test to check if innodb is available 
mysql-test/t/func_group.test:
  Test uses innodb, add test to check if innodb is available
mysql-test/t/group_min_max.test:
  Test uses innodb, add test to check if innodb is available
mysql-test/t/join_outer.test:
  Test uses innodb, add test to check if innodb is available
 2006-05-18 20:07:35 +02:00
unknown
20091c5b86 Save "master_opt" in master so it can be checked later to see if it's the same as the test that are about to run uses the same. 
mysql-test/lib/mtr_cases.pl:
  Move setting of --skip-innodb out of recursive loop
 2006-05-18 19:52:43 +02:00
unknown
c295bd8082 Move test that requires innodb to sp_trans 2006-05-18 19:26:53 +02:00
unknown
3e12f98aa5 Moving test that requires innodb to partition_innodb 
mysql-test/r/partition_innodb.result:
  New BitKeeper file ``mysql-test/r/partition_innodb.result''
mysql-test/t/partition_innodb.test:
  New BitKeeper file ``mysql-test/t/partition_innodb.test''
 2006-05-18 19:16:51 +02:00
unknown
425782b365 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-18 18:29:07 +02:00
unknown
ecf4865e12 Merge neptunus.(none):/home/msvensson/mysql/bug18818/my51-bug18818 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Auto merged
 2006-05-18 18:26:52 +02:00
unknown
127d73abaa Fix "glibc detected double free" 
Remove extra call to vio_end


sql/mysqld.cc:
  Remove the second call to vio_end as it should only be called once when the server shutdown.
 2006-05-18 18:11:54 +02:00
unknown
46221f45bb Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysql.cc:
  Auto merged
 2006-05-18 14:36:54 +02:00
unknown
a5d9932b8f Merge knielsen@10.100.52.19:/usr/local/mysql/tmp-5.1 
into  mysql.com:/data0/knielsen/tmp-5.1
 2006-05-18 14:20:13 +02:00
unknown
41200a075d After-merge fix. 
mysql-test/r/sp.result:
  After-merge fixes
mysql-test/r/trigger-grant.result:
  After-merge fixes
mysql-test/t/trigger-grant.test:
  After-merge fixes
sql/sql_insert.cc:
  After-merge fixes
 2006-05-18 13:35:15 +02:00
unknown
b308c4a996 Merge bk-internal:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-05-18 13:12:52 +02:00
unknown
fdeacbcf6d Move innodb dependent test from create to mysql_innodb 2006-05-18 12:55:34 +02:00
unknown
1875f3155c Merge mysql.com:/usr/local/mysql/tmp_merge 
into  mysql.com:/usr/local/mysql/merge-5.1


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
server-tools/instance-manager/options.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
server-tools/instance-manager/options.cc:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
 2006-05-18 11:56:50 +02:00
unknown
e3f1b06c5a Merge mysql.com:/M50/bug19040-5.0 into mysql.com:/M51/merge-5.1 2006-05-18 11:20:03 +02:00
unknown
de0e4a9a8f Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/join_outer.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-05-17 17:20:03 -07:00
unknown
2a29fbfc9a type_newdecimal.result, case.result: 
Adjusted merge


mysql-test/r/case.result:
  Adjusted merge
mysql-test/r/type_newdecimal.result:
  Adjusted merge
 2006-05-18 00:42:07 +02:00
unknown
46d60e77c3 Parse test files to find out if it needs innodb or not, mark test as 'innodb_test' if it does and add "--skip-innodb" to master_opts if it does not. 
mysql-test/lib/mtr_cases.pl:
  Parse test files to find out if it needs innodb or not
 2006-05-17 23:54:48 +02:00
unknown
e78b4cca25 Merge mysql.com:/data0/mysqldev/my/tmp_merge 
into  mysql.com:/tmp/mysql-5.1-new


mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
sql/item.cc:
  Auto merged
 2006-05-17 23:35:08 +02:00
unknown
8df5fdb933 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
 2006-05-17 11:46:21 -07:00
unknown
8d4cbe39a6 Include "config.h" (if it exists) in all yaSSL files via their "runtime.hpp". 
Fixes bug#19040 "yaSSL does not compile on AIX".


extra/yassl/taocrypt/include/runtime.hpp:
  Include "config.h" (if it exists) in all yaSSL files. This is needed to ensure the same 
  configure settings are used for yaSSL as for the other modules linked together.
  Example: the settings for "large file" on AIX.
  Fixes bug#19040 "yaSSL does not compile on AIX".
 2006-05-17 19:08:18 +02:00
unknown
2d0297f093 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/merge-5.1
 2006-05-17 18:14:38 +02:00
unknown
15e4938baa Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmp-5.1


libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/valgrind.supp:
  Manual merge.
 2006-05-17 15:09:40 +02:00
unknown
4b35cdcbad Merge mysql.com:/M50/tmp_merge into mysql.com:/M51/merge-5.1 
configure.in:
  Auto merged
BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
  Auto merged
BitKeeper/deleted/.del-mysql_prepare_privilege_tables_for_5.sql~76ea3c82bdbbead4:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Auto merged
mysql-test/r/archive_gis.result:
  Auto merged
mysql-test/r/bdb_gis.result:
  Auto merged
mysql-test/r/binlog_stm_binlog.result:
  Auto merged
mysql-test/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/innodb_gis.result:
  Auto merged
mysql-test/r/mysqldump-max.result:
  Auto merged
mysql-test/r/ndb_bitfield.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/ndb_database.result:
  Auto merged
mysql-test/r/ndb_gis.result:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/r/rpl_create_database.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/r/rpl_drop_db.result:
  Auto merged
mysql-test/r/rpl_multi_update3.result:
  Auto merged
mysql-test/r/rpl_slave_status.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/rpl_view.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp-vars.result:
  Auto merged
mysql-test/r/sp_trans.result:
  Auto merged
mysql-test/r/timezone_grant.result:
  Auto merged
mysql-test/r/trigger-compat.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/r/type_bit_innodb.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/binlog_row_binlog-master.opt:
  Auto merged
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_commit_after_flush.test:
  Auto merged
mysql-test/t/rpl_insert_ignore.test:
  Auto merged
mysql-test/t/rpl_rewrt_db-slave.opt:
  Auto merged
mysql-test/t/rpl_rewrt_db.test:
  Auto merged
mysys/mf_tempdir.c:
  Auto merged
mysys/my_mmap.c:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
storage/bdb/dist/s_dir:
  Auto merged
storage/myisam/ftbench/Ecompare.pl:
  Auto merged
storage/myisam/ftbench/Ecreate.pl:
  Auto merged
storage/myisam/ftbench/Ereport.pl:
  Auto merged
storage/myisam/ftbench/README:
  Auto merged
storage/myisammrg/myrg_range.c:
  Auto merged
storage/myisammrg/myrg_rnext_same.c:
  Auto merged
strings/decimal.c:
  Auto merged
zlib/Makefile.am:
  Auto merged
 2006-05-17 15:07:44 +02:00
unknown
316f967d00 After-merge fixes. 2006-05-17 15:01:48 +02:00
unknown
5c5c5e7501 BUG#18818 configure: No longer finds OpenSSL on Mac OS X 
- Implement new switch --with-ssl to configure used for both bundled yaSSL or OpenSSL


BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
  Delete: config/ac-macros/yassl.m4
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
  Delete: config/ac-macros/openssl.m4
BUILD/SETUP.sh:
  Use switch --with-ssl to configure
BUILD/compile-pentium-debug-openssl:
  Use switch --with-ssl to configure
BUILD/compile-pentium-debug-yassl:
  Use switch --with-ssl to configure
configure.in:
  Change to use the MYSQL_CHECK_SSL macro from ssl.m4
config/ac-macros/ssl.m4:
  New BitKeeper file ``config/ac-macros/ssl.m4''
 2006-05-17 13:59:37 +02:00
unknown
c4e26cb03d Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge 
into  mysql.com:/home/kgeorge/mysql/5.1/merge


mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged
 2006-05-17 13:29:20 +03:00
unknown
ea7cc4af64 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
 2006-05-17 10:15:35 +02:00
unknown
1d83b61b97 Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 
sql/ha_ndbcluster_binlog.cc:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - small correction of previous patch
storage/ndb/src/ndbapi/DictCache.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - cache not released properly
storage/ndb/tools/desc.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - added retry option so that ndb_desc can be used to wait for a table to be created
 2006-05-17 08:34:48 +02:00
unknown
4d861dad61 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
 2006-05-16 18:42:59 -04:00
unknown
39ad30a46c Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged
 2006-05-17 00:27:19 +02:00
unknown
6ee68c82fb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
 2006-05-17 00:23:40 +02:00
unknown
a2f26487ff ndb: added some missing error codes to mgmapi 
ndb: ndb_waiter disconnect/reconnect on get status error


ndb/src/mgmapi/mgmapi.cpp:
  ndb: added some missing error codes to mgmapi
ndb/tools/waiter.cpp:
  ndb: ndb_waiter disconnect/reconnect on get status error
 2006-05-17 00:22:43 +02:00
unknown
5fca6059f7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
 2006-05-16 20:58:19 +02:00
unknown
597d84faf9 Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 
- adoptions to handle binlog
 2006-05-16 20:56:45 +02:00
unknown
6a278824db Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-16 15:39:41 +02:00
unknown
fdedc069d8 Updated to fix bug in AIX 
mysql-test/extra/rpl_tests/rpl_log.test:
  Remove disable log per lars
mysql-test/r/rpl_stm_log.result:
  New results file
mysql-test/r/rpl_row_log.result:
  New results file
mysql-test/r/rpl_row_log_innodb.result:
  New results file
 2006-05-16 15:38:21 +02:00
unknown
c3e4f43d41 rpl_log.test: 
Fix for failure in aix52 failure during push build


mysql-test/extra/rpl_tests/rpl_log.test:
  Fix for failure in aix52 failure during push build
 2006-05-16 14:59:44 +02:00