gbichot@quadita2.mysql.com
b72ae4fe57
Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
...
Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
Reason I don't propagate caller info to the binlog as planned is that on master and slave
users may be different; even with that some caveats would remain.
2005-05-05 14:20:53 +02:00
konstantin@mysql.com
c78b2d25ac
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-05-04 17:21:49 +04:00
lenz@mysql.com
74baaca4e5
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-05-04 15:06:53 +02:00
lenz@mysql.com
e4907dcdb7
Merge mysql.com:/space/my/mysql-4.1-bug9444
...
into mysql.com:/space/my/mysql-5.0
2005-05-04 15:00:18 +02:00
lenz@mysql.com
59930b6e84
- adjusted the start and stop priority level in the mysql.server init script for chkconfig on
...
Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux
(e.g. RHEL3/RHEL4)
2005-05-04 14:58:43 +02:00
konstantin@mysql.com
0b6066e77a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-05-04 16:54:36 +04:00
konstantin@mysql.com
70a6d6c9de
Post-merge fixes for Bug#9096 "select doesn't return all matched
...
records if prepared statements is used" (see comments to
the changed files).
2005-05-04 16:53:10 +04:00
joreland@mysql.com
f972fd2ee3
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-04 13:30:37 +02:00
joreland@mysql.com
ef23f4295f
bug#10330 - linking with ndb fails
...
changes to handling of new/delete cxa_pure_virtual has changed in mysys
remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places
2005-05-04 13:29:15 +02:00
lenz@mysql.com
68dd50b10a
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-05-04 11:26:15 +02:00
lenz@mysql.com
d0334d932b
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-05-04 10:55:12 +02:00
lenz@mysql.com
210969a3d9
- added missing el_term.h to the source distribution (BUG#10352)
2005-05-04 10:49:42 +02:00
bell@book.sanja.is.com.ua
3be81d4299
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0
2005-05-03 18:47:53 +03:00
konstantin@mysql.com
92e4e1a3f8
Manual merge of Bug#9096
2005-05-03 19:32:29 +04:00
konstantin@mysql.com
018b8025c0
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-4.1-9096-fresh
2005-05-03 12:49:22 +04:00
konstantin@mysql.com
3589e78fda
A fix and test case for Bug#9096 "select doesn't return all matched
...
records if prepared statements is used".
This fix changes equality evaluation method of basic constants from
by-name to by-value, thus effectively enabling use of parameter markers
in some optimizations (constants propagation, evaluation of possible
keys for query).
2005-05-03 12:47:27 +04:00
sergefp@mysql.com
ee3bb57aa3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-test-valgrind
2005-05-03 07:42:36 +00:00
sergefp@mysql.com
e9838c7c70
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-test-valgrind
2005-05-03 10:23:10 +04:00
heikki@hundin.mysql.fi
e8233c3afc
ha_innodb.cc:
...
Return a value from innobase_repl_report_sent_binlog()
2005-05-03 08:40:35 +03:00
jimw@mysql.com
395e51a0ef
Update test results
2005-05-02 11:45:06 -07:00
jimw@mysql.com
36869043ec
Resolve merge of fix for #8166 .
2005-05-02 10:25:47 -07:00
jimw@mysql.com
5bd0fabd38
Merge mysql.com:/home/jimw/my/mysql-5.0-7293
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-02 10:20:54 -07:00
jimw@mysql.com
2d44d93ce6
Merge mysql.com:/home/jimw/my/mysql-5.0-5354
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-02 10:20:22 -07:00
jimw@mysql.com
7bab94f36b
Clean up merge from 4.1
2005-05-02 10:19:37 -07:00
serg@serg.mylan
1727ac74a3
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-02 17:17:43 +02:00
jimw@mysql.com
8e87db9318
Merge mysql.com:/home/jimw/my/mysql-4.1-9947
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:12:27 -07:00
jimw@mysql.com
0b0e4f1166
Merge mysql.com:/home/jimw/my/mysql-4.1-9761
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:12:03 -07:00
jimw@mysql.com
7370017daf
Merge mysql.com:/home/jimw/my/mysql-4.1-9136
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:11:32 -07:00
jimw@mysql.com
2aea94f483
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:05:58 -07:00
msvensson@neptunus.(none)
3e03f3bf1a
Fix typo in ha_backhole.cc
2005-05-02 11:25:01 +02:00
serg@serg.mylan
530b6ba541
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-01 23:10:55 +02:00
sergefp@mysql.com
c83b78169e
Merge mysql.com:/home/psergey/mysql-4.1-bug9228
...
into mysql.com:/home/psergey/mysql-5.0-bug10274-merge
2005-05-01 19:07:01 +04:00
sergefp@mysql.com
acca8f7af3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug9228
2005-05-01 19:03:49 +04:00
serg@serg.mylan
9c332d8d2a
yassl changeset 2:
...
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
don't set -DUSE_MYSYS_NEW for gcc 2.95
set $USE_MYSYS_NEW even if CXX is g++
yassl bugfixes
instantiate all yassl templates explicitly
2005-04-30 19:48:45 +02:00
bell@sanja.is.com.ua
4681d464b1
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
2005-04-30 19:32:45 +03:00
bell@sanja.is.com.ua
906f56750c
postreview changes
2005-04-30 19:27:22 +03:00
monty@mysql.com
e721ec37ff
After merge fixes
2005-04-30 18:40:08 +03:00
bell@sanja.is.com.ua
498a458f2a
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
2005-04-30 17:50:57 +03:00
monty@mysql.com
28a5491d3d
Merge with 4.1
2005-04-30 09:46:08 +03:00
monty@mysql.com
e16985ba15
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-30 09:37:07 +03:00
konstantin@mysql.com
6040b0abf6
A fix and a test case for Bug#9520 "SELECT DISTINCT crashes server
...
with cursor". The patch refactors do_select/sub_select
functions, which implement the nested loop algorithm, and reuses them to
fetch rows for cursors as well.
Pushing with view.test failing (--ps-protocol).
2005-04-30 09:54:35 +04:00
monty@mysql.com
c0e8a8d625
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-30 03:46:38 +03:00
monty@mysql.com
aa84afb983
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-30 03:45:12 +03:00
monty@mysql.com
129c604032
Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598 )
2005-04-30 03:14:42 +03:00
bell@sanja.is.com.ua
19247ab91b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
2005-04-30 01:43:35 +03:00
sergefp@mysql.com
96aeab05d1
Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions about
...
relative sizes of int/long/longlong.
2005-04-30 01:05:15 +04:00
jimw@mysql.com
f35c1a1874
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-29 11:47:30 -07:00
evgen@moonbone.local
4b9f462da7
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/usr/src/mysql-4.1
2005-04-29 22:20:16 +04:00
serg@serg.mylan
328f2e434a
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-29 19:31:56 +02:00
evgen@moonbone.local
b11705a2b0
Fix bug #9703 "Error 1032 with GROUP BY query and large tables"
...
Reset old error if tmp table was successfully created.
Test data is large and can be found in bug report along with test query.
2005-04-29 21:19:39 +04:00