serg@serg.mylan
1bc6ae8913
portability fixes
2005-02-20 20:08:33 +01:00
monty@mysql.com
f3b00a0413
use dbug_print_decimal instead of DBUG_EXECUTE
...
Portability fix
Note: rpl_trunc_binlog fails, but Sergei has promised to fix it, so I will ignore it for now
2005-02-20 00:24:30 +02:00
monty@mysql.com
5bfcabf7cd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-19 21:56:24 +02:00
georg@beethoven.site
88afe50565
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into beethoven.site:/home/georg/work/mysql/mysql-5.0
2005-02-19 18:47:33 +01:00
monty@mysql.com
88d2e2973d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-19 19:00:41 +02:00
monty@mysql.com
218e00ac68
Fixed BUILD script to use --with-berkeley-db instead of --with-bdb
...
Lots of small fixes to multi-precision-math path
Give Note for '123.4e'
Added helper functions type 'val_string_from_real()
Don't give warnings for end space for string2decimal()
Changed storage of values for SP so that we can detect length of argument without strlen()
Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer
2005-02-19 18:58:27 +02:00
serg@serg.mylan
e29191e5c5
windows compilation fixes
2005-02-19 12:15:30 +01:00
serg@serg.mylan
cee85887df
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-19 11:05:35 +01:00
serg@serg.mylan
ede1a0dbc7
fix compilation errors
2005-02-19 10:51:49 +01:00
pem@mysql.com
32a3c16385
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-02-18 17:46:30 +01:00
pem@mysql.comhem.se
a69fc3c03f
Fixed...
...
BUG#6642: Stored procedure crash if expression with set function
BUG#7013: Stored procedure crash if group by ... with rollup
BUG#7743: 'Lost connection to MySQL server during query' on Stored Procedure
BUG#7992: SELECT .. INTO variable .. within Stored Procedure crashes
the server
BUG#8116: calling simple stored procedure twice in a row results
in server crash
Rolling back the item change list after each substatement in a procedure
fixed the failing assert().
2005-02-18 17:39:32 +01:00
georg@beethoven.site
26e3685b02
Changes and fixes for windows compilation
2005-02-18 15:17:17 +01:00
serg@serg.mylan
262dd182ef
compilation fixes
2005-02-18 14:42:14 +01:00
serg@serg.mylan
1235e6d2c7
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 13:38:10 +01:00
serg@serg.mylan
f71006f996
Merge bk-internal:/home/bk/mysql-5.0-xa
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 13:17:22 +01:00
hf@deer.(none)
68a1ba2562
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-18 15:57:39 +04:00
mskold@mysql.com
ed53a37b02
Added NULL initilizers for commit_by_xid and rollback_by_xid in hton struct. Changed back table->in_use to current_thd.
2005-02-18 12:53:43 +01:00
hf@deer.(none)
8b2fc991cd
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-02-18 15:52:59 +04:00
hf@deer.(none)
93e0107050
Fix for the bug #7344 (multiple server_init/server_end lead to crash)
...
Some variable wasn't moved to the initial state during mysql_server_end
2005-02-18 15:51:55 +04:00
serg@serg.mylan
c0dda01f76
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 12:02:46 +01:00
msvensson@neptunus.(none)
3d0883bb05
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583
2005-02-18 11:02:21 +01:00
jimw@mysql.com
7eb8c130f7
Merge
2005-02-17 16:16:58 -08:00
jimw@mysql.com
3c700572b4
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 15:23:28 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
36c146c732
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
2005-02-17 21:57:36 +00:00
jimw@mysql.com
e3ff1bf326
Merge mysql.com:/home/jimw/my/mysql-4.1-8303
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:54:05 -08:00
jimw@mysql.com
219e29d7ae
Merge mysql.com:/home/jimw/my/mysql-4.1-8471
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:53:07 -08:00
serg@serg.mylan
3f7355dfef
making XA tree to compile (and pass tests) in -max build
2005-02-17 22:52:40 +01:00
jimw@mysql.com
08624c0061
Merge mysql.com:/home/jimw/my/mysql-4.1-8355
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:48:34 -08:00
jimw@mysql.com
9df11a3c5e
Merge mysql.com:/home/jimw/my/mysql-4.1-7989
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:47:14 -08:00
joerg@mysql.com
bbafcd4972
Fix a compile error (missing return value).
2005-02-17 22:32:21 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
35f772c2bd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
2005-02-17 17:53:05 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
10ab9e982f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
2005-02-17 17:52:49 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
647eaaea1d
Bug#8147
...
Merge from 4.1
2005-02-17 17:38:13 +00:00
msvensson@neptunus.(none)
55824f59b7
Merged test case
2005-02-17 14:45:52 +01:00
msvensson@neptunus.homeip.net
a004533a76
BUG#8547: Wrong errormessage when dropping table that does not exist in NDB
...
- Added tescases
- Added handling of HA_ERR_NO_SUCH_TABLE in mysql_rm_table_part2 so that
error messages now are consistent
2005-02-17 14:22:44 +01:00
serg@serg.mylan
530eecbd99
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
serg@serg.mylan
2b41b8fa01
post-review fixes. Now ROLLBACK is done in Format_description_log_event
2005-02-17 13:52:16 +01:00
jani@ua141d10.elisa.omakaista.fi
36998b7cb7
Fixed Bug#8042, "mysqld crashes on sighup".
2005-02-17 14:07:28 +02:00
svoj@mysql.com
349112292f
bug#6958
...
Fixed that negative arguments to certain integer options wrap around.
2005-02-17 15:04:04 +04:00
igor@rurik.mysql.com
5a3806e5df
Manual merge
2005-02-17 00:34:06 -08:00
igor@rurik.mysql.com
d2730b3342
item.h:
...
Revised the fix for bug #7098 .
Corrected the method Item_string::new_item.
sql_select.cc:
Revised the fix for bug #7098 .
Aborted the previous modifications.
2005-02-16 22:51:32 -08:00
igor@rurik.mysql.com
eedde7ba3e
select.result, select.test:
...
Added a test case for bug #7098 .
sql_select.cc:
Fixed bug #7098 .
When a string field was substituted for an equal constant
the collation of the constant was changed by mistake for
the binary collation.
2005-02-16 21:17:20 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e
Bug#8147
...
Fix ambigious table error for INSERT..SELECT..UPDATE
2005-02-17 01:33:59 +00:00
guilhem@mysql.com
18ecaae189
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-16 23:27:20 +01:00
guilhem@mysql.com
f314564451
Fixes after 4.1->5.0 merge.
2005-02-16 23:23:20 +01:00
pekka@mysql.com
338f75a49d
ndb - fix new decimal type mysql vs. ndb
2005-02-16 21:19:42 +01:00
guilhem@mysql.com
0987d81ae6
Merge
2005-02-16 21:03:58 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
e7ebc032cd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2
2005-02-16 16:54:09 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
25ff6a0938
Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2
2005-02-16 16:47:29 +00:00
serg@serg.mylan
5ddb6354a5
after merge fixes
2005-02-16 17:34:02 +01:00