Commit graph

21354 commits

Author SHA1 Message Date
unknown
c0df4eb1fc Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-20 21:18:22 +01:00
unknown
b3e7d6fa70 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-20 21:16:15 +01:00
unknown
a8007724f8 merge 2005-03-20 20:11:44 +01:00
unknown
5827a23bc7 ndb -
Fix uninit variable (potential segv) in Dbacc::sendNextScanConf
  discovered by magnus addition in "globals_list"


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix uninit variable (potential segv) in sendNextScanConf
    discovered by magnus addition in "globals_list"
2005-03-20 20:07:12 +01:00
unknown
2ba3544f0e func_group.test, func_group.result:
Added a test case for bug #9210.
sql_select.cc:
  Fixed bug #9210.
  The function calc_group_buffer did not cover the case
  when the GROUP BY expression was decimal.
  Slightly optimized the other code.


sql/sql_select.cc:
  Fixed bug #9210.
  The function calc_group_buffer did not cover the case
  when the GROUP by expression was decimal.
  Slightly optimized the other code.
mysql-test/t/func_group.test:
  Added a test case for bug #9210.
2005-03-19 23:12:50 -08:00
unknown
648d40ea66 Clean up the warning inside sanity():decimal.c in valgrind-max builds.
sql/my_decimal.h:
  HAVE_purify is defined in valgrind-max build as well: one possible 
  solution is to disable the sanity check in decimal.c in the valgrind-max
  build, but it's better to have more checks than less, for
  valgrind-max builds are not always used in conjunction with valgrind.
2005-03-19 18:39:26 +03:00
unknown
88dcf66808 Cleanup, remove some -ansi -pedancit warnings (mysql_client_test.c)
tests/mysql_client_test.c:
  Cleanup, remove some -ansi -pedancit warnings.
2005-03-19 18:16:38 +03:00
unknown
54f090d48d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-19 13:47:38 +01:00
unknown
fe9bbb24ad Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-19 13:45:51 +01:00
unknown
914929cf43 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 19:33:41 +02:00
unknown
cfec2e4ada data0type.h:
The missing DATA_BINARY_TYPE in BLOBs created with < 4.0.14 does not cause any harm, because there were no indexes on such BLOBs


innobase/include/data0type.h:
  The missing DATA_BINARY_TYPE in BLOBs created with < 4.0.14 does not cause any harm, because there were no indexes on such BLOBs
2005-03-18 19:16:11 +02:00
unknown
809291fb92 data0type.ic:
Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT


innobase/include/data0type.ic:
  Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT
2005-03-18 19:09:22 +02:00
unknown
b6193540c0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2005-03-18 19:04:09 +02:00
unknown
208eed01af Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 18:56:23 +02:00
unknown
8e9219148c Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0


Build-tools/Do-compile:
  Auto merged
2005-03-18 17:36:54 +01:00
unknown
09f511ebde Merge mysql.com:/space/my/mysql-5.0-build
into mysql.com:/space/my/mysql-5.0


Build-tools/Do-compile:
  Auto merged
2005-03-18 17:32:57 +01:00
unknown
479544c76b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-18 17:26:03 +01:00
unknown
b8cd76af50 - removed MyISAM RAID from the Linux "Max" RPMs 2005-03-18 17:24:03 +01:00
unknown
9ba7f59c92 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


Build-tools/Do-compile:
  Auto merged
2005-03-18 17:20:14 +01:00
unknown
5c2240e797 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-18 17:13:13 +01:00
unknown
8580b2d9bd Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-18 17:07:42 +01:00
unknown
0f52fb5197 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0


Build-tools/Do-compile:
  Auto merged
2005-03-18 17:07:41 +01:00
unknown
6c621bbd7f Fixed BUG#6600: Stored procedure crash after repeated calls with check table
mysql-test/r/sp.result:
  New test case for BUG#6600.
mysql-test/t/sp.test:
  New test case for BUG#6600.
sql/sp_head.cc:
  Added yet another multiple result set statement to the list.
sql/sql_parse.cc:
  Have to invalidate SP caches in CHECK TABLE, or it will produce very
  strange results when called in SPs.
2005-03-18 16:52:41 +01:00
unknown
1cc46f6786 mysql-test-run.sh:
Disabled old feature to disable test cases


mysql-test/mysql-test-run.sh:
  Disabled old feature to disable test cases
2005-03-18 16:48:18 +01:00
unknown
02d24bfb48 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/M50/build-5.0.3


Build-tools/Do-compile:
  Auto merged
2005-03-18 15:43:11 +01:00
unknown
7e79e70515 Did some SP test style changes and added explanatory comments,
and removed a have_innodb.inc inclusion which was left by mistake
in an earlier change.


mysql-test/r/sp_trans.result:
  Changed procedure name and delimiter setting to follow the style of the other SP test files.
mysql-test/t/sp-error.test:
  Added comment with hint for bug test case style.
mysql-test/t/sp-threads.test:
  Added comments, with hint for bug test case style.
mysql-test/t/sp.test:
  Removed have_innodb.inc inclusion.
  Added comments about different SP test files, table usage and
  hint for bug test case style.
mysql-test/t/sp_trans.test:
  Changed procedure name and delimiter setting to follow the style of the other SP test files.
2005-03-18 14:33:46 +01:00
unknown
353bcc77fc Merge
Build-tools/Do-compile:
  SCCS merged
2005-03-18 12:54:24 +01:00
unknown
8d29891138 Move mis-placed assignments to their proper position. 2005-03-18 12:44:40 +01:00
unknown
c94570057c Added more tests to grant2. Fixed some previous tests.
Added new logic to ACL system:

1) If GRANT OPTION (not mysql db):
   Ok to update existing user, but not password.
   Not allowed to make a new user.

2) If UPDATE_ACL to mysql DB:
   Ok to update current user, but not make a new one.

3) If INSERT_ACL to mysql DB:
   Ok to add a new user, but not modify existing.

4) If GRANT OPTION to mysql DB:
   All modifications OK.


mysql-test/r/grant2.result:
  Added more ACL tests and fixed results in some old tests.
mysql-test/t/grant2.test:
  Added more ACL tests and fixed results in some old tests.
sql/sql_acl.h:
  Made check_acl_user() visible to sql_parse.cc
sql/sql_parse.cc:
  Added new logic to ACL system:
  
  1) If GRANT OPTION (not mysql db):
     Ok to update existing user, but not password.
     Not allowed to make a new user.
  
  2) If UPDATE_ACL to mysql DB:
     Ok to update current user, but not make a new one.
  
  3) If INSERT_ACL to mysql DB:
     Ok to add a new user, but not modify existing.
  
  4) If GRANT OPTION to mysql DB:
     All modifications OK.
2005-03-18 13:32:28 +02:00
unknown
9d71772238 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 08:20:51 +02:00
unknown
0f58efbd48 Manual merge
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/olap.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Auto merged
2005-03-17 21:47:46 -08:00
unknown
ee2633a7e2 olap.test:
Added a test case for bug #8617.
sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.


sql/sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.
mysql-test/t/olap.test:
  Added a test case for bug #8617.
2005-03-17 20:18:19 -08:00
unknown
7e9984b156 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 17:59:52 -08:00
unknown
832c52d983 Merge mysql.com:/home/jimw/my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 17:27:07 -08:00
unknown
daf0cd1437 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-03-17 17:24:47 -08:00
unknown
63d70574c9 Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254)
sql/sql_select.cc:
  Post-merge correction
2005-03-17 17:22:40 -08:00
unknown
bffe61d807 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 02:25:41 +02:00
unknown
bf0d45ae04 Merge mysql.com:/space/my/mysql-5.0-build
into mysql.com:/space/my/mysql-5.0
2005-03-18 01:25:40 +01:00
unknown
b1f7a9e129 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 15:59:11 -08:00
unknown
116f1f646b - fixed two merge errors 2005-03-18 00:30:20 +01:00
unknown
a22df0edf0 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.0


libmysqld/examples/Makefile.am:
  Auto merged
2005-03-17 14:49:36 -08:00
unknown
cb74bdccfd Missed this file in the embedded server when MIT Threads were removed.
libmysqld/examples/Makefile.am:
  Remove MT_INCLUDE
2005-03-17 14:48:38 -08:00
unknown
5f578edb10 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 14:24:29 -08:00
unknown
d3db27e3bb Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 13:41:21 -08:00
unknown
6fc7c0742e Cleanup of Item_func_group_concat
mysql-test/r/func_gconcat.result:
  Test result fixed.
sql/item_sum.cc:
  Cleanup of Item_func_group_concat:
  - last unobvious things commented
  - don't store NULLs in the tree.
  - remove unneeded variables.
  - use setup_order, not setup_group to setup group concat order list
sql/item_sum.h:
  Cleanup for Item_func_group_concat: remove unneded variables, methods,
  move a bunch of variables to private: section.
2005-03-18 00:41:03 +03:00
unknown
37130fc15d Merge mysql.com:/home/jimw/my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/t/sp.test:
  Auto merged
2005-03-17 13:38:07 -08:00
unknown
d1deb65996 Remove unexistent @MT_INCLUES@ 2005-03-18 00:24:35 +03:00
unknown
63a2b47db7 Merge 2005-03-17 22:17:37 +01:00
unknown
cc9e66f565 sp.test, sp.result:
transactional test removed
sp_trans.test, sp_trans.result:
  new file


mysql-test/r/sp.result:
  transactional test removed
mysql-test/t/sp.test:
  transactional test removed
2005-03-17 22:15:23 +01:00
unknown
9cffa82b41 Merge mysql.com:/space/my/mysql-5.0-build
into mysql.com:/space/my/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2005-03-17 21:54:10 +01:00