2a25b2617a
Prepared_statement deployed instead of PREP_STMT.
2003-12-20 02:16:10 +03:00
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
ed065798b7
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-12-19 23:09:39 +01:00
2cae5989e9
do not put --user into command line if the value comes from [mysqld] or [server] sections
...
Bug #2163
2003-12-19 23:08:20 +01:00
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
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
fcbee7eb1a
merge with lex pointer change patch
2003-12-19 20:18:18 +02:00
1b7f67d65b
Fixed memory overrun bug in DELETE ... ORDER BY
2003-12-19 19:16:26 +01:00
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
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
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
7dfcc949d6
after merge fixes
2003-12-19 17:15:54 +02:00
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
d4c32db181
merge with 4.0.18
2003-12-19 16:42:17 +02:00
eeff10e4c1
merge
2003-12-19 16:34:48 +02:00
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
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
0605ab2edb
- removed empty file mysql-test/t/rpl_temporary-master.opt
2003-12-19 12:47:10 +01:00
33ca68a205
MYSQL_UNIVERSAL_CLIENT_CHARSET definition has been added.
2003-12-19 14:12:29 +04:00
f8552632fd
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0
2003-12-18 18:08:39 -04:00
f70b3897c4
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0
2003-12-18 18:07:39 -04:00
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
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
aa3f200c03
Fixed that lower_case_table_names is set to 1 for case insensitive file systems.
2003-12-18 16:50:01 +02:00
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
de470e6f83
Fix for #2126
...
additional changes (after discussion with Monty)
2003-12-18 18:12:00 +04:00
1f997d4a70
Removed compiler warning
...
Fixed not updated test from last changeset
2003-12-18 15:24:21 +02:00
b9d8f108c1
Simple cleanups
2003-12-18 14:40:19 +02:00
c1bde7d8bd
Removed unneccessary sprintf call and a variable.
2003-12-18 13:56:13 +02:00
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
6e58a7c49e
Code cleanup
2003-12-18 01:13:52 +02:00
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
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
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
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
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
d49ff0fd62
added error message for receiving variable with wrong GLOBAL|LOCAL type
...
(bug #2086 )
2003-12-17 16:37:47 -04:00
8a409722a0
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2012/mysql-3.23
2003-12-17 13:35:05 -04:00
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
7aad55d97d
fixed small error in types in sql/field.cc
...
(char * -> const char*)
2003-12-17 13:15:01 -04:00
680b2ee434
Fixed typo. Affected INSERT DELAYED ... SELECT commands
2003-12-17 18:12:59 +01:00
e0cc6799ec
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
59004f01f9
fixed restoring of thd->count_cuted_fields in store_val_in_field
...
(fixed #bug 2012)
2003-12-16 17:55:34 -04:00
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
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
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
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
5678574922
Fixed parenthesis needed by valgrind-max.
2003-12-16 16:03:39 +02:00
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
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
