1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Commit Graph

13691 Commits

Author SHA1 Message Date
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
744bb5d7bb Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695
2006-06-12 14:42:07 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
9aa3af6723 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
2006-06-12 14:31:25 -04:00
cmiller@zippy.(none)
c580b72edb Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug16206
2006-06-12 14:05:14 -04:00
gkodinov@mysql.com
df358201e8 Merge mysql.com:/home/kgeorge/mysql/5.0/clean
into  mysql.com:/home/kgeorge/mysql/5.0/B20363
2006-06-12 18:28:04 +03:00
gkodinov@mysql.com
eb693dcc7b Bug #20363: Create view on just created view is now denied
There was a wrong determination of the DB name (witch is 
not always the one in TABLE_LIST because derived tables
may be calculated using temp tables that have their db name
set to "").
The fix determines the database name according to the type 
of table reference, and calls the function check_access() 
with the correct db name so the correct set of grants is found.
2006-06-12 18:15:08 +03:00
rburnett@bk-internal.mysql.com
81c6652224 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-12 16:50:25 +02:00
acurtis@xiphis.org
32fbbbb9b6 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/p2-bug20168.2
2006-06-12 06:53:31 -07:00
mskold@mysql.com
69d52db924 Added order by 2006-06-12 15:36:12 +02:00
mskold@mysql.com
4242beb31d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-12 15:36:10 +02:00
mskold@mysql.com
47bb569979 Added order by 2006-06-12 15:35:47 +02:00
mskold@mysql.com
049c3e3f69 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-4.1
2006-06-12 15:35:46 +02:00
mskold@mysql.com
ae70201afb Added order by 2006-06-12 15:28:36 +02:00
cmiller@zippy.(none)
7b63337d31 Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit
mode

This is a modification of serg's and guilhem's suggestion in the bug report,
in that it also causes the transaction log to be written to disc.
2006-06-12 08:54:45 -04:00
mskold@mysql.com
38a445fee1 sql_delete.cc:
Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
Many files:
  Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
ndb_lock.result, ha_ndbcluster.cc:
  Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
NdbDictionaryImpl.hpp:
  Fix of bad merge
2006-06-12 14:23:21 +02:00
evgen@moonbone.local
147961bc59 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
2006-06-12 15:56:21 +04:00
evgen@moonbone.local
e831704a33 Merge moonbone.local:/work/16716-bug-4.1-mysql
into moonbone.local:/work/16716-bug-4.1-opt-mysql
2006-06-12 15:50:59 +04:00
mskold@mysql.com
be60898441 Merge mysql.com:/home/marty/MySQL/mysql-5.0
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-12 11:34:00 +02:00
mskold@mysql.com
d17c3d3c7c Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans 2006-06-12 10:40:56 +02:00
mskold@mysql.com
b93ba41e68 Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-12 09:42:20 +02:00
mskold@mysql.com
b89f17912c Added lock test on index scan 2006-06-12 09:28:27 +02:00
msvensson@neptunus.(none)
7e9a363136 Fix test that depend on bdb 2006-06-12 09:08:41 +02:00
msvensson@neptunus.(none)
0d7d5b083c Add have_partition to test that needs partition 2006-06-12 09:05:24 +02:00
msvensson@neptunus.(none)
826663ccc5 Skip tests that need debug binaries only if binaries are _not_ debug compiled 2006-06-12 09:00:33 +02:00
tnurnberg@mysql.com
2b613e4ce7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/mysql-5.0-maint-17371
2006-06-12 02:46:26 +02:00
msvensson@neptunus.(none)
f5901f0eca Only process lines that start with -- 2006-06-12 00:05:02 +02:00
msvensson@neptunus.(none)
474389dfc3 Avoid using "-- source " command in plain text 2006-06-12 00:02:50 +02:00
msvensson@neptunus.(none)
f84338557a Fix warnings
Make list of tags/name/values to simplify adding more tags
Check if debug compiled binaries
2006-06-11 23:13:32 +02:00
igor@rurik.mysql.com
bb94b35f2f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-06-11 13:45:18 -07:00
msvensson@neptunus.(none)
86487223cc Print total time spent exectuing test cases 2006-06-11 19:03:33 +02:00
msvensson@neptunus.(none)
582bf12fd4 Add more checks to determine if test can be skipped becuase the feature it uses are not supported.
Check for big-test, ndb-extra, require_manager and binlog format row/stmt
2006-06-11 15:49:34 +02:00
msvensson@neptunus.(none)
a25cc0b933 Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
Leave it to the implementation of 'mtr_kill_process' how long to wait between each attempt to kill/detect if process has been killed.
2006-06-11 11:28:11 +02:00
msvensson@neptunus.(none)
942b98384f Add printout of commment why test was skipped 2006-06-11 10:12:31 +02:00
msvensson@neptunus.(none)
ade1b6ce11 Prepare for selective restart of slaves
Add comment why test is skipped
2006-06-11 10:10:55 +02:00
msvensson@neptunus.(none)
82103ed9b3 Update test results
Fix merge problem
2006-06-11 09:04:23 +02:00
msvensson@neptunus.(none)
c7bedca12f Add comment about when ndbcluster tables are removed from mysqld datadir 2006-06-10 22:10:57 +02:00
msvensson@neptunus.(none)
d13d9dec55 Cacluate nodeid and ndb_fs path when initializing ndbds, to be used when defining log files and when removing the ndb_fs after failed test case 2006-06-10 21:47:25 +02:00
msvensson@neptunus.(none)
da9d2e3270 Use foreach loop to remove fs for ndbd nodes when restoring snapshot 2006-06-10 21:20:14 +02:00
msvensson@neptunus.(none)
0dc04dd7f1 Use function 'stop_all_servers' to stop the running servers before restoring snapshot and resuming tests 2006-06-10 20:59:14 +02:00
msvensson@neptunus.(none)
2c538f6cde Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-06-10 20:33:50 +02:00
msvensson@neptunus.(none)
0e9798d3d2 Update result 2006-06-10 19:35:18 +02:00
msvensson@neptunus.(none)
b24fbccc95 Run check testcase for all masters and slaves 2006-06-10 19:33:37 +02:00
ingo@mysql.com
76f066aa32 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-amerge
2006-06-10 12:24:44 +02:00
ingo@chilla.local
a94ad6a2e3 Merge mysql.com:/home/mydev/mysql-5.1--main
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-10 06:15:26 +02:00
igor@rurik.mysql.com
60620b31fe Post-merge fixes 2006-06-09 19:29:39 -07:00
igor@rurik.mysql.com
940fe6fea6 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-06-09 17:56:08 -07:00
igor@rurik.mysql.com
bcc898f71b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-06-09 15:39:10 -07:00
kent@mysql.com
3744b46a1d Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/data0/mysqldev/my/mysql-4.1
2006-06-09 22:42:34 +02:00
konstantin@mysql.com
5579fc230d Disable im_life_cycle test 2006-06-10 00:35:44 +04:00
kent@mysql.com
a5bc38a0d3 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/mysqldev/my/mysql-5.0
2006-06-09 22:34:21 +02:00
igor@rurik.mysql.com
3d6899948b Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 12:31:15 -07:00