Commit graph

37406 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
b60be73461 ndb - bug#21800
read TransactionDeadlockTimeout (for scans) to cater for insane settings
2006-08-24 07:14:46 +02:00
evgen@sunlight.local
1e9b5cead2 view.result, view.test:
Corrected test case for the bug#21261
sql_parse.cc:
  Corrected fix for bug#21261
2006-08-24 03:05:13 +04:00
brian@zim.(none)
d41188130a This is a cleanup of warnings that windows is complaining about. 2006-08-23 15:12:42 -07:00
brian@zim.(none)
212ab97668 This patch removes need for a innodb to have its own configure. 2006-08-23 13:59:16 -07:00
anozdrin/alik@alik.
9af756efd3 Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause
User name (host name) has limit on length. The server code relies on these
limits when storing the names. The problem was that sometimes these limits
were not checked properly, so that could lead to buffer overflow.

The fix is to check length of user/host name in parser and if string is too
long, throw an error.
2006-08-23 21:31:00 +04:00
timour/timka@lamia.home
70f76e457f Merge lamia.home:/home/timka/mysql/src/4.1-bug-21456
into  lamia.home:/home/timka/mysql/src/5.0-bug-21456
2006-08-23 18:22:53 +03:00
andrey@example.com
f41f9bf0d9 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  example.com:/work/mysql-5.1-runtime
2006-08-23 15:51:37 +02:00
andrey@example.com
9c8c1817ce Fix for bug #20665 All commands supported in Stored Procedures
should work in Prepared Statements. Post-review changeset.

Problem: There are some commands which are avaiable to be executed in SP
         but cannot be prepared. This patch fixes this and makes it possible
         prepare these statements.

Changes: The commands later are made available in PS. RESET has been forbidden
         in SF/Trigger.

Solution: All current server commands where checked and those missing (see later)
          we added. Tests for all of the commands with repeated executions were
          added - testing with SP, SF and PS.

SHOW BINLOG EVENTS
SHOW (MASTER | SLAVE) STATUS
SHOW (MASTER | BINARY) LOGS
SHOW (PROCEDURE | FUNCTION) CODE (parsable only in debug builds)
SHOW CREATE (PROCEDURE | FUNCTION | EVENT | TABLE | VIEW)
SHOW (AUTHORS | CONTRIBUTORS | WARNINGS | ERRORS)
CHANGE MASTER
RESET (MASTER | SLAVE | QUERY CACHE)
SLAVE (START | STOP)
CHECKSUM (TABLE | TABLES)
INSTALL PLUGIN
UNINSTALL PLUGIN
CACHE INDEX
LOAD INDEX INTO CACHE
GRANT
REVOKE
KILL
(CREATE | RENAME | DROP) DATABASE
(CREATE | RENAME | DROP) USER
FLUSH (TABLE | TABLES | TABLES WITH READ LOCK | HOSTS | PRIVILEGES |
       LOGS | STATUS | MASTER | SLAVE | DES_KEY_FILE | USER_RESOURCES)
2006-08-23 15:50:06 +02:00
timour/timka@lamia.home
de723f2998 Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by
GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
optimization because ORDER BY may be removed when GROUP BY/DISTINCT
sorts as a side effect, e.g. in 
  SELECT DISTINCT <non-key-col>,<pk> FROM t1
  ORDER BY <non-key-col> DISTINCT
must be removed before ORDER BY as if done the other way around
it will remove both.
2006-08-23 16:46:57 +03:00
petr/cps@owlet.local
5fae48d9e4 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-08-23 17:15:24 +04:00
petr/cps@owlet.local
2763504be4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-08-23 16:48:39 +04:00
gluh@mysql.com/gluh.(none)
0ba4ff24ef Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions
setup 'share' struct for all partiton file elements. It's neccessary because we use
m_file[0]->update_create_info(create_info) during ha_partition::update_create_info
and 'share' for m_file[0] should be valid
2006-08-23 16:58:36 +05:00
jonas@perch.ndb.mysql.com
e5e5d0273b Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-23 12:40:58 +02:00
jonas@perch.ndb.mysql.com
51fc14dd12 ndb - sr -
Fix so that expand_check2 is only run per fragment,
  as restore now works 1 fragment at a time (again)
2006-08-23 11:22:48 +02:00
jonas@perch.ndb.mysql.com
b1d5f861dd Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-23 11:02:27 +02:00
jonas@perch.ndb.mysql.com
4cab70171e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-08-23 11:00:29 +02:00
malff/marcsql@weblab.(none)
28ac53688f Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
Implemented code review comments
Test cleanup
2006-08-22 18:58:14 -07:00
brian@zim.(none)
b518763728 This changest:
Plugins now when compiled or not compiled work correctly with status variables. 
Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster)
A few Makefile cleanups.
2006-08-22 16:24:12 -07:00
evgen@moonbone.local
39d0ef17c7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/work/21475-fix-5.0-opt-mysql
2006-08-23 01:04:00 +04:00
evgen@moonbone.local
44cad14bf4 item_cmpfunc.cc, item.cc:
Additional fix for bug #21475
item_func.h, item_func.cc:
  Additional fix for bug#16861
2006-08-23 01:03:28 +04:00
mikael/pappa@dator5.(none)
eaf68858ce BUG#21658: Crash when creating table with item in prepared statement that allocates memory in fix_fields
We need to use an arena to indicate we are preparing a statement when loading partition function and
parsing it as part of an open table.
2006-08-22 16:52:25 -04:00
jonas@perch.ndb.mysql.com
a0bba5faef correct merge 2006-08-22 22:52:03 +02:00
jonas@perch.ndb.mysql.com
0edae8e98f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-22 20:59:20 +02:00
jonas@perch.ndb.mysql.com
93a83f3884 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-08-22 20:55:28 +02:00
malff/marcsql@weblab.(none)
154bb53b1f Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-8153
2006-08-22 09:06:00 -07:00
tnurnberg@salvation.intern.azundris.com
f07937730a Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
2006-08-22 17:27:36 +02:00
tnurnberg@salvation.intern.azundris.com
a74c4c0d4d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
2006-08-22 17:22:46 +02:00
cmiller@zippy.cornsilk.net
34fd70452c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-22 10:32:07 -04:00
igor@rurik.mysql.com
be9ba6cfd3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-08-22 07:09:11 -07:00
evgen@sunlight.local
f0edc9084d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  sunlight.local:/local_work/16861-bug-5.0-mysql
2006-08-22 17:39:18 +04:00
evgen@sunlight.local
f17a536e09 Fixed bug#16861: User defined variable can have a wrong value if a tmp table was
used.

Sorting by RAND() uses a temporary table in order to get a correct results.
User defined variable was set during filling the temporary table and later
on it is substituted for its value from the temporary table. Due to this
it contains the last value stored in the temporary table.

Now if the result_field is set for the Item_func_set_user_var object it 
updates variable from the result_field value when being sent to a client.

The Item_func_set_user_var::check() now accepts a use_result_field
parameter. Depending on its value the result_field or the args[0] is used
to get current value.
2006-08-22 17:37:41 +04:00
evgen@moonbone.local
60088d8090 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/work/21475-bug-5.0-opt-mysql
2006-08-22 17:18:00 +04:00
pekka@orca.ndb.mysql.com
4828d63cda Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017
2006-08-22 15:00:42 +02:00
pekka@orca.ndb.mysql.com
a5b835abbd Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug21017
2006-08-22 14:58:38 +02:00
pekka@orca.ndb.mysql.com
a75c30c713 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-08-22 14:39:58 +02:00
tnurnberg@salvation.intern.azundris.com
10c351b124 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
2006-08-22 14:31:57 +02:00
tnurnberg@salvation.intern.azundris.com
002adef0e1 Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
when X.509 subject was required for a connect, we tested whether it was the right
one, but did not refuse the connexion if not. fixed.

(corrected CS now --replace_results socket-path)
2006-08-22 14:29:48 +02:00
pekka@orca.ndb.mysql.com
9dc6087d4d ndb - post-merge fix 5.0 to 5.0-ndb: number of frags if --without-big-tables 2006-08-22 14:26:56 +02:00
pekka@orca.ndb.mysql.com
26e5b93203 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-08-22 14:19:10 +02:00
msvensson@neptunus.(none)
b2a95f0dac Update result file for "grant" to 5.1 version 2006-08-22 14:16:39 +02:00
tnurnberg@salvation.intern.azundris.com
0ead4ec836 Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-4.1-maint-20987
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
2006-08-22 14:03:52 +02:00
igor@rurik.mysql.com
c397d40a36 Fixed bug 16201: a memory corruption causing crashes due to a too small
buffer for a MY_BITMAP temporary buffer allocated on stack in the
function get_best_covering_ror_intersect().
Now the buffer of a proper size is allocated by a request from this
function in mem_root.

We succeeded to demonstrate the bug only on Windows with a very large
database. That's why no test case is provided for in the patch.
2006-08-22 04:14:39 -07:00
sergefp@mysql.com
f57738751d Fix compile errors in VC++ 7.0: fix typo made in previous cset 2006-08-22 15:03:13 +04:00
jonas@perch.ndb.mysql.com
5067c4214b Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-22 12:42:56 +02:00
jonas@perch.ndb.mysql.com
770c2edcdd ndb - reenable "random" failing test 2006-08-22 12:41:24 +02:00
jonas@perch.ndb.mysql.com
2ae18a6be4 ndb -
add another possible ok error in testcase
2006-08-22 11:55:25 +02:00
pekka@orca.ndb.mysql.com
f301613fcb Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
2006-08-22 11:11:20 +02:00
mats@romeo.(none)
dbc98766b0 WL#3259 (RBR with more columns on slave than on master):
Post-merge fixes.
2006-08-22 10:36:11 +02:00
pekka@orca.ndb.mysql.com
b97a4b7f44 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-08-22 10:24:58 +02:00
kroki/tomash@moonlight.intranet
9c1b3f5797 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21051-2
2006-08-22 12:21:37 +04:00