hf@deer.(none)
a735a51402
Fix for #2181 (mysql_execute crashed instead of returning error on embedded
...
server)
We didn't perform the check for the error for embedded server
2003-12-23 18:24:33 +04:00
konstantin@mysql.com
445b5ebe32
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-prep
2003-12-23 16:17:46 +03:00
hf@deer.(none)
2d4fbe5a5a
Fix for #2184 (Prepared statements if embedded library broken)
...
There was an error with same function/class member names
2003-12-23 17:17:45 +04:00
konstantin@oak.local
3382eea70e
short patch for bug #2184 'Prepared statements in embedded library was
...
broken with recent changes' (attempt 2).
Adding Statement_core is better because:
- set_statement() code is shorter and you don't need to modify it when adding
new members to Statement_core
- a bit faster (you don't have virtual call and don't free_root() twice)
Do that short patch instead in hope that set_statement() will be sooner or
later removed entirely
2003-12-23 15:38:19 +03:00
paul@teton.kitebird.com
4050a2f58a
Minor comment edits.
2003-12-22 13:08:16 -06:00
paul@teton.kitebird.com
921df22da8
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-22 09:41:21 -06:00
ram@gw.mysql.r18.ru
73a36f1997
Fix & test for the bug #2182 : lpad returns incorrect result.
2003-12-22 19:00:51 +04:00
konstantin@mysql.com
60adb16163
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-22 15:57:59 +03:00
konstantin@oak.local
ce88d81796
Names of all client methods (static functions inside client.c) now
...
uniform: cli_ + member name.
2003-12-22 15:57:34 +03:00
serg@serg.mylan
e08f20c462
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-21 21:19:42 +01:00
serg@serg.mylan
0da22d5bd8
typo fixed
2003-12-21 21:18:59 +01:00
konstantin@mysql.com
e7a4e45cce
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-21 22:37:28 +03:00
konstantin@oak.local
9de694e5eb
THD::init_for_queries() pushed back:
...
see comments to the method why
2003-12-21 22:26:45 +03:00
monty@mysql.com
5eb92715d1
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-12-21 19:39:58 +02:00
monty@mysql.com
0279dc4234
Portability fixes found during 5.0 test compilation
...
Fixed bug in ORDER BY on a small column (Bug #2147 )
Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
2003-12-21 19:39:32 +02:00
heikki@hundin.mysql.fi
947057e771
univ.i, srv0srv.c:
...
Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms
2003-12-20 13:48:35 +02:00
heikki@hundin.mysql.fi
734870d0ce
srv0start.c, univ.i, configure.in:
...
Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
2003-12-20 13:13:55 +02:00
monty@mysql.com
528c33106d
Merge fix
2003-12-20 03:42:17 +02:00
monty@mysql.com
0448a3f4c0
Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
...
A after merge fix for last merge
2003-12-20 03:41:04 +02:00
konstantin@oak.local
34c03bdf99
one line was removed during merge
2003-12-20 03:06:33 +03:00
konstantin@mysql.com
4a0ac0029d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-prep_st_hack
2003-12-20 02:27:32 +03:00
konstantin@oak.local
2a25b2617a
Prepared_statement deployed instead of PREP_STMT.
2003-12-20 02:16:10 +03:00
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