Commit graph

20295 commits

Author SHA1 Message Date
lars@mysql.com
e31ea39d0c Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:39:41 +01:00
jan@hundin.mysql.fi
14a7a642b0 Copy X/Open XA XID from trx structure to a list in recovery. 2005-02-22 14:39:15 +02:00
bar@mysql.com
5ef265f219 Bug#8349 myisamchk: --set-charset does not work
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
2005-02-22 16:37:25 +04:00
bell@51.0.168.192.in-addr.arpa
babcdb6407 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 14:34:59 +02:00
lars@mysql.com
d2ecf8e6a5 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:29:20 +01:00
lars@mysql.com
2d1089e8c1 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1 2005-02-22 13:22:34 +01:00
monty@mysql.com
f55e200248 Fixed compiler warnings
Fixed failing myisam.test and rpl_rotate_logs.test on some configurations
2005-02-22 14:15:50 +02:00
bar@mysql.com
89a5530822 A user variable are now always have IMPLICIT coercibility,
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with 
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.
2005-02-22 15:55:40 +04:00
gluh@gluh.mysql.r18.ru
4ea9835455 Fix for bug #7476: crash on SELECT * FROM INFORMATION_SCHEMA.TABLES(after review) 2005-02-22 14:42:44 +03:00
lars@mysql.com
1d3c67000b BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 13:00:00 +02:00
monty@mysql.com
22a76c1dfb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-22 12:51:54 +02:00
monty@mysql.com
e2dc9b4099 Backport my_strntod() from 5.0
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)
2005-02-22 12:51:23 +02:00
bell@51.0.168.192.in-addr.arpa
04cffe4dfb postreview fix 2005-02-22 12:43:49 +02:00
bell@51.0.168.192.in-addr.arpa
9270c24f5f Abort procesing current item if it was substituted by view field (BUF#6894)
Post-review fixes
2005-02-22 12:27:08 +02:00
msvensson@neptunus.(none)
e7cfb0f6a6 Fix name of ndb-cache-check-time 2005-02-22 10:59:24 +01:00
joreland@mysql.com
8195e44c9c Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 10:23:24 +01:00
joreland@mysql.com
df22808b02 wl1292 - ndb autotest scripts
split into script/conf for easier deployment
2005-02-22 10:18:38 +01:00
bar@mysql.com
c0230f6f5f ctype_latin1.result, ctype_latin1.test, charset.c:
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04:00
bar@mysql.com
c709ad87db field.cc:
optimize test_if_minus() when not UCS2 support is compiled.
2005-02-22 08:35:15 +04:00
serg@serg.mylan
82571d6b84 MYSQL_LOG::recover was trying to allocate 0 bytes - bug#8661 2005-02-22 00:43:37 +01:00
paul@snake-hub.snake.net
97f18ad1e0 Merge. 2005-02-21 17:28:33 -06:00
serg@serg.mylan
178be07aa3 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 00:17:56 +01:00
serg@serg.mylan
b43029f4eb bug#8646 - deadlock if long transaction causes binlog rotate 2005-02-22 00:15:31 +01:00
tulin@mysql.com
d863b8951d corrected errors in how ndbcluster handler closes down in case of error 2005-02-21 23:29:07 +01:00
mysqldev@mysql.com
5d1fff6a24 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 23:05:13 +01:00
tomas@poseidon.ndb.mysql.com
3da84d4394 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-21 23:05:12 +01:00
monty@mysql.com
e70b1c18ca Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 20:42:34 +02:00
monty@mysql.com
f5acf0be01 Generate warning in ha_delete_table() if files is missing in handler 2005-02-21 20:41:48 +02:00
tomas@poseidon.ndb.mysql.com
d6188f9fd2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-21 19:11:11 +01:00
bell@51.0.168.192.in-addr.arpa
164be86325 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0
2005-02-21 19:51:10 +02:00
lars@mysql.com
be28ef0a20 BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
heikki@hundin.mysql.fi
592ad32c74 ha_innodb.cc:
Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited
2005-02-21 18:54:06 +02:00
hf@deer.(none)
518dc54a4f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 20:54:05 +04:00
lars@mysql.com
d857155e1d BUG#6676: Added comment for the fix 2005-02-21 17:52:15 +01:00
hf@deer.(none)
b5926f1d51 Fix for bug #8651 (cast(sum(distinct) as decimal) crashes the server) 2005-02-21 20:50:56 +04:00
serg@serg.mylan
d1be376519 show automatic commits in general log 2005-02-21 16:28:05 +01:00
lars@mysql.com
5cffeb2b85 BUG#6676: Derivation of user variables should be of derivation "IMPLICIT" 2005-02-21 16:26:04 +01:00
mysqldev@mysql.com
0ffb4c21a1 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 16:23:05 +01:00
monty@mysql.com
4feff48d9d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 17:23:05 +02:00
serg@serg.mylan
5a333a3b14 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-21 16:23:04 +01:00
hf@deer.(none)
f7b5ef47b1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 19:23:03 +04:00
hf@deer.(none)
803ed1a116 Tests modified to coved decimal-related code 2005-02-21 19:20:05 +04:00
paul@snake-hub.snake.net
a32790ca05 sql_parse.cc:
Fix compiler complaint.
2005-02-21 09:15:43 -06:00
bell@51.0.168.192.in-addr.arpa
67f9b28bcb postreview changes 2005-02-21 17:07:40 +02:00
konstantin@mysql.com
b902a66e27 Fix -ansi -pedantic compilation failure. 2005-02-21 17:27:36 +03:00
mysqldev@mysql.com
1a233ed968 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 15:07:27 +01:00
pem@mysql.com
9376231fb4 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-21 15:04:41 +01:00
ramil@mysql.com
d2f8149861 Cleanup. 2005-02-21 18:03:06 +04:00
pem@mysql.comhem.se
d88fa42cab A minor adjustment of the previous bug fix in sp_head.cc.
(Which btw also fixed BUG#7295: Server crash when executing stored procedure,
 I just forgot to include that before.)
2005-02-21 14:57:43 +01:00