Commit graph

21520 commits

Author SHA1 Message Date
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@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
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
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
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
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
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.
c93bb1bfb1 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-02-22 16:36:09 +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
kostja@dipika.(none)
1e6dbd949f Update new tests after merge. 2008-02-22 17:51:57 +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
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
kaa@kaamos.(none)
0a29b8b085 Fix for bug #33049: Assert while running test-as3ap test(mysql-bench
suite)

Under some circumstances a combination of aggregate functions and
GROUP BY in a SELECT query over a VIEW could lead to incorrect
calculation of the result type of the aggregate function. This in
turn could result in incorrect results, or assertion failures on debug
builds.

Fixed by changing the logic in Item_sum_hybrid::fix_fields() so that
the argument's item is dereferenced before calling its type() method.
2008-02-22 11:34:18 +03:00
gluh@mgluh.(none)
6008c9b412 Merge mysql.com:/home/gluh/MySQL/mysql-5.0-opt
into  mysql.com:/home/gluh/MySQL/mysql-5.1-opt
2008-02-22 12:31:12 +04:00
gluh@mysql.com/mgluh.(none)
4f0873c04b Bug#23588 SHOW COLUMNS on a temporary table causes locking issues
skip lock_type update for temporary tables
2008-02-22 12:30:17 +04:00
davi@buzz.(none)
236727788d Post-merge fixes for bug 32890 2008-02-21 23:58:45 -02:00
davi@buzz.(none)
d2bb9dd64f Merge buzz.(none):/home/davi/mysql-5.0-runtime
into  buzz.(none):/home/davi/mysql-5.1-runtime
2008-02-21 23:21:52 -02:00
davi@mysql.com/endora.local
0e91461842 Bug#32890 Crash after repeated create and drop of tables and views
The problem is that CREATE VIEW statements inside prepared statements
weren't being expanded during the prepare phase, which leads to objects
not being allocated in the appropriate memory arenas.

The solution is to perform the validation of CREATE VIEW statements
during the prepare phase of a prepared statement. The validation
during the prepare phase assures that transformations of the parsed
tree will use the permanent arena of the prepared statement.
2008-02-21 14:58:29 -03:00
msvensson@pilot.mysql.com
d80b1ae384 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-21 14:11:01 +01:00
msvensson@pilot.mysql.com
c317562df4 Bug#32025 ndb_waiter does too many roundtrips to ndb_mgmd
- fix test failures that was already there but now are
   more consistent when the 1 second sleep has been removed from
   ndb_waiter
2008-02-21 13:23:58 +01:00
anozdrin/alik@quad.
10dca4fd8d Fix merge (fix result file) 2008-02-21 12:48:55 +03:00
anozdrin/alik@quad.
f039cf7ac7 Merge quad.:/mnt/raid/alik/MySQL/devel/bug-34337/5.0-rt-bug34337
into  quad.:/mnt/raid/alik/MySQL/devel/bug-34337/5.1-rt-bug34337
2008-02-21 12:24:40 +03:00
anozdrin/alik@quad.
f5cb5fdc4f Fix for Bug#34337: Server crash when Altering a view using
a table name.
  
The problem was that fill_defined_view_parts() did not return
an error if a table is going to be altered. That happened if
the table was already in the table cache. In that case,
open_table() returned non-NULL value (valid TABLE-instance from
the cache).
  
The fix is to ensure that an error is thrown even if the table
is in the cache.

(This is a backport of the original patch for 5.1)
2008-02-21 12:17:32 +03:00
mkindahl@dl145h.mysql.com
924ff2621e Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-21 09:04:25 +01:00
mkindahl@dl145h.mysql.com
802158bda5 Fixing result after merge. 2008-02-21 06:29:35 +01:00
davi@buzz.(none)
919ccd9111 Post-merge fixes for bugs 34587 and 32265. 2008-02-20 23:30:29 -02:00
aelkin/andrei@mysql1000.(none)
49915eb88a Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug31316-sss_server_id_clashes
2008-02-20 23:25:01 +02:00
aelkin/andrei@mysql1000.(none)
7e93d94ce5 Bug #31316 Report server id clashes in SHOW SLAVE STATUS
"Server_IO_State" field

Critical error messages from get_master_version_and_clock() were written
only to the slave errorlog while Show slave status did not display any
incident happened.

Although the artifact was reported for a particular --replicate-same-server-id
related issue the fix refines all critical error reporting with 
deploying rli->report().

The test for the bug covers only --replicate-same-server-id error reporting.
2008-02-20 23:18:01 +02:00
davi@endora.local
2aed47c98b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-20 17:30:12 -03:00
davi@endora.local
529ed22389 Merge mysql.com:/Users/davi/mysql/bugs/34587-5.1
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-20 17:29:29 -03:00
davi@mysql.com/endora.local
b9c6b9eced Bug#34587 Creating a view inside a stored procedure leads to a server crash
The problem is that when a stored procedure is being parsed for
the first execution, the body is copied to a temporary buffer
which is disregarded sometime after the statement is parsed.
And during this parsing phase, the rule for CREATE VIEW was
holding a reference to the string being parsed for use during
the execution of the CREATE VIEW statement, leading to invalid
memory access later.

The solution is to allocate and copy the SELECT of a CREATE
VIEW statement using the thread memory root, which is set to
the permanent arena of the stored procedure.
2008-02-20 17:26:50 -03:00