gluh@mysql.com
9f5a51e8d6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Devel/mysql-4.1
2005-05-05 16:23:39 +05:00
konstantin@mysql.com
753959cd88
Manual merge
2005-05-05 13:47:09 +04:00
konstantin@mysql.com
15dbab1c12
A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it
...
should return a non empty one"
(see comments for the changed files for details).
2005-05-05 12:55:09 +04:00
gluh@mysql.com
665cbabe07
Bug #5843 : Server code does not check whether PID file was successfully written
2005-05-05 12:24:10 +05:00
jan@hundin.mysql.fi
3cddcc63fa
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-05 10:15:15 +03:00
kent@mysql.com
c4acdc6e0f
terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:
...
Initial Metrowerks CodeWarrior compiler support
2005-05-05 09:15:14 +02:00
jan@hundin.mysql.fi
71f620890c
Fig compiler error.
2005-05-05 08:08:39 +03:00
msvensson@neptunus.(none)
5b5565c30a
BUG#10241 cygwin port: invalid pragma interface directives
...
- Introduce ifdefs so we can control when to use #pragma interface on cygwin
2005-05-04 15:05:56 +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
jan@hundin.mysql.fi
91640e9d60
Initial value for a auto_increment can now be set using ALTER TABLE
...
AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
change is backported from 5.0 (Bug #7061 ).
2005-05-04 12:24:56 +03:00
jan@hundin.mysql.fi
df8380e0dd
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-04 12:24:55 +03: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
marko@hundin.mysql.fi
64bf449bf7
InnoDB: Disable throttling against thread thrashing by default.
2005-05-03 15:55:53 +03: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
jan@hundin.mysql.fi
2f65c531a8
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-03 09:46:52 +03: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
7bab94f36b
Clean up merge from 4.1
2005-05-02 10:19:37 -07: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
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
jan@hundin.mysql.fi
d3b849466c
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-02 07:30:17 +03: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
dlenev@brandersnatch.localdomain
8ee6d33bdd
Fix for Bug #9913 "udf_deinit is not called after execution of PS"
...
(aka "deinit is not called when calling udf from trigger").
We should call udf_deinit() function during cleanup phase after prepared
(or ordinary) statement execution instead of calling it from Item's
desctructor.
No test case is provided since it is hard to test UDF's from our test
suite.
2005-04-30 20:23:40 +04: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
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
jimw@mysql.com
78ff49437f
Manually resolve merge
2005-04-29 08:46:03 -07:00
hf@deer.(none)
c2339a6ff0
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.spaerrs
2005-04-29 20:26:11 +05:00
hf@deer.(none)
054463f975
Fix for #6553 and #8776 (no errors on bad spatial data)
2005-04-29 20:23:02 +05:00
monty@mysql.com
fbf31c4a8c
CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036 )
...
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467 )
Fix compiler problems with MinGW (Bug #8872 )
2005-04-29 17:03:34 +03:00