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

1145 commits

Author SHA1 Message Date
lenz@mysql.com
442a3a98b0 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-5.0-build
 2005-01-10 16:32:03 +01:00
lenz@mysql.com
af7dcec56d - removed the mysql-test/suites/jp test suite and marked all files as gone 2005-01-10 16:19:01 +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
brian@zim.(none)
6c5b0844ea Merge for 5.0 to 5.1 2005-01-06 14:09:13 -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
tulin@build.mysql.com
cee870e9b5 Merge bk-internal:/home/bk/mysql-4.1 
into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra
 2005-01-05 15:55:26 +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
fe8f4ab012 merge 2005-01-01 14:01:37 +01:00
serg@sergbook.mysql.com
a04fc26c54 manually merged 2004-12-31 15:26:24 +01: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
joreland@mysql.com
7b7113a9bf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2004-12-31 09:51:57 +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
joreland@mysql.com
dd32940b50 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2004-12-31 06:14:18 +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
serg@serg.mylan
9f94a42fcc BitKeeper/triggers/pre-delta 
don't checkin for Administrator or mysqldev
sql/log.cc@1.157
    restored a bugfix that was lost in a merge
 2004-12-22 22:59:19 +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
mysqldev@bk-internal.mysql.com
2370f9da7f Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra
 2004-12-20 13:34:25 +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
mysqldev@bk-internal.mysql.com
e4da7f4a40 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra
 2004-12-17 11:46:44 +01: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
ba83763a77 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2004-12-07 08:38:06 +01: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
pekka@mysql.com
a5c311e251 ndb: testing "bk gone" with ndb/tools/old_dirs/ndbnet 2004-12-06 14:14:45 +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