Commit graph

13038 commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
0e3c22ea17 log0recv.c:
Revert the patch that put log debug code behind UNIV_LOG_DEBUG
2004-06-17 15:13:27 +03:00
heikki@hundin.mysql.fi
a460d438d8 log0log.h:
Revert the patch that put log debug code behind UNIV_LOG_DEBUG
log0log.ic, log0recv.c, log0log.c, log0log.h:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
2004-06-17 15:11:37 +03:00
joreland@mysql.com
59f45651a0 merge blob code 2004-06-17 14:03:21 +02:00
heikki@hundin.mysql.fi
af35718074 Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040316101802|63386 2004-06-17 14:01:56 +03:00
heikki@hundin.mysql.fi
0e4d79c748 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-06-17 14:01:55 +03:00
gluh@gluh.mysql.r18.ru
5ae1d2843b Fixed issue 'the definition of macro DES_ede3_cbc_encrypt is corrupt' 2004-06-17 15:01:54 +04:00
bell@sanja.is.com.ua
96b470ae59 after review fix (BUG#4067) 2004-06-17 13:48:31 +03:00
heikki@hundin.mysql.fi
15dccebb0f Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 2004-06-17 13:25:06 +03:00
heikki@hundin.mysql.fi
121f3b7ffc Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040526164114|35829 2004-06-17 12:40:09 +03:00
heikki@hundin.mysql.fi
3b96c95fdf srv0que.c:
Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs
srv0que.c, srv0que.h:
  new file
2004-06-17 12:35:04 +03:00
bell@sanja.is.com.ua
523dbb3ef9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-06-17 12:03:00 +03:00
heikki@hundin.mysql.fi
bfb0e28499 Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870 2004-06-17 11:57:45 +03:00
heikki@hundin.mysql.fi
46d0e6777c 2004-06-17 11:57:24 +03:00
heikki@hundin.mysql.fi
0db8e42c77 Cset exclude: heikki@hundin.mysql.fi|ChangeSet|20040617084849|64488 2004-06-17 11:53:17 +03:00
pekka@mysql.com
a8fa01defc tux optim 8 - store complete AttributeDescriptor (prepare for next step) 2004-06-17 10:51:25 +02:00
heikki@hundin.mysql.fi
918dd73f4f Cset exclude: guilhem@mysql.com|ChangeSet|20040609132715|17355 2004-06-17 11:48:49 +03:00
joreland@mysql.com
cbc550e582 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-17 10:26:25 +02:00
pekka@mysql.com
4d8e2ed77a tux optim 7 - use physical TUP address for index entries 2004-06-17 10:03:08 +02:00
joreland@mysql.com
dc8618c647 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-17 09:56:51 +02:00
ram@gw.mysql.r18.ru
5790b17ecb a test case (Bug #4102 Crash with a DBUG window after a request) 2004-06-17 12:47:58 +05:00
tomas@mc05.(none)
189898d4c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-17 08:36:17 +02:00
tomas@poseidon.bredbandsbolaget.se
671a4344c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
2004-06-17 00:34:50 +00:00
tomas@poseidon.bredbandsbolaget.se
23209c023c build fixes for ndb 2004-06-17 00:34:05 +00:00
konstantin@mysql.com
96dc1e8f2e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-17 02:04:02 +04:00
konstantin@mysql.com
5b5af92fa3 - mysql_stmt_send_long_data commented. A few other comments. 2004-06-17 02:03:15 +04:00
heikki@hundin.mysql.fi
79fd0c68d3 fil0fil.c:
Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
2004-06-17 00:21:41 +03:00
heikki@hundin.mysql.fi
8ff57ee469 ut0mem.c:
Remove printf's that were accidentally pushed in the last push
2004-06-16 23:46:47 +03:00
heikki@hundin.mysql.fi
0aa9e45e64 ut0mem.h, ut0mem.c:
Implement ut_realloc
lexyy.c, pars0lex.l:
  Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
2004-06-16 23:42:58 +03:00
konstantin@mysql.com
834e9f870e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-16 23:11:36 +04:00
konstantin@mysql.com
e9f2c7d478 Comments and cleanups in client library. 2004-06-16 23:11:02 +04:00
heikki@hundin.mysql.fi
4a7b9fda98 mem0mem.ic, mem0mem.h:
Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow
2004-06-16 20:24:35 +03:00
pekka@mysql.com
ed37f31575 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-06-16 18:59:35 +02:00
paul@kite-hub.kitebird.com
233ad19e01 Error message edits. 2004-06-16 11:59:35 -05:00
joreland@mysql.com
7a1d2cc790 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-16 18:59:34 +02:00
tomas@mc05.(none)
80d854f754 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-16 18:59:34 +02:00
paul@kite-hub.kitebird.com
7fcdbd5cdb Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-06-16 11:59:34 -05:00
tomas@poseidon.bredbandsbolaget.se
360fcee019 .del-mysqlclusterd~7ebaf8faea0a1100:
Delete: ndb/bin/mysqlclusterd
.del-mysqlcluster_install_db~f363f803506081a6:
  Delete: ndb/bin/mysqlcluster_install_db
.del-mysqlcluster~26c9c37938503734:
  Delete: ndb/bin/mysqlcluster
2004-06-16 16:59:33 +00:00
tomas@poseidon.bredbandsbolaget.se
b3f5a716cb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
2004-06-16 16:51:03 +00:00
tomas@poseidon.bredbandsbolaget.se
52816b100f bug fix in ndb make 2004-06-16 16:50:05 +00:00
pekka@mysql.com
ed51beb999 tux optim 6 - remove node cache 2004-06-16 18:21:38 +02:00
pekka@mysql.com
38cf1a3f8c tux optim 5 - move node ops to class level (prepare to remove node cache) 2004-06-16 17:54:08 +02:00
pekka@mysql.com
518a63c2a4 tux optim 4 - update prefixes at once (prepare to remove node cache) 2004-06-16 17:14:29 +02:00
pekka@mysql.com
5fd214dced tux optim 3 - use TUP methods instead of TUP_STORE_TH signal 2004-06-16 16:28:17 +02:00
marko@hundin.mysql.fi
30606486e7 InnoDB bug fix: mem_realloc() didn't preserve the block contents 2004-06-16 17:22:35 +03:00
lenz@mysql.com
3ac650c86f Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-16 16:06:46 +02:00
bar@mysql.com
f814d224f7 Critical fixes after review:
- mutex was unlocked before the end of the critical sesion,
- Portability issue: It's better to use (*alloc)(x) instead of alloc(x),
  if alloc is a function passed as an argument.
- Use {} around if() block, to avoid possible problems with some Windows compilers.
2004-06-16 19:06:45 +05:00
tomas@poseidon.ndb.mysql.com
10d2bdcbcd cxx compile fix for ndb 2004-06-16 14:06:44 +00:00
ndbdev@ndbmaster.mysql.com
e5eb7d01e1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-06-14
2004-06-16 16:04:20 +02:00
joreland@mysql.com
fcc8d9346f wl1671 - bug fix, null with scans 2004-06-16 16:02:45 +02:00
ram@gw.mysql.r18.ru
6b8222d3a7 a fix (Bug #4102 Crash with a DBUG window after a request) 2004-06-16 18:43:05 +05:00