Commit graph

39112 commits

Author SHA1 Message Date
mkindahl@dl145h.mysql.com
3f85bbe53d Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2008-02-27 10:57:48 +01:00
holyfoot/hf@hfmain.(none)
bf848358e5 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/25097/my50-25097
2008-02-27 13:43:41 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
140ca59538 Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
There was no way to return an error from the client library
if no MYSQL connections was established.
So here i added variables to store that king of errors and
made functions like mysql_error(NULL) to return these.
2008-02-27 12:42:43 +04:00
kent@mysql.com/kent-amd64.(none)
ac15eee942 Makefile.am, Info.plist.sh:
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
  Removed unneded semicolon
2008-02-26 18:36:06 +01:00
kent@kent-amd64.(none)
3426a62a9f Merge mysql.com:/home/kent/bk/build/mysql-4.1-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build
2008-02-26 18:21:45 +01:00
kent@mysql.com/kent-amd64.(none)
ff25b92543 configure.in:
Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ
SocketServer.cpp:
  Corrected typo in debug error message
2008-02-26 18:18:03 +01:00
anozdrin/alik@quad.
c61667bca8 Merge quad.:/mnt/raid/alik/MySQL/devel/5.0
into  quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
2008-02-26 19:23:37 +03:00
kaa@kaamos.(none)
e3de6b7d38 Merge kaamos.(none):/data/src/opt/bug33834/my50-bug33834
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-02-26 16:10:31 +03:00
kostja@dipika.(none)
74addb78e4 Fix memory leaks (valgrind) 2008-02-26 15:27:46 +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
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
kent@kent-amd64.(none)
7f2e076251 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build
2008-02-23 14:45:38 +01: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
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.
c93bb1bfb1 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-02-22 16:36:09 +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
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
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
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@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)
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
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.
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
acurtis/antony@ltamd64.xiphis.org
9ed3da2c12 Merge xiphis.org:/anubis/antony/work/mysql-5.0-engines
into  xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.0
2008-02-20 22:42:24 -08:00
vvaintroub@wva.
89aebb65fc Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  wva.:C:/bk/bug31745_2/mysql-5.0-build
2008-02-21 02:22:02 +01:00
davi@mysql.com/endora.local
4b821c0cbd Post-merge fix to silence a compilation warning introduced
by patch for bug 32265 .
2008-02-20 22:11:06 -03:00
davi@mysql.com/endora.local
0473205592 Bug#32265 Server returns different metadata if prepared statement is used
Executing a prepared statement associated with a materialized
cursor yields to the client a metadata packet with wrong table
and database names. The problem was occurring because the server
was sending the the name of the temporary table used by the cursor
instead of the table name of the original table. The same problem
occurs when selecting from views, in which case the table name was
being sent and not the name of the view.
  
The solution is to fill the list item from the temporary table but
preserving the table and database names of the original fields. This
is achieved by tweaking the Select_materialize to accept a pointer to
the Materialized_cursor class which contains the item list to be filled.
2008-02-20 16:45:24 -03:00
mkindahl@dl145h.mysql.com
06375e2130 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2008-02-20 19:25:18 +01:00
evgen@moonbone.local
682f0e0d15 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/work/33266-bug-5.0-opt-mysql
2008-02-20 18:01:53 +03:00
evgen@moonbone.local
56d955a5a0 Bug#33266: Incorrect test case for the bug#31048 failing on some platforms.
The test case for the bug#31048 checks that there is no crash on stack
overrun. But due to different stack sizes on different platforms it failed
on some of them.

The new test case check that a query with at least 4 level subquery nesting
works without the stack overrun nesting and other levels of nesting doesn't
cause a crash.
2008-02-20 17:41:39 +03:00
bar@bar.myoffice.izhnet.ru
d5011e8561 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b32510
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b32510v2
2008-02-20 14:38:52 +04:00
gkodinov/kgeorge@magare.gmz
5b508f2d16 Bug #30604: different flagging of time_zone_used in normal
and ps-protocol
Finding a routine should be a transparent operation as 
far as the binary log is concerned.
But it was influencing the binary log because of the TIMESTAMP
column in the proc table.

Fixed by preserving and restoring the time_zone usage flag when
searching for a stored routine in the proc table.
2008-02-19 17:27:18 +02:00
svoj@mysql.com/june.mysql.com
921e1cc4bb BUG#34289 - Incorrect NAME_CONST substitution in stored procedures
breaks replication

NAME_CONST() didn't replicate constant character set and collation
correctly.

With this fix NAME_CONST() inherits collation from the value argument.
2008-02-19 18:16:17 +04:00
vvaintroub@wva.
f5932c0d95 Bug#31745 - crash handler does not work on Windows
- Replace per-thread signal()'s with  SetUnhandledExceptionFilter(). 
  The only remaining signal() is for SIGABRT (default abort()
  handler in VS2005 is broken, i.e removes user exception filter)
- remove MessageBox()'es  from error handling code
- Windows port for print_stacktrace() and write_core() 
- Cleanup, removed some unused functions
2008-02-19 12:37:39 +01:00
tsmith@ramayana.hindu.god
71faa39360 Merge ramayana.hindu.god:/home/tsmith/m/bk/50-b28555
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-18 12:04:54 -07:00
tsmith@ramayana.hindu.god
958f615f36 Merge ramayana.hindu.god:/home/tsmith/m/bk/b21158/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-18 12:04:22 -07:00
tsmith@ramayana.hindu.god
69dcac5a7e Bug #28555 Upgrading MySQL Fails to shut down old server and kills socket file
Check for an existing MySQL server package from a different vendor or
major MySQL version.  In such a case, refuse to install the server and
recommend how to safely remove the old packages before installing the
new ones.
2008-02-18 12:03:39 -07:00
tsmith@ramayana.hindu.god
845b94451f Bug #28460 mysqlhotcopy silently skips a database with two alphanumerics name
Remove code from mysqlhotcopy which deals with the so-called "RAID"
feature of older MyISAM.
2008-02-18 11:48:33 -07:00
holyfoot/hf@hfmain.(none)
652b7099ca Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/32942/my50-32942
2008-02-18 19:18:44 +04:00
kaa@kaamos.(none)
443c1a8b19 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-02-17 16:57:07 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
7abba3b021 Bug #32942 now() - interval '7200' second NOT pre-calculated, causing "full table scan"
Problem is not about intervals and doesn't actually cause 'full table scan'.
We have an optimization for DISTINCT when we have
'DISTINCT field_from_first_join_table' we don't need to read all the
rows from the JOIN-ed table if we found one conforming row.
It stopped working in 5.0 as we return NESTED_LOOP_OK if we came upon
that case in the evaluate_join_record() and that doesn't break the
recordreading loop in sub_select().

Fixed by returning NESTED_LOOP_NO_MORE_ROWS in this case.
2008-02-17 15:48:17 +04:00
kaa@kaamos.(none)
cb80b23e23 Merge kaamos.(none):/data/src/opt/mysql-4.1-opt
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-02-17 14:38:50 +03:00
kaa@kaamos.(none)
3daeb40f1f Merge kaamos.(none):/data/src/mysql-5.0
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-02-17 14:37:39 +03:00
kaa@kaamos.(none)
7b9dce58d9 Merge kaamos.(none):/data/src/mysql-4.1
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
2008-02-17 14:33:20 +03:00
istruewing@stella.local
b620694ba3 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-15 20:06:15 +01:00
mkindahl@dl145h.mysql.com
d277f9344f Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2008-02-15 17:51:35 +01:00
gkodinov/kgeorge@magare.gmz
a781c1b140 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31887-5.0-opt
2008-02-15 18:34:03 +02:00