Commit graph

31091 commits

Author SHA1 Message Date
unknown
7bc46be138 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged
2006-06-30 00:02:17 +02:00
unknown
96a14ba258 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge
2006-06-30 00:00:27 +02:00
unknown
194c63482f Merge mysql.com:/mnt/storeage/mysql-4.1
into  mysql.com:/mnt/storeage/mysql-4.1_bug19298
2006-06-29 17:30:50 -04:00
unknown
52a1639b0e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/merge-4.1
2006-06-30 01:12:16 +04:00
unknown
3c79d36a97 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-29 23:12:15 +02:00
unknown
e6297be853 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
2006-06-29 22:54:49 +02:00
unknown
9bbfa9fbf1 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20230
2006-06-30 00:24:47 +04:00
unknown
8368f437a7 Bug#20230: routine_definition is not null
SHOW CREATE PROCEDURE and SHOW CREATE FUNCTION are fixed as well as
INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME.


mysql-test/r/information_schema.result:
  Add result for bug#20230.
mysql-test/t/information_schema.test:
  Add test case for bug#20230.
sql/sp_head.cc:
  Return NULL for routine definition if the user doesn't have enough
  privilege to see it.
sql/sql_show.cc:
  Make INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME NULL-able.  Return
  NULL if the user doesn't have enough privilege to see routine
  definition.
2006-06-30 00:21:55 +04:00
unknown
d6fe37ae70 corrected merge error 2006-06-29 22:11:29 +02:00
unknown
92695055ff Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
2006-06-29 21:07:07 +02:00
unknown
a47d61723f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  manual merge
2006-06-29 21:05:43 +02:00
unknown
5d506d6b62 Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error 2006-06-29 20:55:21 +02:00
unknown
06763a7225 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge
2006-06-29 18:10:02 +02:00
unknown
801b1afe4d Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/merge-5.0
include/my_sys.h:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
2006-06-29 17:35:59 +02:00
unknown
d326551bdc Test "federated" failed because the log contains fixed port numbers.
Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".


mysql-test/r/federated.result:
  Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
mysql-test/t/federated.test:
  Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
2006-06-29 17:00:48 +02:00
unknown
4ad93b25c8 Merge mysql.com:/home/mydev/mysql-5.0--main
into  mysql.com:/home/mydev/mysql-5.0-bug11824


configure.in:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
2006-06-29 16:53:05 +02:00
unknown
6878aa96b6 Increment the version number. 2006-06-29 16:38:14 +02:00
unknown
c4cffdbfe9 Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.0-merge


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/t/func_time.test:
  Manual merge.
2006-06-29 18:34:49 +04:00
unknown
79f5a97fb9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2006-06-29 16:34:25 +02:00
unknown
b352d9d118 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-06-29 16:31:35 +02:00
unknown
b25c34a6bd Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
2006-06-29 16:22:20 +02:00
unknown
6efd848ce7 ndb - autotest
Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))


ndb/test/ndbapi/testNodeRestart.cpp:
  Fix testNodeRestart -n DuringLCP and others
2006-06-29 16:20:18 +02:00
unknown
a4e5d04db4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 18:17:37 +04:00
unknown
8703b22e16 Fix for bug#13934 Silent truncation of table comments
Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
Table 'comment' is changed from char* to LEX_STRING


mysql-test/r/strict.result:
  test case
mysql-test/t/strict.test:
  test case
sql/handler.h:
  Table 'comment' is changed from char* to LEX_STRING
sql/sql_show.cc:
  Table 'comment' is changed from char* to LEX_STRING
sql/sql_table.cc:
  Table 'comment' is changed from char* to LEX_STRING
sql/sql_yacc.yy:
  Table 'comment' is changed from char* to LEX_STRING
sql/table.cc:
  Table 'comment' is changed from char* to LEX_STRING
sql/table.h:
  Table 'comment' is changed from char* to LEX_STRING
sql/unireg.cc:
  Fix for bug#13934 Silent truncation of table comments
  Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
  Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
2006-06-29 18:39:34 +05:00
unknown
3da456534b Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
2006-06-29 15:15:21 +02:00
unknown
702d34bbaf Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 16:44:21 +04:00
unknown
f8540ba7df Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 16:43:23 +04:00
unknown
ce5ed66f2a A post-merge fix. 2006-06-29 16:31:08 +04:00
unknown
d94521c32d Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2006-06-29 22:30:51 +10:00
unknown
32e2acadc3 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


include/my_sys.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
2006-06-29 14:14:08 +02:00
unknown
16d2ad61c3 Fixed yet another forgotten port number replacement. 2006-06-29 14:03:53 +02:00
unknown
82f5656af3 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release


include/my_sys.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
2006-06-29 14:03:41 +02:00
unknown
f7bc05b6a1 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


sql/ha_ndbcluster.cc:
  Auto merged
2006-06-29 22:00:50 +10:00
unknown
a7f9f7ae74 Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
After view onening real view db name and table name are placed
into table_list->view_db & table_list->view_name.
Item_field class does not handle these names properly during 
intialization of Send_field.
The fix is to use new class 'Item_ident_for_show' 
which sets correct view db name and table name for Send_field.


sql/item.cc:
  Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
  new Item_ident_for_show class which correctly sets view db and table names
  for Send_field.
sql/item.h:
  Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
  new Item_ident_for_show class which correctly sets view db and table names
  for Send_field.
sql/sql_show.cc:
  Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
  new Item_ident_for_show is used for views
tests/mysql_client_test.c:
  Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
  test case
2006-06-29 16:52:46 +05:00
unknown
66f650b931 Merge mysql.com:/home/mydev/mysql-5.0--main
into  mysql.com:/home/mydev/mysql-5.0-bug11824


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
2006-06-29 13:43:56 +02:00
unknown
6695db7fe8 Merge mysql.com:/opt/local/work/mysql-5.0-release
into  mysql.com:/opt/local/work/mysql-5.0-runtime


mysql-test/r/variables.result:
  Auto merged
mysql-test/r/information_schema.result:
  Manual merge.
2006-06-29 15:25:03 +04:00
unknown
89a55ee411 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
2006-06-29 13:25:02 +02:00
unknown
79c03b6854 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 13:25:01 +02:00
unknown
0681b810d1 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 13:03:09 +02:00
unknown
78c814154a fixed too small requestInfo in signal
+ adopted signal to be as close as possible to 5.1...
2006-06-29 13:01:54 +02:00
unknown
728371c56e Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
user name is calculated on function execution stage instead of parse stage


mysql-test/r/sp_notembedded.result:
  Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
  test case
mysql-test/t/sp_notembedded.test:
  Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
  test case
sql/mysql_priv.h:
  Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
  new get_current_user(THD *thd, LEX_USER *user) function
sql/sql_acl.cc:
  Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
  user name is calculated using get_current_user() function
sql/sql_parse.cc:
  Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
  new get_current_user() function
  user name is calculated using get_current_user() function
sql/sql_yacc.yy:
  Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
  empty LEX_USER struct for CURRENT USER, 
  user name is calculated on function execution stage
2006-06-29 15:50:44 +05:00
unknown
8c435bdf7d Replace all numeric error code with symbolic names in trigger.test.
mysql-test/t/trigger.test:
  Replace all numeric error code with symbolic names.
  Left are --error 1 for system error, and --error 1100.  The
  symbolic constant for the latter is ER_TABLE_NOT_LOCKED, but using
  it triggers a bug in test driver due to name prefix collision with
  1099 ER_TABLE_NOT_LOCKED_FOR_WRITE.  This bug is fixed in 5.1.
2006-06-29 13:45:43 +04:00
unknown
474c4e9206 ndb - build
Fix compile error for forte


ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fix compile error for forte
2006-06-29 11:39:07 +02:00
unknown
4c23783cdd Merge knielsen@knielsen.mysql.internal:/usr/local/mysql/tmp-5.0
into  mysql.com:/data0/knielsen/tmp-5.0


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
2006-06-29 10:38:50 +02:00
unknown
9ee8e42d1c Fix test files to work with non-standard ports (MTR_BUILD_THREAD).
mysql-test/t/federated.test:
  Use --replace_result to make test work on non-standard ports.
mysql-test/r/federated.result:
  Use --replace_result to make test work on non-standard ports.
2006-06-29 10:35:16 +02:00
unknown
916c39888f Merge mysql.com:/home/mydev/mysql-4.1-bug19835
into  mysql.com:/home/mydev/mysql-5.0-bug11824


myisam/mi_dynrec.c:
  Auto merged
2006-06-29 10:27:56 +02:00
unknown
389e22c29a Merge mysql.com:/home/mydev/mysql-4.1-bug17877
into  mysql.com:/home/mydev/mysql-5.0-bug11824


myisam/mi_key.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
myisam/mi_check.c:
  Manual merge
mysql-test/r/func_time.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge
2006-06-29 10:26:24 +02:00
unknown
a24a4516f3 Merge mysql.com:/home/mydev/mysql-4.1-bug11824
into  mysql.com:/home/mydev/mysql-5.0-bug11824


myisam/mi_create.c:
  Auto merged
2006-06-29 10:20:07 +02:00
unknown
579d0519a2 Merge mysql.com:/home/mydev/mysql-5.0-amerge
into  mysql.com:/home/mydev/mysql-5.0-bug11824


configure.in:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2006-06-29 10:18:29 +02:00
unknown
d0201bc371 Fix test files to work with non-standard ports (MTR_BUILD_THREAD).
mysql-test/t/federated.test:
  Use --replace_result to make test work on non-standard ports.
mysql-test/r/federated.result:
  Use --replace_result to make test work on non-standard ports.
2006-06-29 10:03:26 +02:00