Commit graph

53052 commits

Author SHA1 Message Date
anozdrin/alik@quad.
bdc83bf2cb Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-02-26 19:34:02 +03:00
davi@endora.local
aeebdfcfaa Merge mysql.com:/Users/davi/mysql/bugs/34424-5.1
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-26 12:12:57 -03:00
kostja@dipika.(none)
d54c6a7e23 Fix the remaining memory leaks (mysql_client_test). 2008-02-26 18:07:11 +03:00
davi@mysql.com/endora.local
cdd5eae9b6 Bug#34424 query_cache_debug.test leads to valgrind warnings
Bug#34678 @@debug variable's incremental mode

The problem is that the per-thread debugging settings stack wasn't
being deallocated before the thread termination, leaking the stack
memory. The chosen solution is to push a new state if the current
is set to the initial settings and pop it (free) once the thread
finishes.
2008-02-26 12:03:59 -03:00
kostja@dipika.(none)
4e116fe70b Valgrind errors in mysql_client_test. 2008-02-26 17:25:21 +03:00
kostja@dipika.(none)
79d4ed082b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-26 16:22:42 +03:00
kostja@dipika.(none)
1719d9a2cd We never check the return value of mysql_frm_type for an error. Do
not try to push an error into the error stack as it will be ignored anyway.
2008-02-26 16:19:23 +03:00
davi@endora.local
fd3bcbea80 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-26 10:12:26 -03:00
kostja@dipika.(none)
34f9ead01a Merge dipika.(none):/opt/local/work/mysql-5.0-runtime
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-26 15:32:32 +03:00
kostja@dipika.(none)
74addb78e4 Fix memory leaks (valgrind) 2008-02-26 15:27:46 +03:00
kostja@dipika.(none)
461de0f35c Use an API instead of looking into stmt internals to fetch fields
(Test for Bug#32265)
2008-02-26 13:55:46 +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
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
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
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
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
davi@buzz.(none)
dc6c9312a7 Disable concurrent inserts for the kill.test 2008-02-22 12:26:08 -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
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
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
iggy@alf.(none)
a54f3995ec Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  alf.(none):/src/mysql-5.1-build_31929
2008-02-21 19:53:37 -05:00
davi@buzz.(none)
28cfe06a1e Post-merge fix to silence compiler warning. 2008-02-21 19:28:25 -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
6391d837a2 Merge bk-internal:/home/bk/mysql-5.0-build
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-02-21 13:59:45 +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.
5f5773bfc8 Fix for Bug#33065: Mysql not writing general query logs after
sending SIGHUP.

There were two problems:
  - after some recent fix, the server started to crash after
    receiving SIGHUP. That happened because LEX of new THD-object
    was not properly initialized.
  - user-specified log options were ignored when logs were reopened.

The fix is to 1) initialize LEX and 2) take user-specified options
into account.

There is no test case in this CS, because our test suite does not
support sending SIGHUP to the server.
2008-02-21 14:49:27 +03: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
davi@buzz.(none)
919ccd9111 Post-merge fixes for bugs 34587 and 32265. 2008-02-20 23:30:29 -02:00