mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32755 commits 2774 branches 343 tags 1.6 GiB
Commit graph

32755 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
eaba4f754f Merge perch.ndb.mysql.com:/home/jonas/src/51-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-10 17:54:44 +02:00
unknown
db916d908a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2006-04-10 17:54:43 +02:00
unknown
5b8147062e Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
 2006-04-10 17:54:42 +02:00
unknown
475acacb83 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-10 17:54:42 +02:00
unknown
e0a19fd904 Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868-work 
into  mysql.com:/home/alexi/bugs/mysql-5.1-15868
 Null-merge


sql/mysqld.cc:
  Null-merge.
 2006-04-10 19:54:41 +04:00
unknown
e9ea296127 Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'. 
Applied changes due Heikki Tuuri.


sql/mysqld.cc:
  Set innodb_thread_concurrency default value to 8 (Bug#15868).
   Changes due to Heikki Tuuri.
 2006-04-10 19:47:41 +04:00
unknown
97ba7d512d Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-10 17:07:32 +02:00
unknown
f1fde80ad0 ndb - 
fix all valgrind warnings in t/ndb_dd (except replication related)


sql/ha_ndbcluster.cc:
  Fix memleak
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Fix valgrind warning
storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
  Fix valgrind warning
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Fix valgrind warning
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix valgrind warning
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fix valgrind warning
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix valgrind warning
storage/ndb/src/ndbapi/ndberror.c:
  Fix valgrind warning
 2006-04-10 17:06:33 +02:00
unknown
7c45e6156d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
 2006-04-10 16:10:19 +02:00
unknown
4618e6eccd Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup 
sql/ha_ndbcluster.cc:
  Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup
  - put ndb tables in read only until binlog is setup properly
sql/ha_ndbcluster_binlog.cc:
  Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup
  - put ndb tables in read only until binlog is setup properly
 2006-04-10 16:08:40 +02:00
unknown
ebf409a8be perform sync slave with master in rpl_ndb_blob2 to ensure that tables get properly dropped on slave... 
- has been causing failed later tests e.g. rpl_ndb_trig004
 2006-04-10 16:06:28 +02:00
unknown
d94f4a42a1 ndb - 
still some valgrind varnings


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  still some valgrind varnings
 2006-04-10 14:14:28 +02:00
unknown
07bc8d8b37 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
 2006-04-10 14:06:06 +02:00
unknown
7844160c23 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  merge
 2006-04-10 14:04:15 +02:00
unknown
10ff221539 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
 2006-04-10 14:03:00 +02:00
unknown
5c4eb337b0 ndb - bug#17607 
5.0->5.1 merge


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge
 2006-04-10 14:02:13 +02:00
unknown
5bdf4ce46a ndb - bug#17607 
4.1->5.0 merge


ndb/src/kernel/blocks/backup/Backup.cpp:
  post merge fix
 2006-04-10 13:51:43 +02:00
unknown
07a477fa2e Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge
 2006-04-10 13:48:26 +02:00
unknown
6187359960 ndb - bug#17607 
fix correct frag count in Backup block


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Fix correct no of fragment records
 2006-04-10 13:45:33 +02:00
unknown
a514095a5d Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-09 20:07:42 -07:00
unknown
cf272cefc0 Disabling test, added bug #18928 
mysql-test/t/disabled.def:
  Adding disabled test for bug
 2006-04-09 19:43:36 -07:00
unknown
9b0da58292 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


sql/log.cc:
  Auto merged
 2006-04-09 23:47:11 +03:00
unknown
dde4ebdd0c 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-04-09 22:17:55 +02:00
unknown
304865a39c Disabled two broken test, created P1 showstoppers from them. 
mysql-test/t/disabled.def:
  Updating for broken tests
 2006-04-09 11:57:25 -07:00
unknown
093f3571c7 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2006-04-09 19:17:26 +02:00
unknown
99afb2bafd Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/r/rpl_temporary.result:
  Auto merged
sql/log.cc:
  Auto merged
 2006-04-09 19:38:59 +03:00
unknown
2478092d13 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
 2006-04-09 19:35:31 +03:00
unknown
2c7fb8f20c 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-04-09 18:19:41 +02:00
unknown
1b221d24a9 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/bugs/mysql-5.1-15758
 2006-04-09 20:19:40 +04:00
unknown
35be8c8892 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145k.mysql.com:/tmp/andrei/5.0.21-bug17284-temp_table
 2006-04-09 18:14:30 +02:00
unknown
8abfc0e755 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/bugs/mysql-5.0-15758
 2006-04-09 20:14:29 +04:00
unknown
9dbf828099 Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work 
into  mysql.com:/home/alexi/bugs/mysql-5.1-15758


sql/sql_cache.cc:
  SCCS merged
sql/sql_class.cc:
  SCCS merged
sql/sql_cursor.cc:
  SCCS merged
 2006-04-09 17:48:47 +04:00
unknown
9f7215d61b BUG#18906 Test case rpl_temporary fails when using --vardir option 
env variable name is fixed.




mysql-test/include/get_binlog_dump_thread_id.inc:
  Fixing to right env $var name.
mysql-test/r/rpl_temporary.result:
  results
 2006-04-09 13:27:53 +03:00
unknown
6051eb31b5 Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2006-04-09 10:40:52 +02:00
unknown
d560d638b8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
 2006-04-09 09:36:59 +02:00
unknown
dbb1511631 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/client.c:
  Auto merged
 2006-04-09 09:35:20 +02:00
unknown
474c502627 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/r/rpl_temporary.result:
  Auto merged
 2006-04-08 18:51:29 +03:00
unknown
b536875132 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-08 16:35:07 +02:00
unknown
6474d79629 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged
 2006-04-08 16:33:59 +02:00
unknown
fe0a63b1b9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2006-04-08 16:08:38 +02:00
unknown
e44359014a #18906: bushbuild reports rpl_temporary fails on solaris, AIX, QNX 
Removing the problematic line from include test file.


mysql-test/include/get_binlog_dump_thread_id.inc:
  replacing replace_result by disable_query_log
mysql-test/r/rpl_temporary.result:
  results
 2006-04-08 16:29:11 +03:00
unknown
53731b7e69 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
sql/sql_repl.cc:
  Auto merged
mysql-test/t/rpl_temporary.test:
  manual merge
 2006-04-08 15:31:47 +03:00
unknown
2e385bcbab Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/client.c:
  Auto merged
 2006-04-08 11:12:02 +02:00
unknown
0157830e94 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-04-08 11:03:46 +02:00
unknown
8f9e1d49b3 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-aid


sql/item.cc:
  Auto merged
 2006-04-08 10:48:33 +02:00
unknown
03920635dc Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-07 17:56:33 -07:00
unknown
8712bebece Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-aid
 2006-04-07 23:39:01 +02:00
unknown
67cbda06b9 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145j.mysql.com:/tmp/5.0.21-bug17284-temp_table
 2006-04-07 22:42:55 +02:00
unknown
ef1ec19744 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-04-07 22:38:53 +02:00
unknown
66806e58e8 plugin/fulltext/configure.in 
no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c
    comments clarified. everything local to a plugin was declared static


plugin/fulltext/configure.in:
  no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c:
  comments clarified. everything local to a plugin was declared static.
 2006-04-07 22:36:04 +02:00