Commit graph

20206 commits

Author SHA1 Message Date
tulin@mysql.com
9171ff17ca Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-21 10:54:23 +01:00
joreland@mysql.com
b6e20e350f ndb - fix problems introduced/discovered by XA 2005-02-21 10:53:19 +01:00
mysqldev@mysql.com
94fb790b18 Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 10:53:01 +01:00
tulin@mysql.com
84f0f11fff bug , ndb includes in lib dir instead of include dir 2005-02-21 10:52:29 +01:00
joreland@mysql.com
9f1f8d3249 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-21 06:56:26 +01:00
petr@mysql.com
bacdd62fb9 Fix confusing comments. 2005-02-20 22:52:28 +03:00
serg@serg.mylan
1bc6ae8913 portability fixes 2005-02-20 20:08:33 +01:00
serg@serg.mylan
6904398874 decimal format documented 2005-02-20 17:25:22 +01:00
serg@serg.mylan
9621ed85a0 underflow in decimal_round fixed 2005-02-20 16:55:11 +01:00
serg@serg.mylan
5cc794b753 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-20 15:53:40 +01:00
petr@mysql.com
2c263ff24c CPPFLAGS is substituted with CXXFLAGS to work with older automake. Serg, now you can enable
server-tools/instance-manager.
2005-02-20 04:36:22 +03: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
serg@serg.mylan
bddd49183c Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-19 22:25:42 +01:00
serg@serg.mylan
24dcb103f3 fix rpl_trunc_binlog to test the new behaviour 2005-02-19 22:24:13 +01: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
Sinisa@sinisa.nasamreza.org
7640c63d26 fix for a bug with my_print_defaults with --defaults-extra-file= option 2005-02-19 19:51:47 +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
pekka@mysql.com
040490aa46 ndb - fix to Time comparison 2005-02-19 18:23:25 +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
tomas@poseidon.ndb.mysql.com
8a9cc87838 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-19 08:22:47 +01:00
jimw@mysql.com
10800c1eb5 Merge mysql.com:/home/jimw/my/mysql-4.1-8475
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:40:17 -08:00
jimw@mysql.com
4823eadee7 Merge mysql.com:/home/jimw/my/mysql-4.1-8517
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:39:53 -08:00
jimw@mysql.com
29d1d9a369 Clean up merge for fix for Bug . 2005-02-18 15:23:17 -08:00
jimw@mysql.com
793a505c26 Fix merge of fix for Bug . 2005-02-18 15:02:54 -08:00
jimw@mysql.com
5348bc99c1 Clean up fix for Bug by avoiding extra memory copy, and adding some
more information to the error message.
2005-02-18 12:47:33 -08: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
tomas@poseidon.ndb.mysql.com
e8f2b13482 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-18 14:55:52 +01:00
kent@mysql.com
34e7e98a45 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-18 14:55:32 +01:00
serg@serg.mylan
b68514ddd1 after-merge fix 2005-02-18 14:53:23 +01:00
serg@serg.mylan
262dd182ef compilation fixes 2005-02-18 14:42:14 +01:00
kent@mysql.com
3f218b85cf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-18 14:37:24 +01:00
kent@mysql.com
d94b8662f4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-18 14:21:00 +01:00
mats@mysql.com
0ad02a920c Merge from 4.0 2005-02-18 14:19:08 +01:00
serg@serg.mylan
e1beaeac17 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:57:54 +01:00
mats@mysql.com
d0f1b5f3fd Merge mysql.com:/home/bkroot/mysql-4.0
into mysql.com:/home/bk/b7879-mysql-4.0
2005-02-18 13:50:19 +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
msvensson@neptunus.(none)
3369b65931 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-02-18 13:31:28 +01:00
msvensson@neptunus.(none)
f454fc8a6c BUG#8585 ndb_cache fails on aix52 2005-02-18 13:29:27 +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
bar@mysql.com
6ef93274b0 Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0.fresh
2005-02-18 16:14:28 +04:00
bar@mysql.com
47b85939a5 Bug with utf_general_ci, equals (=) has problem with accent insensitivity
Backporting Monty's fix for 5.0 into 4.1.
2005-02-18 16:10:12 +04: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