Commit graph

13113 commits

Author SHA1 Message Date
unknown
3414f67485 Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040526164114|35829
innobase/que/que0que.c:
  Exclude
2004-06-17 12:40:09 +03:00
unknown
beb80a37a6 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


innobase/srv/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
2004-06-17 12:35:04 +03:00
unknown
b01f938791 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
unknown
a00824b53b Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870
BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96:
  Exclude
BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e:
  Exclude
innobase/include/que0que.h:
  Exclude
innobase/include/trx0roll.h:
  Exclude
innobase/include/trx0trx.h:
  Exclude
innobase/include/usr0sess.h:
  Exclude
innobase/que/que0que.c:
  Exclude
innobase/srv/Makefile.am:
  Exclude
innobase/include/Makefile.am:
  Exclude
innobase/srv/srv0srv.c:
  Exclude
innobase/trx/trx0purge.c:
  Exclude
innobase/trx/trx0roll.c:
  Exclude
innobase/trx/trx0trx.c:
  Exclude
innobase/usr/usr0sess.c:
  Exclude
2004-06-17 11:57:45 +03:00
unknown
6a99971f1b 2004-06-17 11:57:24 +03:00
unknown
c1ef1bea7d Cset exclude: heikki@hundin.mysql.fi|ChangeSet|20040617084849|64488
sql/sql_parse.cc:
  Exclude
2004-06-17 11:53:17 +03:00
unknown
baee0670da tux optim 8 - store complete AttributeDescriptor (prepare for next step) 2004-06-17 10:51:25 +02:00
unknown
1696521e69 Cset exclude: guilhem@mysql.com|ChangeSet|20040609132715|17355
sql/sql_parse.cc:
  Exclude
2004-06-17 11:48:49 +03:00
unknown
3d2949e5b8 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
unknown
41c3dc082c tux optim 7 - use physical TUP address for index entries 2004-06-17 10:03:08 +02:00
unknown
ef06d62153 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
unknown
8000e4134c a test case (Bug #4102 Crash with a DBUG window after a request) 2004-06-17 12:47:58 +05:00
unknown
d3b0753da3 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
unknown
a9eb4993ea 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
unknown
eb48a074b8 build fixes for ndb 2004-06-17 00:34:05 +00:00
unknown
137eea617b 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
unknown
74d0f47ec2 - mysql_stmt_send_long_data commented. A few other comments. 2004-06-17 02:03:15 +04:00
unknown
1fbe91f720 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


innobase/fil/fil0fil.c:
  Remove the use of mem_realloc in fil0fil.c; mem_alloc() 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
unknown
c0edb2e0ce ut0mem.c:
Remove printf's that were accidentally pushed in the last push


innobase/ut/ut0mem.c:
  Remove printf's that were accidentally pushed in the last push
2004-06-16 23:46:47 +03:00
unknown
ce4973d616 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()


innobase/pars/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()
innobase/pars/lexyy.c:
  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()
innobase/ut/ut0mem.c:
  Implement ut_realloc
innobase/include/ut0mem.h:
  Implement ut_realloc
2004-06-16 23:42:58 +03:00
unknown
78f975ee76 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
unknown
340162df2c Comments and cleanups in client library.
include/mysql.h:
  mysql_bind_param -> mysql_stmt_bind_param
libmysql/libmysql.c:
  - more comments
  - trailing spaces stripped
  - update_statement_metadata moved to appropriate section (from 'Statement
  close and error reporting' section)
  - store_param_type moved to store_ functions
2004-06-16 23:11:02 +04:00
unknown
fce76a7644 mem0mem.ic, mem0mem.h:
Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow


innobase/include/mem0mem.h:
  Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow
innobase/include/mem0mem.ic:
  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
unknown
6b099d2c1b 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
unknown
52442e983b Error message edits. 2004-06-16 11:59:35 -05:00
unknown
eb5a62a5aa 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
unknown
6e048c1fcb 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
unknown
5ebed1893e 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
unknown
46fbf38467 .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


BitKeeper/deleted/.del-mysqlcluster~26c9c37938503734:
  Delete: ndb/bin/mysqlcluster
BitKeeper/deleted/.del-mysqlcluster_install_db~f363f803506081a6:
  Delete: ndb/bin/mysqlcluster_install_db
BitKeeper/deleted/.del-mysqlclusterd~7ebaf8faea0a1100:
  Delete: ndb/bin/mysqlclusterd
2004-06-16 16:59:33 +00:00
unknown
75c8744334 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
unknown
f677d4c14a bug fix in ndb make 2004-06-16 16:50:05 +00:00
unknown
cb0486992b tux optim 6 - remove node cache 2004-06-16 18:21:38 +02:00
unknown
becde519f9 tux optim 5 - move node ops to class level (prepare to remove node cache) 2004-06-16 17:54:08 +02:00
unknown
e1179bc7be tux optim 4 - update prefixes at once (prepare to remove node cache) 2004-06-16 17:14:29 +02:00
unknown
f54dc75075 tux optim 3 - use TUP methods instead of TUP_STORE_TH signal 2004-06-16 16:28:17 +02:00
unknown
a09ecb2504 InnoDB bug fix: mem_realloc() didn't preserve the block contents
innobase/include/mem0mem.ic:
  mem_realloc(): preserve the old buffer contents
2004-06-16 17:22:35 +03:00
unknown
fe497c0b50 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
unknown
1efa7ea50f 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
unknown
7f7c311b73 cxx compile fix for ndb 2004-06-16 14:06:44 +00:00
unknown
2f77600be5 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
unknown
7b2357e03a a fix (Bug #4102 Crash with a DBUG window after a request) 2004-06-16 18:43:05 +05:00
unknown
5522ffd35d Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-06-16 15:31:37 +02:00
unknown
4e6a71f80c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-16 15:31:36 +02:00
unknown
52be66a2c9 Makefile.am:
missing file


ndb/include/Makefile.am:
  missing file
2004-06-16 13:31:35 +00:00
unknown
150ca231eb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-06-16 13:18:35 +00:00
unknown
eec2835d63 tux optim 2 - use physical TUP address for index nodes 2004-06-16 15:10:13 +02:00
unknown
a9d4556649 new length detection for non-string in UNION (BUG#4067)
mysql-test/r/subselect.result:
  new length in UNION
mysql-test/r/union.result:
  new length in UNION
  test of int with wrong display length
mysql-test/t/union.test:
  test of int with wrong display length
sql/item.cc:
  new length detection for non-string
sql/item.h:
  new length detection for non-string
2004-06-16 16:06:30 +03:00
unknown
0300c89551 tux optim 1 - use physical fragment addresses 2004-06-16 14:30:49 +02:00
unknown
16c5f173e8 don't bother creating Makefiles that are not needed 2004-06-16 15:13:17 +03:00
unknown
19f865189a - Modified Do-compile to build, package and test NDB cluster, when
enabled


Build-tools/Do-compile:
   - removed redundant option "--without-ndbcluster" (we already have
     "--with-cluster" for that)
   - make sure to add the cluster files in the binary distribution
   - make sure to run mysql-test-run with NDB tests enabled
2004-06-16 13:57:45 +02:00