mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 00:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30249 commits 2777 branches 343 tags 1.6 GiB
Commit graph

30249 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
d132a55c90 Bug #17200 Comment for SHOW ENGINES should be changed for Cluster 2006-02-08 11:29:46 +01:00
unknown
2f3705752a Merge neptunus.(none):/home/msvensson/mysql/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_misc_functions.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/trigger-compat.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_s.test:
  Auto merged
mysql-test/t/rpl_misc_functions.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql-common/client.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
 2006-02-07 20:54:41 +01:00
unknown
42b1cfc55d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
 2006-02-07 20:02:08 +01:00
unknown
56f138b945 Removed extra "drop view v1" 
mysql-test/r/sp-prelocking.result:
  Update test result
mysql-test/t/sp-prelocking.test:
  One drop too many
 2006-02-07 19:59:19 +01:00
unknown
3eb41de8cb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-07 19:19:41 +01:00
unknown
7eefe3da4d Update after merge 5.0 -> 5.1 
mysql-test/r/rpl_failed_optimize.result:
  Updates test result
mysql-test/r/rpl_insert_id.result:
  Updates test result
mysql-test/r/rpl_loaddata.result:
  Updates test result
mysql-test/r/rpl_loaddata_s.result:
  Updates test result
mysql-test/r/rpl_multi_update3.result:
  Updates test result
 2006-02-07 19:18:33 +01:00
unknown
752b688181 Bug #17188 CRBR: ignores --binlog_ignore_db= settings 
mysql-test/r/ndb_binlog_ignore_db.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_ignore_db.result''
mysql-test/t/ndb_binlog_ignore_db-master.opt:
  New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db-master.opt''
mysql-test/t/ndb_binlog_ignore_db.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db.test''
 2006-02-07 19:02:38 +01:00
unknown
fc45d187f5 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


client/mysqltest.c:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
 2006-02-07 18:17:57 +01:00
unknown
137967eac9 Merge neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


client/mysqltest.c:
  Auto merged
sql/sql_db.cc:
  Auto merged
 2006-02-07 18:12:23 +01:00
unknown
d942f408bc Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_misc_functions.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_s.test:
  Auto merged
mysql-test/t/rpl_misc_functions.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/r/mysqltest.result:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
  "Use local" when merging 5.0 -> 5.1
 2006-02-07 18:04:50 +01:00
unknown
6af1dca556 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var


mysql-test/t/mysqltest.test:
  Auto merged
 2006-02-07 18:02:34 +01:00
unknown
0522905ac3 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/read_only.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/r/trigger-compat.result:
  Merge 5.0 -> 5.1
 2006-02-07 17:57:26 +01:00
unknown
915b08fe2c Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  big_geek.:C:/Work/mysql/mysql-5.1
 2006-02-07 10:45:11 -06:00
unknown
59bd66d369 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-07 17:45:10 +01:00
unknown
3b80043296 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases 
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl000017.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/r/rpl_stm_flsh_tbls.result:
  Auto merged
mysql-test/r/sp-prelocking.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/sp-prelocking.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Merge 5.0->5.1
mysql-test/t/rpl_failed_optimize.test:
  Merge 5.0->5.1
mysql-test/t/rpl_insert_id.test:
  Merge 5.0->5.1
mysql-test/t/rpl_loaddata.test:
  Merge 5.0->5.1
mysql-test/t/rpl_loaddata_m.test:
  Merge 5.0->5.1
mysql-test/t/rpl_loaddata_s.test:
  Merge 5.0->5.1
mysql-test/t/rpl_multi_update3.test:
  Merge 5.0->5.1
 2006-02-07 17:20:50 +01:00
unknown
738338d6b7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-07 16:50:29 +01:00
unknown
14e5e0b96b cmake corrections to fix compiling on visual 7.1 2006-02-07 09:43:42 -06:00
unknown
3e463ddad4 Bug #17005 Ndb partition handling for create table like is broken 2006-02-07 16:31:20 +01:00
unknown
02576c95d1 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/information_schema_db.result:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/information_schema.result:
  SCCS merged
 2006-02-07 15:26:58 +03:00
unknown
6a9a35c0d4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-02-07 12:16:25 +01:00
unknown
76d8dd3e4d Bug #17087 No warning on cluster failure for IS.FILES 2006-02-07 12:16:24 +01:00
unknown
f0e0e5c5d3 Bug#17081 LOAD DATA INFILE" may not load all the data 
Bug #17154  	load data infile hangs when duplicate key encountered


mysql-test/r/ndb_load.result:
  New BitKeeper file ``mysql-test/r/ndb_load.result''
mysql-test/t/ndb_load.test:
  New BitKeeper file ``mysql-test/t/ndb_load.test''
 2006-02-07 11:47:04 +01:00
unknown
a51701161a bug#16924 - ndb - insert wo/ specifying null on varsize attribute 
init both pos and len


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  init both pos and len
 2006-02-07 11:27:11 +01:00
unknown
3449ca1aa8 MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event 2006-02-07 10:26:32 +01:00
unknown
ad97790a5c MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event 
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  ndb, added additional getters on NdbDictionary::Event
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  ndb, added additional getters on NdbDictionary::Event
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  ndb, added additional getters on NdbDictionary::Event
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  ndb, added additional getters on NdbDictionary::Event
 2006-02-07 10:03:03 +01:00
unknown
e379b87e2e merge 2006-02-06 21:52:27 +01:00
unknown
568f7cd281 merge 2006-02-06 21:47:30 +01:00
unknown
756e8015ad Merge perch.ndb.mysql.com:/home/jonas/src/51-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  SCCS merged
 2006-02-06 21:31:34 +01:00
unknown
9023ebf5c1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-02-06 21:29:08 +01:00
unknown
50e8f3a34a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/psergey/mysql-5.1-wl2985-postfixes
 2006-02-06 19:11:14 +03:00
unknown
dc5b10d3c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-06 17:11:13 +01:00
unknown
5bcd374cab Bug #17160 test case ndb_restore leaves a core file 2006-02-06 17:10:03 +01:00
unknown
4f9e66daa4 WL#2985 "Partition pruning", "do pruning for UPDATE/DELETE": Post-merge fixes 2006-02-06 18:33:39 +03:00
unknown
456d7b3c05 harmonized mysql-test-run.sh and .pl 
+ added current test printout to error file


mysql-test/lib/mtr_cases.pl:
  harmonized mysql-test-run.sh and .pl
 2006-02-06 15:42:26 +01:00
unknown
642e222c4e Fix merge (5.0 -> 5.1) of the patch for BUG#15166/15196. 
mysql-test/r/trigger-grant.result:
  Updated result file: use TRIGGER instead of SUPER for BUG#15166/15196 tests.
sql/item.cc:
  Updated according to the 5.1 data structures.
 2006-02-06 16:05:20 +03:00
unknown
4c77c3dd17 bug#16767, bug#16768 - ndb missleading names of error codes 
rename error codes


mysql-test/t/ndb_dd_ddl.test:
  rename error code
sql/ha_ndbcluster.cc:
  rename error code
sql/share/errmsg.txt:
  rename error code
 2006-02-06 13:27:16 +01:00
unknown
18f4a81db2 Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rev-1.2004.2.1 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree


mysql-test/r/trigger-grant.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/trigger-grant.test:
  Merged.
sql/sql_trigger.cc:
  Merged.
 2006-02-06 15:23:17 +03:00
unknown
e1fc02ef9d Merge mysql.com:/M50/tmp-5.0 into mysql.com:/M51/bug16730-5.1 
mysql-test/t/ctype_ucs.test:
  Auto merged
 2006-02-06 12:11:29 +01:00
unknown
d59a2fc488 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
 2006-02-06 11:48:47 +01:00
unknown
7922443ea8 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2006-02-06 11:48:38 +01:00
unknown
b7cbf0090f Bug #17038, distribution of schema operation to multiple binlogs missing/multiple entries, partial fix 
- log alter table directly in server instead of in handler
- acknowledge alter table _after_ all binlog events have been processed
 2006-02-06 11:47:12 +01:00
unknown
49bc13bfb6 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2006-02-06 11:46:40 +01:00
unknown
db4d82bad4 bug#13966 - ndb 
better error message on invalid config change


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Change error message...note that this is a guess
 2006-02-06 11:42:44 +01:00
unknown
c9147c5ecb bug#13965 
ndb - error while restarting in dict
        improve error message when changed config leads to failed restart


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  improve error message
 2006-02-06 11:30:56 +01:00
unknown
62985d2eaf bug#16873 - 
Print creating of dd objects during ndb_restore


storage/ndb/tools/restore/consumer_restore.cpp:
  Print creating of dd objects
 2006-02-06 10:07:15 +01:00
unknown
b6db70c933 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-02-06 09:38:13 +01:00
unknown
1c9178c16f ndb dd - 
fix uninit variable in lgman


storage/ndb/src/kernel/blocks/lgman.cpp:
  fix uninit variable
 2006-02-06 08:01:58 +01:00
unknown
c769183b59 ndb 
Fix for wierd var key restore problem


storage/ndb/src/kernel/blocks/restore.cpp:
  Fix? for wierd var key restore problem
 2006-02-06 07:30:12 +01:00
unknown
0cea4e5378 ndb - TUP scan: unlock outstanding locks on scan close (lost+found patch) 
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  unlock outstanding locks on scan close
 2006-02-05 23:51:47 +01:00
unknown
6344fd64a5 Merge 
mysql-test/t/partition_pruning.test:
  Auto merged
mysql-test/r/partition_pruning.result:
  SCCS merged
 2006-02-05 23:49:32 +03:00