Commit graph

21285 commits

Author SHA1 Message Date
kent@mysql.com
08cbebc28e Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
2005-03-21 16:40:52 +01:00
kent@mysql.com
7d9d95cee6 init_db.sql:
Added 'proc' and 'procs_priv' tables, updated others
2005-03-21 16:37:19 +01:00
kent@mysql.com
e25cc0f061 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
2005-03-21 16:34:30 +01:00
joerg@mysql.com
d9354fb8a6 Code cleanup: should use 'element_count' here, see include/my_tree.h
(Change done by Ramil and sent via IRC)
2005-03-21 16:31:15 +01:00
kent@mysql.com
c3fa95d467 mtr_report.pl:
Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
2005-03-21 16:01:39 +01:00
dlenev@mysql.com
701a7c4875 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/dlenev/src/mysql-5.0-build
2005-03-21 11:15:37 +03:00
patg@krsna.
0ae33dfd36 Federated Storage Handler - test and result fix. 2005-03-20 23:17:35 -08:00
dlenev@brandersnatch.localdomain
c87912c8da Fix for spurious failures of sp.test on many platforms (aka Bug #9161
"Warnings on 'drop procedure' platform-specific").

In mysqltest we should not issue "SHOW WARNINGS" until we have not 
read results from all statements in multi-statement.

Otherwise such "SHOW WARNINGS" will either cause "Packets out of order"
error and thus will ruin current connection (but we may not notice this as
it happened in sp.test because we ignore errors from such auxilary
SHOW WARNINGS and use auto-reconnecting connections) or will
succeed but consume first packet from next statement in multi-statement
sequence (this happens if "SHOW WARNINGS" is issued when this packet
is already received by client. Packet is thrown away by net_clear()
call which is issued when "SHOW WARNINGS" is sent to server).

In our case sp.test failed because usually we had first situation
but sometimes second situation occured causing warning to pop-up.
2005-03-20 20:29:03 +03:00
joerg@mysql.com
eeb42a8d38 Import Heikki's patch which was applied to the main tree only. 2005-03-20 14:38:51 +01:00
jimw@mysql.com
31ecea8a0f Manually import InnoDB fix into build tree. 2005-03-18 16:18:06 -08:00
jimw@mysql.com
146994ed4c Fix 'kill' test to actually test that the connection has
been killed.
2005-03-18 16:17:10 -08:00
jimw@mysql.com
7de90716b0 Fix Windows compile errors. 2005-03-18 16:15:33 -08:00
jimw@mysql.com
954ef465bc Removed MyISAM RAID from the Linux "Max" RPMs
(patch from lenz, reapplied by jimw)
2005-03-18 16:14:49 -08:00
jimw@mysql.com
ee2b4ec959 Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
2005-03-18 16:12:25 -08:00
kent@mysql.com
348c285d0f mysql-test-run.sh:
Disabled old feature to disable test cases
2005-03-18 16:48:18 +01:00
joerg@mysql.com
cbba326273 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/M50/build-5.0.3
2005-03-18 15:43:11 +01:00
joerg@mysql.com
a485a10d46 Merge 2005-03-18 12:54:24 +01:00
joerg@mysql.com
e0d948922b Move mis-placed assignments to their proper position. 2005-03-18 12:44:40 +01:00
jimw@mysql.com
7214c51e72 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-03-17 17:24:47 -08:00
jimw@mysql.com
dcd336d79d Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254) 2005-03-17 17:22:40 -08:00
lenz@mysql.com
ac5cdb6125 - fixed two merge errors 2005-03-18 00:30:20 +01:00
mysqldev@mysql.com
c59e0fc78b Merge 2005-03-17 22:17:37 +01:00
mysqldev@mysql.com
7d5c7f5ec6 sp.test, sp.result:
transactional test removed
sp_trans.test, sp_trans.result:
  new file
2005-03-17 22:15:23 +01:00
jimw@mysql.com
fec41395fb Merge mysql.com:/home/jimw/my/mysql-5.0-8047
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-03-17 12:29:30 -08:00
jimw@mysql.com
0fc802a316 Merge mysql.com:/home/jimw/my/mysql-5.0-8679
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-03-17 11:14:35 -08:00
jimw@mysql.com
22e5d9cc0a Fix HP/UX debug compile error. (Bug #8679) 2005-03-17 10:27:23 -08:00
jimw@mysql.com
d5b7909448 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-03-17 10:00:45 -08:00
lenz@mysql.com
4ca5b3c73b - Added a missing pair of parenthesis. (already commited by Jani, ChangeSet@1.1819) 2005-03-17 18:49:48 +01:00
jimw@mysql.com
3828b47807 Merge mysql.com:/home/jimw/my/mysql-5.0-8866
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-03-17 08:26:12 -08:00
joerg@mysql.com
3ea0d8806d Manual merge. 2005-03-17 16:44:25 +01:00
gluh@gluh.mysql.r18.ru
edb4dd5366 after merge fix 2005-03-17 18:44:24 +03:00
gluh@gluh.mysql.r18.ru
b435d6e862 Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03:00
gluh@gluh.mysql.r18.ru
08b2c7ecca Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-17 13:25:19 +03:00
gluh@gluh.mysql.r18.ru
84cb408445 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-17 11:02:11 +03:00
serg@serg.mylan
41997cf263 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-17 08:46:48 +01:00
ramil@mysql.com
261105a007 Merge 2005-03-17 10:59:25 +04:00
ramil@mysql.com
a773916238 A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop). 2005-03-17 10:24:50 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fbb61754b Fixed two bugs in MySQL ACL.
First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.

Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)

Fixed tests grant.pl and grant2, which were wrong.
2005-03-17 08:16:56 +02:00
igor@rurik.mysql.com
3103b4cae5 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-03-16 17:50:03 -08:00
jimw@mysql.com
1055e52575 Fix failure in 'kill' test due to change of default
reconnect setting in mysql client library. (Bug #8866)
2005-03-16 17:13:45 -08:00
jimw@mysql.com
5ff77dfb54 Fix 64-bit issue with mysql_client_test. (Bug #8047) 2005-03-16 16:29:43 -08:00
igor@rurik.mysql.com
45ba13889d olap.result, olap.test:
Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
2005-03-16 15:55:04 -08:00
monty@mysql.com
ddec400e18 Merge with global tree 2005-03-17 01:27:04 +02:00
monty@mysql.com
aa6ab3b49c Move handler dependent tests to the specific handler (myisam, bdb, innodb)
Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP
2005-03-17 01:22:12 +02:00
lars@mysql.com
155f8ff82d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1 2005-03-16 23:44:47 +01:00
monty@mysql.com
f42941073d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-16 22:59:06 +02:00
lars@mysql.com
fc6eda1336 Fixes after Sinisa and Serg comments after push of patch for BUG#9123.
BUG#9123 is solved earlier than this patch though.
2005-03-16 21:56:56 +01:00
patg@krsna.
2f47e3e132 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 12:56:40 -08:00
dlenev@brandersnatch.localdomain
d8d507926d Fixed binlog.test failure which occured after patch implementing
WL#874 "Extended LOAD DATA" was pushed.
2005-03-16 23:12:27 +03:00
patg@krsna.
dcf73493df Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 12:05:58 -08:00