paul@teton.kitebird.com
84930f2d10
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-19 16:20:59 -06:00
monty@mysql.com
4b3e443b36
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-12-19 19:51:06 +01:00
heikki@hundin.mysql.fi
df73dc7828
univ.i, ut0ut.h, ut0ut.c:
...
On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64
2003-12-19 20:39:19 +02:00
monty@mysql.com
fcbee7eb1a
merge with lex pointer change patch
2003-12-19 20:18:18 +02:00
monty@mysql.com
1b7f67d65b
Fixed memory overrun bug in DELETE ... ORDER BY
2003-12-19 19:16:26 +01:00
konstantin@oak.local
d37da004f6
THD::lex now points to THD::main_lex like in 5.0
...
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00
paul@teton.kitebird.com
5b1422ee61
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-19 10:21:15 -06:00
bar@bar.intranet.mysql.r18.ru
c49773237d
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-12-19 19:15:55 +04:00
monty@mysql.com
7dfcc949d6
after merge fixes
2003-12-19 17:15:54 +02:00
bar@bar.intranet.mysql.r18.ru
5be2b8b11a
Fix for Bug#2151:
...
"USE db" affected the character set of further CREATE DATABASEs,
which should have not happened.
2003-12-19 19:12:11 +04:00
monty@mysql.com
d4c32db181
merge with 4.0.18
2003-12-19 16:42:17 +02:00
monty@mysql.com
eeff10e4c1
merge
2003-12-19 16:34:48 +02:00
monty@mysql.com
031390a9a4
Fixes after merge with 4.0
...
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
2003-12-19 16:25:50 +02:00
lenz@mysql.com
c10b25968e
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2003-12-19 12:48:57 +01:00
lenz@kallisto.local
0605ab2edb
- removed empty file mysql-test/t/rpl_temporary-master.opt
2003-12-19 12:47:10 +01:00
ram@gw.mysql.r18.ru
33ca68a205
MYSQL_UNIVERSAL_CLIENT_CHARSET definition has been added.
2003-12-19 14:12:29 +04:00
paul@teton.kitebird.com
74a1f9af26
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-18 11:16:14 -06:00
pem@mysql.comhem.se
3ddbc9872a
Corrected faulty #if tests in udf_example.cc which made udf_test crash the server on some
...
platforms.
2003-12-18 17:46:56 +01:00
monty@mysql.com
aa3f200c03
Fixed that lower_case_table_names is set to 1 for case insensitive file systems.
2003-12-18 16:50:01 +02:00
hf@deer.(none)
7c3ee999d3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2126
2003-12-18 18:12:29 +04:00
hf@deer.(none)
de470e6f83
Fix for #2126
...
additional changes (after discussion with Monty)
2003-12-18 18:12:00 +04:00
monty@mysql.com
1f997d4a70
Removed compiler warning
...
Fixed not updated test from last changeset
2003-12-18 15:24:21 +02:00
monty@mysql.com
b9d8f108c1
Simple cleanups
2003-12-18 14:40:19 +02:00
jani@rhols221.arenanet.fi
c1bde7d8bd
Removed unneccessary sprintf call and a variable.
2003-12-18 13:56:13 +02:00
hf@deer.(none)
42799cc584
Fix for #2126 (mysql_server_init call shouldn't be needed)
...
now mysql_server_init is called from mysql_init with fake parameters
mysql_once_init code included to mysql_server_init.
embedded-specific initialization is in init_embedded_server function
2003-12-18 15:51:22 +04:00
monty@mysql.com
6e58a7c49e
Code cleanup
2003-12-18 01:13:52 +02:00
monty@mysql.com
3ce5c56dc4
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/my/mysql-4.0
2003-12-18 01:08:10 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2b53eef5f0
WorkLog #1323 (part 2)
...
New Statement: SHOW [STORAGE] ENGINES
New System Variable: storage_engine
New mysqld Argument: --default-storage-engine=
2003-12-17 22:52:03 +00:00
guilhem@mysql.com
f0dac9296c
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-17 23:29:42 +01:00
guilhem@mysql.com
508d5e5b9d
Fix for BUG#2145 "mysqld becomes unreliable if unable to create a relay log when replic starts":
...
release the mutex before exiting the function, or it will be kept forever
(=> START SLAVE, STOP SLAVE, etc will hang).
2003-12-17 23:29:11 +01:00
paul@teton.kitebird.com
b67a1e1660
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-17 15:40:21 -06:00
vva@eagle.mysql.r18.ru
07f520b73e
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0
2003-12-17 13:15:57 -04:00
vva@eagle.mysql.r18.ru
7aad55d97d
fixed small error in types in sql/field.cc
...
(char * -> const char*)
2003-12-17 13:15:01 -04:00
monty@mysql.com
680b2ee434
Fixed typo. Affected INSERT DELAYED ... SELECT commands
2003-12-17 18:12:59 +01:00
monty@mysql.com
e0cc6799ec
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
guilhem@mysql.com
c24fd83939
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-16 21:53:18 +01:00
guilhem@mysql.com
b6e55207f5
Fix for BUG#2121 "Inadequate message "check permissions on master.info"":
...
more general message when slave can't start because of incorrect
replication information, the previous one was sometimes a misleading
indication (i.e. sometimes the problem had nothing to do with
system permissions).
The perfect fix would be to report the exact error to the client
(instead of pointing the client to the error log); this is a bit
of work so it's more a development task:
WL#1088 "Move all hardcoded messages of replication to share/errmsg.txt".
I was not able to modify the errmsg.txt in these sql/ subdirectories:
danish
dutch
german
italian
portuguese
russian
spanish
swedish
ukrainian
2003-12-16 21:52:11 +01:00
lenz@mysql.com
8caa18f9e3
- bumped up version number to 4.0.18, now that 4.0.17 has been
...
tagged/released
- tagged ChangeSet@1.1655.1.3 as mysql-4.0.17
2003-12-16 17:44:51 +01:00
jani@rhols221.adsl.netsonic.fi
abaaa0f37b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
2003-12-16 16:04:08 +02:00
jani@rhols221.adsl.netsonic.fi
5678574922
Fixed parenthesis needed by valgrind-max.
2003-12-16 16:03:39 +02:00
lenz@mysql.com
989b4ad241
- Bugfix for Do-rpm (moving of the resulting packages did not work due to
...
a missing space)
- Define the subject of the failure mail reports within the calling script
instead of logger.pm
2003-12-16 14:43:34 +01:00
ram@gw.mysql.r18.ru
795c88517e
proper fix for the bug #2077 : accented characters in enum/defaul values are reported incorrectly.
...
note: bar asked me to use res.charset in ::sql_type() functions to be more consistent.
2003-12-16 17:39:33 +04:00
Sinisa@sinisa.nasamreza.org
05dddb73e1
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-16 14:45:37 +02:00
Sinisa@sinisa.nasamreza.org
a41f9de0d2
A new better test case for bug #2128 involving overflow
...
in decimal type with prepended zero's.
2003-12-16 14:43:34 +02:00
monty@mysql.com
30e318311b
Fixes for last pull
2003-12-16 14:40:57 +02:00
hf@deer.(none)
0462f48b34
Missed header added
2003-12-16 16:36:12 +04:00
monty@mysql.com
87f7fe5714
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/my/mysql-4.0
2003-12-16 12:20:48 +01:00
monty@mysql.com
56f0abf7bb
Portability fixes (mostly test suite)
...
Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1)
Fix when using symlinked data files and realpath() is not working
2003-12-16 13:20:17 +02:00
guilhem@mysql.com
e56c8c61d8
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-16 11:12:40 +01:00
guilhem@mysql.com
db2d812d1b
Fix for BUG#2083
...
"EE_ error codes (EE_DELETE, EE_WRITE) end up in the binlog, making slave stop".
The problem was that during execution of the command on the master, an error
can occur (for example, not space left on device, then mysqld waits and when
there is space it completes successfully: so finally it worked but the error
EE_WRITE remains in thd->net.last_errno and thd->net.last_error).
To know if finally the command succeeded, we test the 'error' variable in
every place, and if it shows no failure we reset thd->net.last_err* using
the function THD::clear_error() which is backported from 4.1.
A new test to see if now only real errors get to the binlog (note: the test
uses "rm").
Also a bit of memory free/alloc saving in log_event.cc (do not free the whole
mem_root after every query in the slave SQL thread: we can keep the initial
block of it; which will be freed when the thread terminates).
2003-12-16 11:10:50 +01:00