Commit graph

832 commits

Author SHA1 Message Date
vtkachenko@mail.mysql.com
9f640bbad9 logging_ok:
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
2005-01-12 20:55:06 +01:00
joreland@mysql.com
f3baf38dbc merge 2005-01-07 06:47:41 +01:00
brian@zim.(none)
75f282df27 Fix for compiling error in sql_parse 2005-01-06 16:31:18 -08:00
joreland@mysql.com
c39db2febf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-05 21:22:38 +01:00
jonas@mysql.com
6f9e9b55da ndb - getTable retry if DICT busy 2005-01-05 13:37:34 +01:00
joreland@mysql.com
c62ed85054 Merge 2005-01-04 19:12:01 +01:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
mskold@mysql.com
9647a076a6 Merge 2005-01-03 14:33:00 +01:00
mskold@mysql.com
689748b548 Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2005-01-03 09:46:59 +01:00
paul@snake-hub.snake.net
fc0d550bad set_var.cc:
Silence compiler warning.
2005-01-02 15:10:08 -06:00
joreland@mysql.com
7f6fb4d9de Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 10:07:49 +01:00
vtkachenko@intelp4d.mysql.com
ae1b969c8f Merge bk-internal:/home/bk/mysql-5.0
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
2004-12-31 09:00:34 +01:00
joreland@mysql.com
8f2d0ec1a1 merge 2004-12-31 06:36:32 +01:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
mskold@mysql.com
76b2df6043 Merged bugfix 2004-12-30 21:36:16 +01:00
marty@linux.site
1ddb554b8b Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2004-12-30 19:56:09 +01:00
georg@beethoven.site
448d453ac1 Merge from 4.1: fix for bug #7285 (embedded server) 2004-12-30 17:17:21 +01:00
vtkachenko@intelp4d.mysql.com
78846b2923 logging_ok:
Logging to logging@openlogging.org accepted
sql_yacc.yy, sql_parse.cc, sql_lex.h, lex.h:
  Implements the SHOW MUTEX STATUS command
set_var.cc, mysqld.cc, mysql_priv.h:
  Added new GLOBAL variable timed_mutexes
ha_innodb.h:
  New function innodb_mutex_show_status
ha_innodb.cc:
  Added new innodb variables in SHOW STATUS
  Implements the SHOW MUTEX STATUS command
innodb.test, innodb.result:
  Added new row_lock_waits status variables tests.
variables.test, variables.result:
  test new variable timed_mutexes
ut0ut.c:
  New function ut_usectime.
sync0sync.c:
  Mutex counting.
sync0rw.c:
  New mutex parameters initialization.
srv0srv.c:
  Counting row lock waits
row0sel.c, row0mysql.c:
  Setting row_lock or table_lock state to thd.
que0que.c:
  Added default no_lock_state to thd.
univ.i:
  Added UNIV_SRV_PRINT_LATCH_WAITS debug define
sync0sync.ic:
  Count mutex using.
sync0sync.h:
  Added new parameters to mutex structure for counting.
sync0rw.h:
  Added new parameters to rw_create_func.
srv0srv.h:
  Added new innodb varuables to SHOW STATUS.
que0que.h:
  Added thread lock states.
2004-12-24 12:13:32 +01:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
joreland@bk-internal.mysql.com
c3eb3c0a62 ndb - run full mysql-test-run in autotest 2004-12-22 09:01:49 +01:00
jon@gigan.
4b881691af Changes in config for generation of NDB API docs:
don't include header files or class private members;
do include class static members.
2004-12-21 20:52:52 +10:00
marty@shark.
9f8fb94a81 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into shark.:/home/marty/MySQL/mysql-5.0-ndb
2004-12-20 14:02:42 +01:00
marty@shark.
2cf2f2bd07 logging_ok:
Logging to logging@openlogging.org accepted
compile-amd64-max, compile-amd64-debug-max:
  new file
2004-12-20 13:32:02 +01:00
paul@frost.snake.net
adfb20f64a fill_help_tables.sh:
Convert @samp{c} to 'c', not c.
2004-12-18 14:22:20 -06:00
joreland@mysql.com
652a29711b merge 2004-12-18 11:49:15 +01:00
joreland@mysql.com
9184b05435 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-18 11:49:14 +01:00
matt@booty.(none)
35942c09de my-innodb-heavy-4G.cnf.sh:
I fixed the typos in the transaction-isolation comments.
  I fixed the spelling mistakes in the comment.  It had tripped up a support 
  customer as they couldn't start the server with transaction-isolation=
  read-commited
2004-12-17 22:25:35 -05:00
joreland@mysql.com
cfa20fbaa6 merge 2004-12-17 10:36:14 +01:00
joreland@mysql.com
5fe332db5e merge 2004-12-16 22:42:27 +01:00
joreland@mysql.com
59536a0043 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-16 22:23:34 +01:00
joreland@mysql.com
0ca5b5637e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-16 22:22:18 +01:00
ndbdev@shark.
d3a8f6b9bd don't compile instance-manager by default, as it never compiles 2004-12-15 09:14:19 +01:00
kaa@polly.local
2ce0ad6d7e Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0 2004-12-14 22:26:31 +03:00
anjuta@arthur.local
f9451974be WL#1051, more maintanable error messages. 2004-12-13 22:51:54 +02:00
stewart@mysql.com
57d5d6c09e Remove dead code 2004-12-08 20:13:33 +11:00
joreland@mysql.com
50e15affff Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl1744
2004-12-06 14:52:31 +01:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
stewart@mysql.com[stewart]
00915656e7 Add (optional) endian parameter to 'get nodeid' to warn on endian conflicts. 2004-12-06 11:41:16 +11:00
jimw@mysql.com
4b8e96d5ca Merge 2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682)
(Original fix reimplemented after review by Serg and Guilhem.)
2004-12-03 00:05:11 +01:00
mwagner@mysql.com
d6efb4bbfd configure.in:
Incremented for next version
2004-12-02 07:24:08 +01:00
mwagner@mysql.com
2e0d1b3f9c openssl_1.result, have_openssl_1.require, openssl_1.test:
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
2004-12-01 02:35:02 +01:00
tomas@poseidon.ndb.mysql.com
97c8234b46 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2004-11-26 13:44:49 +00:00
timour@mysql.com
f1e86036ee Merge mysql.com:/home/timka/mysql/src/4.0-virgin
into mysql.com:/home/timka/mysql/src/4.0-master
2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c Merge 2004-11-25 12:23:41 +01:00
timour@mysql.com
38ab93c6be Merge for BUG#3759 which was missing from the main tree for some reason. 2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e Merge mysql.com:/space/bkroot/mysql-4.0
into mysql.com:/space/bk/b6148-mysql-4.0
2004-11-25 09:38:52 +01:00
petr@mysql.com
edc868e397 Added --disable-log-bin option to the mysqlbinlog (WL1787) 2004-11-19 18:35:36 +03:00
timour@mysql.com
5d1f920ba7 correct name of function in synopsis 2004-11-18 16:52:45 +02:00
joreland@mysql.com
f63b126f7e Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-15 10:50:58 +01:00