tomas@poseidon.bredbandsbolaget.se
6c58b9f40f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-23 00:59:08 +00:00
tomas@poseidon.bredbandsbolaget.se
5865b63fe3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb-merge
2004-06-23 00:56:29 +00:00
tomas@poseidon.bredbandsbolaget.se
efa105bca7
WL 1748
2004-06-23 00:48:07 +00:00
dlenev@brandersnatch.localdomain
ac68868450
Disabling broken building of mysql_tztime_to_sql utility to allow perform test builds.
2004-06-23 02:48:47 +04:00
dlenev@brandersnatch.localdomain
943228ec05
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-am
2004-06-22 23:36:52 +04:00
dlenev@brandersnatch.localdomain
c110ec1a22
Fix for build from bk failures with old automake.
...
mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made
compatible with older automake versions.
2004-06-22 23:36:26 +04:00
konstantin@mysql.com
b81315d6e8
Fixes to make client_test run on 64 bit Sun: a bug in libmysql and
...
test suite fixed.
2004-06-22 23:07:08 +04:00
joreland@mysql.com
4915b228e1
wl1671 - bug fixes for negative tests
2004-06-22 17:53:09 +02:00
dlenev@brandersnatch.localdomain
b20dca925d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4200
2004-06-22 19:28:01 +04:00
dlenev@brandersnatch.localdomain
eea19e5235
Fix for Bug# 4200 "Parse error on LIKE ESCAPE with parameter binding"
...
Now ESCAPE in LIKE will accept not only string literal but constant
delimited expression.
2004-06-22 19:27:16 +04:00
bell@sanja.is.com.ua
e71b693115
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-regexp-4.1
2004-06-22 15:17:40 +03:00
bell@sanja.is.com.ua
ec09e5f61b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-insert-4.1
2004-06-22 14:27:23 +03:00
bar@mysql.com
3e2da11f7a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-06-22 16:04:06 +05:00
bar@mysql.com
e6fbd80922
configure.in:
...
./configure --with-charset=binary
is now possible.
2004-06-22 16:03:25 +05:00
bell@sanja.is.com.ua
5ed07df98a
Merge
2004-06-22 13:48:51 +03:00
konstantin@mysql.com
02c654d218
- automatic dependency tracking for client_test enabled
2004-06-22 14:47:41 +04:00
bell@sanja.is.com.ua
c6cd51798b
post-review changes (Bug#4090)
2004-06-22 13:41:57 +03:00
ram@gw.mysql.r18.ru
dc6465cc38
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4102
2004-06-22 15:41:51 +05:00
ram@gw.mysql.r18.ru
f3d11147c9
after merge fix
2004-06-22 14:48:29 +05:00
joreland@mysql.com
8488322906
wl1671 - bug fix
2004-06-22 11:47:58 +02:00
bell@sanja.is.com.ua
cb0f607c5e
Merge
2004-06-22 12:38:23 +03:00
dlenev@brandersnatch.localdomain
61c3fb8e2d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-cleanup
2004-06-22 13:20:14 +04:00
dlenev@brandersnatch.localdomain
4f8294f2ff
Removed building of test_time test since it was not needed/used really and caused problems
...
on many platforms (the other option was providing portable setenv() replacement).
2004-06-22 13:19:25 +04:00
bar@mysql.com
51e08a7c49
auto_increment.test, auto_increment.result:
...
Drop t2 in the beginning.
,
2004-06-22 14:10:50 +05:00
konstantin@mysql.com
3f53a1cb44
Fix for bug#4236 "Server crash on attempt to execute non-prepared
...
statement": check that statement is not null when accessing it's name.
2004-06-22 11:04:41 +04:00
ram@gw.mysql.r18.ru
b929db876d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198
2004-06-22 10:58:16 +05:00
sergefp@mysql.com
72d8f71f54
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-06-22 05:11:59 +04:00
lenz@mysql.com
f7f182dd43
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-06-22 02:21:03 +02:00
lenz@mysql.com
a854ffce23
- explicitely enable libedit in Do-compile, when readline is not
...
requested
2004-06-22 02:15:52 +02:00
sergefp@mysql.com
19616945ab
Coding style fixes
2004-06-22 03:25:54 +04:00
dlenev@brandersnatch.localdomain
67b4ec0c38
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-cleanup
2004-06-22 03:14:50 +04:00
dlenev@brandersnatch.localdomain
ea36bd3c78
Small cleanup in time zone handling code:
...
Now we are using time zone abbreviations in debug builds or in utlities only.
Tried to remove warnings generated by compiler by using more proper types for
members of time zone describing structures. Removed unused variables.
Fixed test_time to be able to build on FreeBSD without much problems.
Portability fix: resolved ambiguity of abs() function.
2004-06-22 03:10:30 +04:00
guilhem@mysql.com
892d859f9c
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-21 23:05:27 +02:00
guilhem@mysql.com
c846e86d54
Including in enum_shutdown_level the 2 types of KILL of 5.0
...
(enum_shutdown_level is going to replace enum killed_state in 5.0).
2004-06-21 23:04:50 +02:00
bell@sanja.is.com.ua
a6df8e743a
fixed picture in comment.
2004-06-22 00:00:36 +03:00
joreland@mysql.com
46455f5784
Fix testDict -n InvalidTables
2004-06-21 22:44:14 +02:00
joreland@mysql.com
3b4e86db43
Fix testBasicAsynch
...
Fix debug require in TC
2004-06-21 22:37:05 +02:00
joreland@mysql.com
6b4d60e668
BUG#4230 - fixed
2004-06-21 21:59:27 +02:00
konstantin@mysql.com
b793142c8f
Unused variables removed (many files).
2004-06-21 20:39:19 +04:00
guilhem@mysql.com
ff678fd8b7
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-21 16:37:33 +02:00
guilhem@mysql.com
99bc72d9ed
changing order of enum_shutdown_level (easier; we can test if we should die with
...
"if (thd->killed > thd->killable)", if we simply do
thd->killed= level;
2004-06-21 16:36:28 +02:00
ram@gw.mysql.r18.ru
d337899571
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.bnew
2004-06-21 16:53:58 +05:00
tomas@poseidon.elisa-laajakaista.fi
769fb11057
ndb file missing in src dist
2004-06-21 11:24:08 +00:00
ram@gw.mysql.r18.ru
df727fbb65
a fix (bug #4198 : Incorrect key file for table).
2004-06-21 15:17:07 +05:00
ram@gw.mysql.r18.ru
1d3118f1d2
proper test of warnings for group_concat().
2004-06-21 14:11:51 +05:00
monty@mysql.com
030f091319
Field_geom should have same max_length as Field_blob
...
Updated tests
After merge fix
2004-06-21 11:27:40 +03:00
monty@mysql.com
d69a36d118
merge
2004-06-21 10:24:40 +03:00
monty@mysql.com
1388c164bc
After merge fixes
...
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
2004-06-21 10:21:20 +03:00
joreland@mysql.com
cd1a3dae8e
Merge mysql.com:/home/jonas/src/wl1671
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-21 01:35:30 +02:00
joreland@mysql.com
9ddd3ad5ec
Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-06-21 01:20:41 +02:00