1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Commit Graph

11375 Commits

Author SHA1 Message Date
unknown
33c972e49d A fix and a test case for Bug#13587 "Server crash when SP is created
without database"


mysql-test/r/sp-error.result:
  Test results fixed (a test case for Bug#13587)
mysql-test/t/sp-error.test:
  A test case for Bug#13587 "Server crash when SP is created without 
  database"
sql/sql_parse.cc:
  - move initialization of lex->sphead->m_db before it's used.
  - cleanup; comment why right now can't be cleaned any more
2005-10-19 14:46:32 +04:00
unknown
1e7531ea5c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12915-merge
2005-10-19 12:42:50 +04:00
unknown
a43ec392af mysql.spec.sh:
Enabled yaSSL
mysql-test-run.pl:
  Increased test case timeout from 15 min


mysql-test/mysql-test-run.pl:
  Increased test case timeout from 15 min
support-files/mysql.spec.sh:
  Enabled yaSSL
2005-10-19 02:53:03 +02:00
unknown
b2c9d65b1e Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-10-18 15:01:50 -07:00
unknown
8701728f17 Per a user request there is now support for "CHECK TABLE" where the table is an archive file.
mysql-test/r/archive.result:
  Result file for adding check table support
mysql-test/t/archive.test:
  Simple test for check table. The additional select is added just to make sure the file is not destroyed.
sql/ha_archive.cc:
  Updates for adding CHECK table support. is_crashed() now returns the state of the file.
sql/ha_archive.h:
  Updates for adding CHECK table support
2005-10-18 14:52:38 -07:00
unknown
8698ffc968 BUG#121915: Merge 4.1->5.0
mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/structs.h:
  Auto merged
2005-10-19 01:52:06 +04:00
unknown
9946ce0931 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-19 00:26:18 +03:00
unknown
90d26c972e After review fixes 2005-10-18 23:49:31 +03:00
unknown
0e94cd1461 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-18 21:50:00 +03:00
unknown
89a5b23dc4 check of ACL initialization in is_acl_user() (BUG#13504)
mysql-test/r/skip_grants.result:
  creation view with DEFINER clause if --skip-grant-tables
mysql-test/t/skip_grants.test:
  creation view with DEFINER clause if --skip-grant-tables
sql/sql_acl.cc:
  check of ACL initialization in is_acl_user()
2005-10-18 21:42:26 +03:00
unknown
c3ac502ab1 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 10:49:28 -07:00
unknown
6c8c4fdace Merge mysql.com:/home/jimw/my/mysql-4.1-13334
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
2005-10-18 09:45:12 -07:00
unknown
e4fed8519f Added initial support of stress testing. Now it is possible to start stress test from mysql-test-run script.
For details see README.stress
2005-10-18 19:26:31 +03:00
unknown
019b973212 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-18 18:04:00 +03:00
unknown
c0eae8f0a1 Some fixes to avoid compiler warnings.
mysql-test/my_manage.c:
  Avoid warning: i not used in case of Windows.
mysql-test/mysql_test_run_new.c:
  Removed unused variable.
sql/item_func.cc:
  Removed unused variables.
strings/ctype-simple.c:
  Added cast.
strings/ctype-ucs2.c:
  Added cast.
2005-10-18 18:03:26 +03:00
unknown
14c437a4fc Add file mysql-test/include/common-tests.inc
mysql-test/include/common-tests.inc:
  New BitKeeper file ``mysql-test/include/common-tests.inc''
2005-10-18 15:38:32 +02:00
unknown
7d81acb5e9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2


sql/sql_update.cc:
  Auto merged
2005-10-18 14:08:50 +04:00
unknown
12dd0baa42 Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema
'information_schema' is excluded from list of databases for mysqlcheck command


mysql-test/mysql-test-run.pl:
  dded support for 'mysqlcheck'
mysql-test/mysql-test-run.sh:
  dded support for 'mysqlcheck'
2005-10-18 14:25:03 +05:00
unknown
465f7969fe Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.0
2005-10-18 10:47:01 +02:00
unknown
47b044f411 Fix Item_func_abs::fix_length_and_dec() to set maybe_null properly. (Bug #14009)
mysql-test/r/func_math.result:
  Add new results
mysql-test/t/func_math.test:
  Add new regression test
sql/item_func.cc:
  Set maybe_null in Item_func_abs::fix_length_and_dec().
2005-10-17 17:00:42 -07:00
unknown
0aff963ad7 fix for im_life_cycle test: replace im instance port number with a constant string.
The lack of this --replace resulted in the test failing on all build hosts


mysql-test/r/im_life_cycle.result:
  fix result
mysql-test/t/im_life_cycle.imtest:
  replace instance port number in result, as it could be set differently for different
  test runs.
2005-10-18 00:48:34 +04:00
unknown
3e0d1a4882 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2


sql/sql_class.h:
  Auto merged
2005-10-17 13:35:51 -07:00
unknown
dddc50f255 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-17 19:05:37 +02:00
unknown
ad45b9a1d5 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/bug7049/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
2005-10-17 15:12:38 +02:00
unknown
c8a2ff6f53 Additional fix for BUG#7049, after review.
Make sure "select" aborts when finding a SP condition handler beyond the current scope.


mysql-test/r/sp.result:
  Updated test results after fixing error handling in select.
sql/mysqld.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/protocol.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/sp_rcontext.h:
  Added method for checking if the handler was found in the current context.
sql/sql_error.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.
2005-10-17 15:07:47 +02:00
unknown
40017c6f72 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-17 13:58:46 +02:00
unknown
516699af23 Fix for BUG#4544 "read_only also affects temporary tables":
the READ_ONLY global variable now allows statements which are to update only temporary tables
(note: if a statement, after parse stage, looks like it will update a non-temp table, it will be rejected,
even if at execution it would have turned out that 0 rows would be updated; for example
UPDATE my_non_tem_table SET a=1 WHERE 1 = 0; will be rejected).


sql/sql_parse.cc:
  The READ_ONLY global variable now allows statements which are to update only temporary tables
  (note: if a statement, after parse stage, looks like it will update a non-temp table, it will be rejected,
  even if at execution it would have turned out that 0 rows would be updated; for example
  UPDATE my_non_tem_table SET a=1 WHERE 1 = 0; will be rejected).
mysql-test/r/read_only.result:
  result for new test
mysql-test/t/read_only.test:
  test for READ_ONLY (there was none!) and for the new behaviour of READ_ONLY
2005-10-17 10:52:34 +02:00
unknown
1f6bc6550f Fix for bug #13820 (No warning on log(NEGATIVE))
mysql-test/r/func_math.result:
  result fixed
mysql-test/t/func_math.test:
  test case added
sql/item_func.cc:
  tests for (value<=0.0) added to LOG* functions
2005-10-17 12:32:22 +05:00
unknown
4038188cf2 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-10-16 13:55:39 -07:00
unknown
cced6ea2e2 mysql-test-run.pl:
Added --skip-im option handling
  Don't terminate script if IM fails to create PID file
mtr_cases.pl:
  Added --skip-im option handling
mtr_process.pl:
  Kill left over 'mysqld' processes started by IM


mysql-test/lib/mtr_process.pl:
  Kill left over 'mysqld' processes started by IM
mysql-test/lib/mtr_cases.pl:
  Added --skip-im option handling
mysql-test/mysql-test-run.pl:
  Added --skip-im option handling
  Don't terminate script if IM fails to create PID file
2005-10-16 20:51:19 +02:00
unknown
ccb796a9ce sp-security.result, sp.result, sp-security.test, sp.test:
Test for bug#12812 moved from sp.test to sp-security.test


mysql-test/t/sp.test:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/t/sp-security.test:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp.result:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp-security.result:
  Test for bug#12812 moved from sp.test to sp-security.test
2005-10-16 22:47:19 +04:00
unknown
df46fd01cc Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-10-16 19:37:21 +04:00
unknown
45c062ba7f portability fix: sh does not support "==". This resulted in IM tests failing on range of platforms. 2005-10-16 19:30:10 +04:00
unknown
4c4c0f87ca mysql-test-run.pl:
Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.


mysql-test/mysql-test-run.pl:
  Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.
2005-10-16 17:05:14 +02:00
unknown
3e68a46ab6 thread_registry.h, thread_registry.cc:
Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files


scripts/make_binary_distribution.sh:
  Copy *.imtest files
mysql-test/Makefile.am:
  Preserve executable mode on scripts
server-tools/instance-manager/thread_registry.cc:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
server-tools/instance-manager/thread_registry.h:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
2005-10-16 06:49:19 +02:00
unknown
6a0695fe93 Fixed bug #12762:
allowed set functions aggregated in outer subqueries, allowed nested set functions.


mysql-test/r/func_gconcat.result:
  Changed a query when fixing bug #12762.
mysql-test/r/subselect.result:
  Added test cases for bug #12762.
  Allowed set functions aggregated in outer subqueries. Allowed nested set functions.
mysql-test/t/func_gconcat.test:
  Changed a query when fixing bug #12762.
mysql-test/t/subselect.test:
  Added test cases for bug #12762.
  Allowed set functions aggregated in outer subqueries. Allowed nested set functions.
sql/item.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Added a parameter to Item::split_sum_func2 aliowing to defer splitting for set functions
  aggregated in outer subquries.
  Changed Item_field::fix_fields to calculate attributes used when checking context conditions
  for set functions.
  Allowed alliases for set functions defined in outer subqueries.
sql/item.h:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Added a parameter to Item::split_sum_func2 aliowing to defer splitting for set functions
  aggregated in outer subquries.
sql/item_cmpfunc.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Added a parameter to Item::split_sum_func2 aliowing to defer splitting for set functions
  aggregated in outer subquries.
sql/item_func.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Added a parameter to Item::split_sum_func2 aliowing to defer splitting for set functions
  aggregated in outer subquries.
sql/item_row.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Added a parameter to Item::split_sum_func2 aliowing to defer splitting for set functions
  aggregated in outer subquries.
sql/item_strfunc.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Added a parameter to Item::split_sum_func2 aliowing to defer splitting for set functions
  aggregated in outer subquries.
sql/item_subselect.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced next levels for subqueries and a bitmap of nesting levels showing
  in what subqueries a set function can be aggregated.
sql/item_sum.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Added Item_sum methods to check context conditions imposed on set functions.
sql/item_sum.h:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Added Item_sum methods to check context conditions imposed on set functions.
sql/mysql_priv.h:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced a type of bitmaps to be used for nesting constructs.
sql/sql_base.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced next levels for subqueries and a bitmap of nesting levels showing
  in what subqueries a set function can be aggregated.
sql/sql_class.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced a bitmap of nesting levels showing in what subqueries a set function can be aggregated.
sql/sql_class.h:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced a bitmap of nesting levels showing in what subqueries a set function can be aggregated.
sql/sql_delete.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced a bitmap of nesting levels showing in what subqueries a set function can be aggregated.
sql/sql_lex.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced next levels for subqueries and a bitmap of nesting levels showing
  in what subqueries a set function can be aggregated.
sql/sql_lex.h:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced next levels for subqueries and a bitmap of nesting levels showing
  in what subqueries a set function can be aggregated.
sql/sql_parse.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced next levels for subqueries.
sql/sql_prepare.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced a bitmap of nesting levels showingin what subqueries a set function can be aggregated.
sql/sql_select.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced next levels for subqueries and a bitmap of nesting levels showing
  in what subqueries a set function can be aggregated.
sql/sql_update.cc:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced a bitmap of nesting levels showing in what subqueries a set function can be aggregated.
sql/sql_yacc.yy:
  Fixed bug #12762:
  allowed set functions aggregated in outer subqueries, allowed nested set functions.
  Introduced next levels for subqueries.
2005-10-15 14:32:37 -07:00
unknown
c2b9856333 Additional fix for bug #12267 (Can't use POINT for primary key)
mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  testcase added
sql/sql_table.cc:
  no need to specify keylength for Point type
sql/sql_yacc.yy:
  no need to specify length for Point type
2005-10-15 22:23:13 +05:00
unknown
a1db45674b Fix for bug #13573 (wrong data inserted for too big decimals)
mysql-test/r/type_newdecimal.result:
  result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/item_func.cc:
  conditions fixed
sql/my_decimal.cc:
  overflow handling added
sql/my_decimal.h:
  overflow handling added - so the result of operation gets maximum possible
  decimal value
2005-10-15 21:57:32 +05:00
unknown
56d85e2a03 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12267


sql/sql_table.cc:
  Auto merged
2005-10-15 21:05:29 +05:00
unknown
0f1516b98e Fix for bug #9855 (Inconsistend column type in create select)
mysql-test/r/func_gconcat.result:
  result fixed
mysql-test/r/subselect.result:
  result fixed
mysql-test/r/type_float.result:
  result fixed
mysql-test/t/type_float.test:
  testcase added
sql/item_func.cc:
  Now we set decimals to NOT_FIXED_DEC if the max_length is longer than
  maximum possible double length
2005-10-15 19:47:23 +05:00
unknown
83afcc9c6a Change the "Password" column type for the Perl suite running the tests. bug#14023
mysql-test/lib/init_db.sql:
  Data type of the "Password" column has been changed in "mysql_create_system_tables",
  this must be reflected here (until they are united). bug#14023
2005-10-14 13:35:36 +02:00
unknown
40157b14e0 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0


strings/ctype-latin1.c:
  Auto merged
2005-10-14 14:02:21 +05:00
unknown
05414133af Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
into  mysql.com:/usr/home/bar/mysql-4.1


mysql-test/r/ctype_latin1.result:
  Auto merged
mysql-test/t/ctype_latin1.test:
  Auto merged
2005-10-14 13:57:38 +05:00
unknown
04d52fab7a Merge mysql.com:/usr/home/bar/mysql-5.0.b12547
into  mysql.com:/usr/home/bar/mysql-5.0.char1


strings/ctype-cp932.c:
  Auto merged
2005-10-14 13:37:19 +05:00
unknown
92f80fbb86 ctype_utf8.result:
after merge fix
  ,


mysql-test/r/ctype_utf8.result:
  after merge fix
  ,
2005-10-14 13:24:21 +05:00
unknown
df3e57f51f Merge mysql.com:/usr/home/bar/mysql-4.1.b13751
into  mysql.com:/usr/home/bar/mysql-5.0.char1


mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  after merge fix.
sql/sql_update.cc:
  discarding this change in 5.0.
2005-10-14 12:07:13 +05:00
unknown
9cc7d75ea3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 11:54:10 +05:00
unknown
1e11d278c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 09:09:25 +05:00
unknown
2aa10d2464 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 08:20:02 +05:00
unknown
96e7df0cc3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
2005-10-13 15:41:52 -07:00