1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-02 14:22:51 +03:00
Commit Graph

9817 Commits

Author SHA1 Message Date
26acf8d722 Merge msvensson@devsrv-b:/space/magnus/bug17261/my50-bug17261
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835


sql/share/errmsg.txt:
  Auto merged
sql/udf_example.cc:
  Auto merged
2006-03-10 10:42:42 +01:00
e52ff5557c Bug#17261 Passing a variable from a stored procedure to UDF crashes mysqld
- Update of test toolsand Makefiles to make it possible to test always test udf's as part 
of the mysql test suite


mysql-test/mysql-test-run.pl:
  Add the path where mysqld will udf_example.so used by the udf test
mysql-test/r/udf.result:
  Update test results
mysql-test/t/udf.test:
  Update tests
  The "--error 0" directives should actually be changed to the correct error number returned but that error  number is lost. W e do however get the right error message and that is checked in 
  the .result file.
sql/Makefile.am:
  Build shared library udf_example.so
sql/share/errmsg.txt:
  Update the max length of %s string from 64 to 128
sql/sql_udf.cc:
  Add DBUG_PRINT just before dl_open
sql/udf_example.cc:
  Use isalpha instade of my_isalpha
2006-03-10 10:41:04 +01:00
d1f1c383c6 Merge msvensson@devsrv-b:/space/magnus/bug17261/my50-bug17261
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835


sql/udf_example.cc:
  Auto merged
2006-03-10 10:16:50 +01:00
30611a3570 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-09 21:09:37 +01:00
2fbd17779f mysqltest.test:
Fix typos.


mysql-test/t/mysqltest.test:
  Fix typos.
2006-03-09 13:17:19 -06:00
7ecc18e1dc Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-09 15:49:32 +01:00
f88b3a100b Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-09 13:13:04 +01:00
51166f875f Merge neptunus.(none):/home/msvensson/mysql/bug10656/my50-bug10656
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
2006-03-09 13:11:40 +01:00
032108c607 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-09 12:39:48 +01:00
2acff5c36d Bug#10656 Stored Procedure - Create index and Truncate table command error
-Add test case
Move testcase that needs innodb from sp.test => sp_trans.test 


mysql-test/r/sp.result:
  Move test cases tyhat requires innodb to sp_trans.test
mysql-test/r/sp_trans.result:
  Move test cases tyhat requires innodb to sp_trans.test
  Add test case for bug#10656
mysql-test/t/sp.test:
  Move test cases tyhat requires innodb to sp_trans.test
mysql-test/t/sp_trans.test:
  Add test case for bug#10656
  Move test cases that require innodb to sp_trans.test
2006-03-09 12:08:23 +01:00
5e54b63fa3 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/17726-bug-5.0-mysql


sql/item_cmpfunc.cc:
  Auto merged
2006-03-09 14:07:34 +03:00
6c81f34369 Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-09 10:38:41 +04:00
0e6c94e1ea Merge
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
2006-03-09 00:40:52 +01:00
a3208c0f1f mysql-test-run.pl, mtr_cases.pl
- Back porting of some changes in later releases
  - Corrected valgrind support
  - Removed work around for TZ needed in VisualStudio 6
  - Don't restart master to add special settings from "<testcase>-master.opt",
    if same settngs as running master, feature request in bug#12433
  - With --reorder, keep tests with same *-master.opt content together,
    to save even more master restarts


mysql-test/lib/mtr_misc.pl:
  Added functions to compare lists of options
mysql-test/lib/mtr_cases.pl:
  Removed special code for Windows as in VC6 we unset
  TZ to avoid library bug
mysql-test/mysql-test-run.pl:
  Handle pseudo option --timezone=<spec> that sets TZ
2006-03-08 19:15:56 +01:00
bfa21dd152 Merge bk-internal:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysqltestrun_ndbclusterstart/my50-mysqltestrun_ndbclusterstart
2006-03-08 17:00:56 +01:00
acb53e4ec4 BUG#17574 Detect cluster start failure and "fail" ndb_* tests
- Fix problems that occur when ndbcluster is not supported


mysql-test/lib/mtr_cases.pl:
  Marked test to be skipped if it is a ndb test but ndb is not supported
mysql-test/mysql-test-run.pl:
  Check "opt_with_ndbcluster" before deciding to stop masters and when dciding if cluster needs to be started.
2006-03-08 16:57:42 +01:00
9c6abf3f5c Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
2006-03-08 15:35:30 +01:00
c80332c7b9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
2006-03-08 13:31:05 +01:00
3c83b827be Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137
2006-03-08 11:20:12 +01:00
9a293f36e4 After merge
mysql-test/t/rpl_trunc_temp.test:
  Remove final "connection master" it's already disconnected
2006-03-08 10:40:29 +01:00
c5fcf0fdc9 Merge neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137


sql/sql_delete.cc:
  Auto merged
2006-03-08 10:17:12 +01:00
f491db2119 Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave
- Decrease "slave_open_temp_tables" during reopen of truncated table.
 - Add test "rpl_trunc_temp" 


sql/sql_delete.cc:
  Decrease "slave_open_temp_tables" after temporary table has been closed, it will be
  increased again when the temp table is reopened after it's been truncated.
mysql-test/r/rpl_trunc_temp.result:
  New BitKeeper file ``mysql-test/r/rpl_trunc_temp.result''
mysql-test/t/rpl_trunc_temp.test:
  New BitKeeper file ``mysql-test/t/rpl_trunc_temp.test''
2006-03-08 10:15:48 +01:00
9414d3a3e7 Merge bk-internal:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
2006-03-08 07:47:26 +01:00
cf11f78a66 mysql-test-run.pl:
Allow space in base directory path, bug#15736


mysql-test/mysql-test-run.pl:
  Allow space in base directory path, bug#15736
2006-03-08 03:51:59 +01:00
a8331c7326 After-merge fix: fix the test case for BUG#16266 to query
only its own tables to prevent getting tables from others.


mysql-test/r/rpl_trigger.result:
  Update the result file.
mysql-test/t/rpl_trigger.test:
  Fix the test to query only its own tables to prevent getting tables
  from other tests.
2006-03-08 00:13:27 +03:00
9a879f89b4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574


mysql-test/mysql-test-run.pl:
  Auto merged
2006-03-07 20:41:04 +01:00
329264140a Bug#17574 Detect cluster start failure and "fail" ndb_* tests
mysql-test/lib/mtr_cases.pl:
  Always set "ndb_test" if tets name contains ndb. 
  Set to skipped if "--skip-ndbcluster"
mysql-test/lib/mtr_report.pl:
  Print special error message for ndb_test that are failed due to failure to start or install ndbcluster
mysql-test/mysql-test-run.pl:
  Remove mtr_error call from ndbcluster_install, instead check after ndbcluster_install if test run should continue or if it should be aborted
  Faile ndb test and print special error message if it's a ndb test and flag_ndb_status_ok is not ok
2006-03-07 19:44:58 +01:00
99515a3ac8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt


mysql-test/r/sp.result:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/skip_grants.result:
  Merge 5.0 and 5.0-runtime.
mysql-test/t/skip_grants.test:
  Merge 5.0 and 5.0-runtime.
2006-03-07 14:28:09 +03:00
60ee2bbecb Improve error message for faulty usage of "inc" and "dec"
client/mysqltest.c:
  Improve error messages for "inc" and "dec"
mysql-test/r/mysqltest.result:
  Update test result
2006-03-07 07:50:04 +01:00
e08efc1528 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-07 07:42:51 +01:00
b267660646 after merge
mysql-test/mysql-test-run.sh:
  tests depend on umask
2006-03-06 23:43:47 +01:00
e33e0bfc93 Revert
mysql-test/lib/mtr_misc.pl:
  Revert change to outpout exe path and name in win format
2006-03-06 22:14:06 +01:00
4a311f0a50 Win fixes
- Use tmp sh file both in system and popen 


client/mysqltest.c:
  Introduce common functions to handle unix emulation on windows using a temporary sh file.
  Use it both in my_popen and my_system.
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Fix "windows paths" in three places that doesn't automatically get fixed
  Uset the output file mysqltest.sql instead of con.sql as con is not an allowed filename on Windows
  Use system for util functions
2006-03-06 22:05:39 +01:00
57839602ac Use grep instead of egrep
Use system inestad of exec


mysql-test/t/trigger-grant.test:
  Use "system" instead of exec for system admin tasks
  No need to use "egrep", changing to "grep"
2006-03-06 21:45:13 +01:00
cf4c785c62 merged
mysql-test/t/kill.test:
  Auto merged
2006-03-06 20:53:14 +01:00
19a1f488a8 merged 2006-03-06 18:34:38 +01:00
a127344a6c kill (subquery) - three years old bugfix that never worked 2006-03-06 18:26:39 +01:00
703aeac212 Merge mysql.com:/home/hf/work/mysql-5.0.15745
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-06 19:57:20 +04:00
a581ed72db Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 14:01:15 +01:00
d82eebcb75 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 13:45:53 +01:00
13407f2eca Merge mysql.com:/usr/home/bar/mysql-4.1.b15949
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged
2006-03-06 16:20:15 +04:00
89378fe8f6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:58:16 +04:00
9251e7f710 Merge bk-internal:/home/bk/mysql-5.0
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:28:30 +01:00
5b8d8c919e Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:15:23 +04:00
76e5c1b4b6 post-merge fix 2006-03-06 15:14:15 +04:00
84168ebac2 Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:04:54 +01:00
9281bdd47c Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  SCCS merged
2006-03-06 12:00:51 +01:00
d86a66d483 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b15949
2006-03-06 14:50:34 +04:00
7d24c7d445 4.1 -> 5.0 merge
mysql-test/t/grant.test:
  Auto merged
mysql-test/r/grant.result:
  manual merge
sql/sql_acl.cc:
  manual merge
2006-03-06 14:38:31 +04:00
3ecf9f040a Fix for bug#14385 GRANT and mapping to correct user account problems
Check if the host of table hash record exactly matches host from GRANT command


mysql-test/r/grant.result:
  Fix for bug#14385 GRANT and mapping to correct user account problems
    test case
mysql-test/t/grant.test:
  Fix for bug#14385 GRANT and mapping to correct user account problems
    test case
2006-03-06 14:03:40 +04:00