26407 Commits

Author SHA1 Message Date
unknown
11e0bdd70b Updated test results for view test.
mysql-test/r/view.result:
  Updated test results
2005-09-14 16:27:55 -04:00
unknown
92e4aa67f5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-09-14 16:16:04 -04:00
unknown
78cf7b1960 fixed portability 2005-09-14 23:12:01 +03:00
unknown
de4fbc212c Fix bug #11416 Server crash if using a view that uses function convert_tz
When parser parses function convert_tz it loads available timezone tables in
thd->lex->time_zone_tables_used. But view have another lex that main query.
Thus time_zone_tables_used of main query left uninitialized.
When Item_func_conver_tz is fixed it takes timezone tables from main query
and later when it executed it assumes that timezone tables are loaded and
failed that assertion.



sql/sql_view.cc:
  Fix bug #11416 Server crash if using a view that uses function convert_tz
mysql-test/r/view.result:
  Test case for bug#11416 Server crash if using a view that uses function convert_tz
mysql-test/t/view.test:
  Test case for bug#11416 Server crash if using a view that uses function convert_tz
2005-09-15 00:08:12 +04:00
unknown
232d1ff438 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 20:57:45 +02:00
unknown
949cc285d0 Merge mysql.com:/home/emurphy/src/work/mysql-5.0-bug-12870
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2005-09-14 14:44:48 -04:00
unknown
bdae7b9b79 BUG#12870 (CREATE PROCEDURE followed by ROLLBACK is not replicated)
Fixed by making CREATE/ALTER/DROP PROCEDURE cause implicit commit.


mysql-test/r/rpl_ddl.result:
  Updated results to include testing of implicit commit for
  create/alter/drop procedure
mysql-test/t/rpl_ddl.test:
  BUG#12870 test implicit commit for create/alter/drop procedure.
sql/sql_parse.cc:
  CREATE/ALTER/DROP PROCEDURE/SPFUNCTION now causes implicit commit.
2005-09-14 14:42:39 -04:00
unknown
7dc083d516 Per LenZ, changed calculated buffer size to constant and removed some unused variables.
sql/ha_federated.cc:
  converted calculated buffer size to static interger.
  removed unused variables.
2005-09-14 11:02:33 -07:00
unknown
97bea9092e Merge mysql.com:/home/alexi/mysql-5.0
into  mysql.com:/home/alexi/dev/mysql-5.0-13000


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
2005-09-14 20:32:59 +04:00
unknown
b214671e09 Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(),
DAYOFWEEK(), and WEEKDAY().


mysql-test/r/func_time.result:
  Fixed new results for testcases containing EXPLAIN EXTENDED SELECT ...
   WEEKDAY ... DAYNAME. The new results are correct and correspond to
   the changes in create_func_weekday() and create_func_dayname().
mysql-test/r/view.result:
  Fixed some testcases results (bugs #12963, #13000).
mysql-test/t/view.test:
  Added testcases for for bugs #12963, #13000.
sql/item_create.cc:
  Fixed bugs #12963, #13000: wrong VIEW creation with DAYNAME(),
   DAYOFWEEK(), and WEEKDAY().
   Modified create_func_dayname(), create_func_dayofweek(), and
   create_func_weekday(). They don´t insert Item_func_to_days
   object now.
sql/item_timefunc.cc:
  Fixed bugs #12963, #13000: wrong VIEW creation with DAYNAME(),
   DAYOFWEEK(), and WEEKDAY().
   Modified Item_func_weekday::val_int(). The argument of weekday should
   not be considered now to be Item_func_to_days object.
sql/item_timefunc.h:
  Fixed bugs #12963, 13000: wrong VIEW creation with DAYNAME(),
   DAYOFWEEK(), and WEEKDAY.
   Modified Item_func_weekday::func_name(). It returns now different
   names depending on the odbc_type attribute value.
2005-09-14 20:25:00 +04:00
unknown
dd8d6395a4 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_show.cc:
  Auto merged
2005-09-14 18:22:43 +02:00
unknown
528c3a71f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 17:27:01 +02:00
unknown
21b8177ebc 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:36:09 +03:00
unknown
ead2b33476 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 16:32:44 +02:00
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