Commit graph

12902 commits

Author SHA1 Message Date
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
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
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
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
unknown
cf5d0db657 Another place where Bug#4079 "error checking in prepared statements"
pops up fixed.


libmysql/libmysql.c:
  Another place where Bug#4079 pops up fixed.
2004-06-16 14:06:39 +04:00
unknown
95325f1354 Compilation error on AIX (IBM C Compiler Version 6) fixed. 2004-06-16 11:29:22 +04:00
unknown
0f8194611e packet.result, alter_table.result:
fix up test result.


mysql-test/r/alter_table.result:
  fix up test result.
mysql-test/r/packet.result:
  fix up test result.
2004-06-15 23:50:03 -05:00
unknown
e2dc057d1c Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-15 22:20:02 -05:00
unknown
3165c7deda Language/consistency edits to error messages
and affected test results.
2004-06-15 22:18:20 -05:00
unknown
cf59563273 row0ins.c:
Return the code of row_ins_foreign_check_on_constraint() as close to 4.0 as possible, except that we use mem_strdup() to allocate the memory for the modified table name


innobase/row/row0ins.c:
  Return the code of row_ins_foreign_check_on_constraint() as close to 4.0 as possible, except that we use mem_strdup() to allocate the memory for the modified table name
2004-06-16 04:08:07 +03:00
unknown
563920080d InnoDB: fix bug in call to innobase_invalidate_query_cache(),
introduced in ChangeSet@1.1843.1.25
InnoDB: fix bug in the error exit of
  fil_create_new_single_table_tablespace(), introduced in
  ChangeSet@1.1843.1.11


innobase/row/row0ins.c:
  row_ins_foreign_check_on_constraint():
   the string passed to innobase_invalidate_query_cache() was truncated;
   now it is passed correctly again
innobase/fil/fil0fil.c:
  fil_create_new_single_table_tablespace():
   delete the file if fil_space_create() fails
2004-06-16 01:55:24 +03:00
unknown
ead8bb63a9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-15 23:50:00 +02:00
unknown
68e71a6d9f 1) Send CM_REGCONF JBA so that CM_ADD doesn't "pass"
2) Fix = -> == in coupl eof require's
2004-06-15 23:48:08 +02:00
unknown
c99321d0c9 wl1292 - fix report
ndb/test/run-test/make-html-reports.sh:
  result is relative report.html
2004-06-15 23:18:56 +02:00
unknown
15928e777a 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-15 22:58:14 +02:00
unknown
0f7db9f4f3 wl1292 - updated make-html-reports.sh script 2004-06-15 22:57:21 +02:00
unknown
1926d4ee34 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-15 15:41:22 -05:00
unknown
b1cecee055 Language/consistency edits to error messages
and affected test results.
2004-06-15 15:38:36 -05:00
unknown
29c22ddac8 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-15 10:35:06 -05:00
unknown
90876da0e4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-15 07:52:42 -05:00
unknown
a35bd15773 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-06-15 14:49:25 +02:00
unknown
c488fe233c Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-15 14:41:23 +02:00
unknown
ee7bc435e3 - make sure to define NDEBUG in my_dbug.h, when DBUG_OFF is defined
(to disable assertions)


include/my_dbug.h:
   - make sure to define NDEBUG, when DBUG_OFF is defined (to disable
     assertions)
2004-06-15 14:37:45 +02:00
unknown
408dad07a9 Adding SHUTDOWN_WAIT_STATEMENTS to the possible arguments of mysql_shutdown().
Comments on names still welcome.


include/mysql_com.h:
  one more possible shutdown level
2004-06-15 14:28:00 +02:00
unknown
f7b1750659 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


configure.in:
  Auto merged
2004-06-15 11:30:00 +00:00
unknown
0f83847940 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4035


sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
2004-06-15 16:03:16 +05:00
unknown
40b08dce0b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-15 13:02:07 +02:00
unknown
2ef5b0ed4e We don't need tmp_value member in the Item_func_left.
sql/item_strfunc.cc:
  We don't need tmp_value member here.
sql/item_strfunc.h:
  We don't need tmp_value member here.
2004-06-15 16:01:43 +05:00
unknown
fa4b3f0fcc - compile fix for regex/regcomp.c spotted on Mac OS X
(too few arguments)


regex/regcomp.c:
   - compile fix spotted on Mac OS X (too few arguments)
2004-06-15 12:58:58 +02:00
unknown
aba49a6c0b API change: mysql_shutdown() now needs a 2nd parameter, the shutdown level.
Server will however still accept shutdown without specified level; so that old
mysqladmin can still shut server down.
I would like your comments on the names of shutdown level which I chose. You
are welcome to propose better names. Please however check WL#709 before.
Reason for the names I propose is to be accurate, thus leaving possibility
for other levels which we may imagine in the future; that's why I have rejected
names like "fast", "smart", "graceful" so far. My position is that WAIT_ALL_BUFFERS
or WAIT_CRITICAL_BUFFERS say what the shutdown does, whereas for "smart", "fast" you
need to remember what it does.
This should be pushed in 4.1.3 but only after your comments.


client/mysqladmin.c:
  2nd parameter for mysql_shutdown()
include/mysql.h:
  2nd paramater for mysql_shutdown()
include/mysql_com.h:
  4 types of shutdown
libmysql/libmysql.c:
  passing the requested shutdown level
sql/sql_parse.cc:
  check for the shutdown level in dispatch_command(). Though its value is ignored for now.
tools/mysqlmanager.c:
  2nd parameter to mysql_shutdown
2004-06-15 11:35:23 +02:00