Commit graph

53389 commits

Author SHA1 Message Date
mattiasj@witty.
2e3ed6a216 Post push fix
Fixed a missed case in the patch for Bug#31931.
Also makes Bug#33722 a duplicate of Bug#31931.
Added tests for better coverage.
Replaced some legacy function calls.
2008-02-25 21:18:50 +01:00
kaa@kaamos.(none)
4181d66bdb Post-merge fixes for bug #33834. 2008-02-25 16:03:28 +03:00
davi@mysql.com/endora.local
bccbc79d07 Bug#28386 the general log is incomplete
The problem is that the commands COM_STMT_CLOSE, COM_STMT_RESET,
COM_STMT_SEND_LONG_DATA weren't being logged to the general log.

The solution is to log the general log the aforementioned commands.
2008-02-25 07:48:02 -03:00
kaa@kaamos.(none)
3d7e8ddda4 Merge kaamos.(none):/data/src/opt/bug33834/my50-bug33834
into  kaamos.(none):/data/src/opt/bug33834/my51-bug33834
2008-02-25 13:40:43 +03:00
kaa@kaamos.(none)
5a4e12cb56 Fix for bug #33834: FRAC_SECOND: Applicability not clear in
documentation

While the manual mentions FRAC_SECOND only for the TIMESTAMPADD()
function, it was also possible to use FRAC_SECOND with DATE_ADD(),
DATE_SUB() and +/- INTERVAL.

Fixed the parser to match the manual, i.e. using FRAC_SECOND for 
anything other than TIMESTAMPADD()/TIMESTAMPDIFF() now produces a 
syntax error.

Additionally, the patch allows MICROSECOND to be used in TIMESTAMPADD/
TIMESTAMPDIFF and marks FRAC_SECOND as deprecated.
2008-02-25 13:25:57 +03:00
tnurnberg@mysql.com/white.intern.koehntopp.de
874e919872 Bug#29645: Link failure when using the embedded server
mysql_config --cflags gave a flag that forced the HP/UX
C++ compiler into C-mode; as a result, C++ sources could
not be compiled correctly.

We now filter out the offending flag (like we do for Sun)
so that --cflags will work for both C and C++.
2008-02-25 07:50:55 +01:00
mattiasj@witty.
eaac5d5f3a Pre push fixes
Test file fixes for bugs 20129, 31931 and 34225
2008-02-24 19:13:18 +01:00
mattiasj@witty.
2bf256f8dd Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug20129.2
into  witty.:/Users/mattiasj/clones/topush-51
2008-02-24 17:48:57 +01:00
mattiasj@witty.
d3937fd63c Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug31931.2
into  witty.:/Users/mattiasj/clones/topush-51
2008-02-24 16:46:35 +01:00
tnurnberg@white.intern.koehntopp.de
468c8ebde7 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/misc/mysql/99999/51-99999
2008-02-24 14:23:28 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
79491f93c8 Bug#32757: hang with sql_mode set when setting some global variables
If setting a system-variable provided by a plug-in failed, no OK or
error was sent in some cases, hanging the client. We now send an error
in the case from the ticket (integer-argument out of range in STRICT
mode). We also provide a semi-generic fallback message for possible
future cases like this where an error is signalled, but no message is
sent to the client. The error/warning handling is unified so it's the
same again for variables provided by plugins and those in the server
proper.
2008-02-24 14:12:17 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
60fc91570b Bug#32753: PAD_CHAR_TO_FULL_LENGTH is not documented and interferes with grant tables
SQL-mode PAD_CHAR_TO_FULL_LENGTH affected mysqld's user-table too. If
enabled, user-name and host were space-padded and no longer matched
the login-data of incoming connexions.

Patch disregards pad-flag while loading privileges so ability to log
in does not depend on SQL-mode.
2008-02-24 13:58:07 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
5edab018f9 Merge mysql.com:/home/ram/work/mysql-5.0-engines
into  mysql.com:/home/ram/work/b33304/b33304.5.0
2008-02-24 16:24:53 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
28aaef3ccf Merge mysql.com:/home/ram/work/mysql-5.1-engines
into  mysql.com:/home/ram/work/b33304/b33304.5.1
2008-02-24 16:23:43 +04:00
tnurnberg@white.intern.koehntopp.de
1759c97df2 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/misc/mysql/20752/51-20752
2008-02-24 01:35:50 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
1ed076e41b Bug#20752: BENCHMARK with many iterations returns too quickly
In BENCHMARK(count, expr), count could overflow/wrap-around.
Patch changes to a sufficiently large data-type. Adds a warning
for negative count values.
2008-02-24 01:31:54 +01:00
tsmith@ramayana.hindu.god
45442d08d4 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-22 17:08:01 -07:00
tsmith@ramayana.hindu.god
a5e90661d8 Merge ramayana.hindu.god:/home/tsmith/m/bk/b28460/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-22 17:04:28 -07:00
tsmith@ramayana.hindu.god
56719ad7f4 Bug #34053: normal users can enable innodb_monitor logging
The check_global_access() function was made available to InnoDB, but
was not defined in the embedded server library.  InnoDB, as a plugin,
is not recompiled when the embedded server is built.  This caused a
link failure when compiling applications which use the embedded server.

The fix here is to always define check_global_access() externally; in
the embedded server case, it is defined to just return OK.

Also, don't run the test case for this bug in embedded server.
2008-02-22 16:56:34 -07:00
hhunger@hh-nb.hungers
5d16b95b78 Merge bk-internal:/home/bk/mysql-5.1-build
into  hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
2008-02-22 22:14:34 +01:00
hhunger@hh-nb.hungers
9ef8a8499f Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hungers:/work/merge/mysql-5.1-build
2008-02-22 22:07:05 +01:00
hhunger@hh-nb.hungers
26ede4b6a7 Inserted changes from the review of bug#32664. 2008-02-22 21:28:59 +01:00
hhunger@hh-nb.hungers
0c6e1743f4 Merge hh-nb.hungers:/work/merge/mysql-5.1-build
into  hh-nb.hungers:/work/merge/mysql-5.1-bug32664
2008-02-22 21:24:20 +01:00
andrey@whirlpool.hristov.com
a86ca24594 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  whirlpool.hristov.com:/work/mysql-5.1-runtime
2008-02-22 20:33:07 +01:00
kostja@dipika.(none)
c456569d99 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-22 21:49:44 +03:00
kostja@dipika.(none)
52f5069703 Update new test results after merge (Bug#12713) 2008-02-22 21:49:16 +03:00
kaa@kaamos.(none)
623008272d Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-22 21:44:07 +03:00
kaa@kaamos.(none)
85be88f507 Merge kaamos.(none):/data/src/opt/bug33049/my51-bug33790
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-22 21:25:51 +03:00
kaa@kaamos.(none)
04a27a078f Merge kaamos.(none):/data/src/opt/bug33049/my50-bug33790
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-02-22 21:25:11 +03:00
joerg@trift2.
260081267d mysql-test/mysql-test-run.pl
Disable extra team trees.
    Temporary fix for entry 34761 in the bugs DB.
    (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)
2008-02-22 19:15:31 +01:00
andrey@whirlpool.hristov.com
07d9c4eeb8 Fix for Bug#29605
--local-infile=0 checks can be bypassed by sending a FETCH LOCAL FILE response
  
Add a check for CLIENT_LOCAL_FILES before sending a local file.
Beware, that all binary distributions enable sending of local files and it's up
to the programs which use libmysql to disable it, if they don't use this functionality.
Otherwise they are not safe.
2008-02-22 18:45:45 +01:00
kaa@kaamos.(none)
730bea634f Merge kaamos.(none):/data/src/opt/bug33049/my50-bug33790
into  kaamos.(none):/data/src/opt/bug33049/my51-bug33790
2008-02-22 19:55:23 +03:00
joerg@trift2.
8b58631598 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2008-02-22 17:32:42 +01:00
joerg@trift2.
c93bb1bfb1 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-02-22 16:36:09 +01:00
andrey@whirlpool.hristov.com
04b306dad2 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  whirlpool.hristov.com:/work/mysql-5.1-runtime
2008-02-22 16:20:05 +01:00
andrey@whirlpool.hristov.com
b4fb43d803 Fix for bug#22738 Events: After stop and start disabled events could reside in the queue
Disabled events weren't removed from the memory queue after the scheduler has been
re-enabled. After recalculation of next execution time of an event, it might get disabled.
2008-02-22 16:18:31 +01:00
joerg@trift2.
25ab6afc03 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-02-22 16:14:27 +01:00
svoj@mysql.com/june.mysql.com
fe3b1c8e25 BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if
log-slave-updates and circul repl

Slave SQL thread may execute one extra event when there are events
skipped by slave I/O thread (e.g. originated by the same server).
Whereas it was requested not to do so by the UNTIL condition.

This happens because we compare with the end position of previously
executed event. This is fine when there are no skipped by slave I/O
thread events, as end position of previous event equals to start
position of to be executed event. Otherwise this position equals to
start position of skipped event.

This is fixed by:
- reading the event to be executed before checking if the until condition
  is satisfied.
- comparing the start position of the event to be executed. Since we do
  not have the start position available, we compute it by subtracting
  event length from end position (which is available).
- if there are no events on the event queue at the slave sql starting
  time, that meet until condition, we stop immediately, as in this
  case we do not want to wait for next event.
2008-02-22 19:07:07 +04:00
kostja@dipika.(none)
1e6dbd949f Update new tests after merge. 2008-02-22 17:51:57 +03:00
kostja@dipika.(none)
7511a45dda An unused variable (compile-time warning). 2008-02-22 17:45:09 +03:00
gkodinov/kgeorge@magare.gmz
92b037d31f merged bug 30604 to 5.1-opt 2008-02-22 16:27:02 +02:00
davi@buzz.(none)
dc6c9312a7 Disable concurrent inserts for the kill.test 2008-02-22 12:26:08 -02:00
gkodinov/kgeorge@magare.gmz
350af3a731 Merge magare.gmz:/home/kgeorge/mysql/work/B30604-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B30604-5.1-opt
2008-02-22 15:45:40 +02:00
gkodinov/kgeorge@magare.gmz
0e763988f1 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B30604-5.0-opt
2008-02-22 15:36:27 +02:00
hhunger@hh-nb.hungers
e4c3928f5e Replaced all --sleep by wait_condition (bug#32664). 2008-02-22 13:54:49 +01:00
davi@buzz.(none)
e64c7d4704 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  buzz.(none):/home/davi/mysql-5.1-runtime
2008-02-22 10:36:36 -02:00
davi@buzz.(none)
141e12b155 Fix lock_multi test case failure related to
concurrent inserts.
2008-02-22 10:35:08 -02:00
gluh@mgluh.(none)
8af4b43bd5 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/gluh/MySQL/mysql-5.0-opt
2008-02-22 15:04:24 +04:00
anozdrin/alik@quad.
cbf8420632 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  quad.:/mnt/raid/alik/MySQL/devel/bug-30217/5.1-rt-bug30217
2008-02-22 13:56:44 +03:00
anozdrin/alik@quad.
340906f46d Fix for Bug#30217: Views: changes in metadata behaviour
between 5.0 and 5.1.
  
The problem was that in the patch for Bug#11986 it was decided
to store original query in UTF8 encoding for the INFORMATION_SCHEMA.
This approach however turned out to be quite difficult to implement
properly. The main problem is to preserve the same IS-output after
dump/restore.
  
So, the fix is to rollback to the previous functionality, but also
to fix it to support multi-character-set-queries properly. The idea
is to generate INFORMATION_SCHEMA-query from the item-tree after
parsing view declaration. The IS-query should:
  - be completely in UTF8;
  - not contain character set introducers.
  
For more information, see WL4052.
2008-02-22 13:30:33 +03:00