Commit graph

26445 commits

Author SHA1 Message Date
unknown
06fc0e8b8a Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug13136
2005-09-15 00:31:13 +10:00
unknown
6a47ca25e0 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-14 16:30:48 +02:00
unknown
18196ce16f Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 16:30:32 +02:00
unknown
e33c22a1a3 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-14 17:28:28 +03:00
unknown
eae520f383 postmerge fix 2005-09-14 17:27:33 +03:00
unknown
c6ff73b91f BUG#13136 NdbTCP.cpp compile failure on OSX 10.2
use select if poll is unavailable.


ndb/src/common/portlib/NdbTCP.cpp:
  Implement Ndb_check_socket_hup for systems without poll(2)
ndb/src/common/portlib/win32/NdbTCP.c:
  fix typo (found while fixing this bug)
2005-09-15 00:21:25 +10:00
unknown
70f1645617 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 15:47:15 +02:00
unknown
840ab3dd1e enabled mysqldump hex-blob option for bit fields 2005-09-14 15:46:31 +02:00
unknown
d51c50b875 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-09-14 15:28:23 +02:00
unknown
b0aa4c95b6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-09-14 15:24:52 +02:00
unknown
423bbd6594 Fix for Metrowerks compiler. 2005-09-14 16:10:56 +03:00
unknown
6a683cb765 Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
2005-09-14 14:34:45 +02:00
unknown
abd4974fd5 Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent).
mysql-test/lib/mtr_process.pl:
  Handle errors in child processes separate from the parent process (patch supplied by Kent).
mysql-test/lib/mtr_report.pl:
  New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
  Expected to avoid HUP signals.
2005-09-14 13:55:53 +02:00
unknown
afbfd12ed2 indentation correction 2005-09-14 13:44:44 +02:00
unknown
a150392317 Merge mysql.com:/home/mydev/mysql-4.1-4100
into  mysql.com:/home/mydev/mysql-5.0-5000


include/my_sys.h:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/mysqld.cc:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/structs.h:
  Manual merge.
2005-09-14 13:37:16 +02:00
unknown
258c9e9dc7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 13:27:57 +02:00
unknown
a3f87ca4c7 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 13:27:57 +02:00
unknown
e2b72d815f (corrected typo in prev patch) Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB 2005-09-14 13:24:41 +02:00
unknown
5fe65297d2 Bug#12920 - key_read_requests counter appears to re-set
After merge fix.


include/keycache.h:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Enlarging them there.
include/my_sys.h:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Removed unused global variables.
myisam/mi_test2.c:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Changed to print default key cache status.
mysys/mf_keycache.c:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Changed their debug printout.
sql/mysqld.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Changed to print full value.
sql/sql_show.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Added a branch for long long values.
sql/sql_test.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  changed to print full values.
sql/structs.h:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Added a branch for long long keycache values.
2005-09-14 13:18:16 +02:00
unknown
a5903ed9f3 Minor output format change of the Perl test suite script (align with the shell script).
mysql-test/lib/mtr_report.pl:
  Make the Perl test script output identical to that of the (old) shell script,
  so that reported differences compare as equal strings (for automatic analysis).
2005-09-14 13:12:30 +02:00
unknown
8eb6256618 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000


include/my_global.h:
  Auto merged
2005-09-14 13:07:25 +02:00
unknown
0b318fd64f Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
2005-09-14 14:54:48 +04:00
unknown
33b1d6f63d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0


sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  merge
2005-09-14 13:37:40 +03:00
unknown
e7d7e0e92f Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB tables 2005-09-14 11:41:36 +02:00
unknown
2fcdbb8d7e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0


sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2005-09-14 12:26:09 +03:00
unknown
98b6fd8797 postmerge fix 2005-09-14 12:24:14 +03:00
unknown
89e0804df0 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-14 10:54:52 +02:00
unknown
8c86f8e4bf Post-review fix for BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers
mysql-test/r/sp.result:
  Added missing drop table.
mysql-test/t/sp.test:
  Added missing drop table.
sql/sp_head.h:
  Post-review fix for autocommit check in SPs and triggers.
sql/sql_yacc.yy:
  Post-review fix for autocommit check in SPs and triggers.
2005-09-14 10:54:02 +02:00
unknown
a55963f0ad Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-14 12:42:23 +04:00
unknown
4f71165544 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050913150614|63378
extra/yassl/taocrypt/src/integer.cpp:
  Exclude
2005-09-14 10:34:45 +02:00
unknown
683e228a26 Merge mysql.com:/home/mydev/mysql-4.0-4000
into  mysql.com:/home/mydev/mysql-4.1-4100


include/my_sys.h:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
myisam/mi_test2.c:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
mysys/mf_keycache.c:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
sql/mysqld.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
sql/sql_test.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
2005-09-14 10:34:41 +02:00
unknown
12dfd287c4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml
2005-09-14 13:20:21 +05:00
unknown
d0a78e6fa6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/func_in.result:
  merge
mysql-test/r/lowercase_view.result:
  merge
mysql-test/r/mysqldump.result:
  merge
mysql-test/r/sql_mode.result:
  merge
mysql-test/r/temp_table.result:
  merge
mysql-test/r/view.result:
  merge
mysql-test/t/view.test:
  merge
2005-09-14 11:07:04 +03:00
unknown
07b61cbb25 Bug#12920 - key_read_requests counter appears to re-set
Enlarged the counter variables to ulonglong.
2005-09-14 09:56:49 +02:00
unknown
f7aeb6f9fd part 1 (ver 2, postreview fix) of WL#2787
view definer information syntax/storage/replication
fixed SOURCE field of .frm


mysql-test/r/func_in.result:
  definer information added to CREATE VIEW
mysql-test/r/lowercase_view.result:
  definer information added to CREATE VIEW
mysql-test/r/mysqldump.result:
  definer information added to CREATE VIEW
mysql-test/r/rpl_view.result:
  check log of queries
mysql-test/r/skip_grants.result:
  --skip-grants do not allow use user information
mysql-test/r/sql_mode.result:
  definer information added to CREATE VIEW
mysql-test/r/temp_table.result:
  definer information added to CREATE VIEW
mysql-test/r/view.result:
  definer information added to CREATE VIEW
  test of storing/restoring definer information
mysql-test/r/view_grant.result:
  test of grant check of definer information
  definer information added to CREATE VIEW
mysql-test/t/rpl_view.test:
  check log of queries
mysql-test/t/skip_grants.test:
  --skip-grants do not allow use user information
mysql-test/t/view.test:
  test of storing/restoring definer information
mysql-test/t/view_grant.test:
  test of grant check of definer information
sql/mysql_priv.h:
  CREATE/ALTER VIEW print support
  set current user as definer procedure
sql/share/errmsg.txt:
  new errors/warnings
sql/sql_acl.cc:
  make find_acl_user public to allow to check user
sql/sql_acl.h:
  make find_acl_user public to allow to check user
sql/sql_lex.h:
  storing definer information
sql/sql_parse.cc:
  send CREATE/ALTER VIEW for replication with full list of options
  set current user as definer procedure
sql/sql_show.cc:
  new CREATE VIEW options printed
sql/sql_view.cc:
  check of definer clause
  changes in .frm file
  definer information storage support
  now we store only original SELECT in SOURCE field of .frm
sql/sql_yacc.yy:
  definer information sintax support
  getting SOURCE field information for .frm
sql/table.h:
  definer information storage
2005-09-14 10:53:09 +03:00
unknown
f42792275f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml


sql/sql_show.cc:
  Auto merged
2005-09-14 12:46:03 +05:00
unknown
38c43ecdd3 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0


sql/sql_yacc.yy:
  Auto merged
2005-09-14 09:43:02 +02:00
unknown
a8d4bfd168 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-14 09:40:20 +02:00
unknown
392dd4d0f3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
2005-09-14 09:35:56 +02:00
unknown
2828c5f594 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-09-14 12:11:19 +05:00
unknown
77a7ba13db formatting typo fix 2005-09-14 12:10:07 +05:00
unknown
a8c1ea9731 Fix QNX warning
include/my_global.h:
  Avoid warnings on QNX, only define HAVE_RINT if not found by configure
2005-09-14 08:33:00 +02:00
unknown
48eae98cca Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_base.cc:
  Auto merged
2005-09-14 08:32:32 +02:00
unknown
ab5b9baf53 Improvement to federated for BUG#12659
Now many direct references to my_error() have been removed.


mysql-test/r/federated_archive.result:
  new results with new error message
mysql-test/t/federated_archive.test:
  corrected error number
sql/ha_federated.cc:
  some minor 80 column formatting
  corrected some error handling to be more handler print_error friendly
  moved duplicate code into new "stash_remote_error" function
sql/ha_federated.h:
  added error number, and places to stash error message and number
  added private method to stash error
2005-09-13 23:31:17 -07:00
unknown
ee4b49698d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new


mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
2005-09-14 08:10:18 +02:00
unknown
50c1bdcd06 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-14 07:30:04 +04:00
unknown
685173664a fix for Bug #12979 Stored procedures: crash if inout decimal parameter
mysql-test/r/sp.result:
  fix result
mysql-test/r/type_newdecimal.result:
  fix result
mysql-test/t/sp.test:
  add a test for the bug
mysql-test/t/type_newdecimal.test:
  add a test for the bug
sql/item_func.cc:
  call correct method of the item
2005-09-14 07:25:32 +04:00
unknown
74b5120554 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ubuntu.(none):/home/reggie/bk/mysql-5.0
2005-09-13 20:40:19 -05:00
unknown
4f4ab005af Removed compiler warnings 2005-09-14 04:40:18 +03:00
unknown
15eb2477ca Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.mysql.fi:/home/my/mysql-5.0


mysql-test/t/mysqldump.test:
  Auto merged
2005-09-14 04:18:38 +03:00