Commit graph

3475 commits

Author SHA1 Message Date
sergefp@mysql.com
aee9340493 Fix for BUG#5837 merged from 4.0 2004-12-11 15:55:50 +03:00
sergefp@mysql.com
6b55909673 Fix for BUG#5837 - attempt 3.
Call mark_as_null_row in join_read_const and join_read_system.
2004-12-11 15:51:52 +03:00
serg@serg.mylan
d16c9e8615 getting rid of now() is tests 2004-12-11 09:39:29 +01:00
bar@mysql.com
0cfa0adda5 Bug #6819 Some ujis characters cannot be inserted into table
Allow to insert not-assigned UJIS codes.
2004-12-10 16:08:18 +04:00
hf@deer.(none)
192715dbbb Fix for bug #6516 (Server crash loading spatial data)
(after discussion with SerG)
2004-12-10 16:06:49 +04:00
Sinisa@sinisa.nasamreza.org
d7734fd8ac Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-12-10 00:19:52 +02:00
Sinisa@sinisa.nasamreza.org
6772f0a721 A fix for a crashing bug #7101, which occures when the
expression involving LEFT() function is used in GROUP BY
field.
2004-12-10 00:17:43 +02:00
bar@mysql.com
c735aaebfc Bugs: #7111: server crashes when regexp is used 2004-12-09 15:56:19 +04:00
dlenev@mysql.com
611abb882b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
2004-12-09 14:14:03 +03:00
monty@mysql.com
b68f2307e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-12-09 12:50:37 +02:00
monty@mysql.com
01e4740f4c Ensure that we free memory used with --order-by-primary (in mysqldump)
Simple, non critical, fix to mysql_fix_privilege_tables
2004-12-09 12:47:20 +02:00
dlenev@mysql.com
62a6d9749b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
2004-12-09 13:33:12 +03:00
dlenev@brandersnatch.localdomain
4b0882e0a6 Fix for bug #6765 "Implicit access to time zone description
tables requires privileges for them if some table or column level grants
present" (with after-review fixes).

We should set SELECT_ACL for implicitly opened tables in 
my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
checking in check_grant(). Also we should exclude those tables from
privilege checking in multi-update.
2004-12-09 13:31:46 +03:00
konstantin@mysql.com
356005efd7 A fix and test case for Bug#6873 "PS, having with subquery, crash
during execute"
2004-12-09 00:37:17 +03:00
konstantin@mysql.com
b40fc58245 A followup to Bug#6878 "Crash with engine=memory", reported as Bug#6986
""show_check" fails on 64bit platforms": now minimal rec_length
of a HEAP table >= sizeof(void*), hence it's platform-dependant.
2004-12-08 01:34:50 +03:00
bell@sanja.is.com.ua
45ac6cf81a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-12-07 19:32:16 +02:00
ram@gw.mysql.r18.ru
83f3d06f36 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6993
2004-12-07 18:25:12 +04:00
bell@sanja.is.com.ua
562ec49290 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-12-07 14:18:14 +02:00
gluh@gluh.mysql.r18.ru
c946d4dd7b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
2004-12-07 15:18:13 +03:00
gluh@gluh.mysql.r18.ru
8c8f1886a0 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6077
2004-12-07 15:14:28 +03:00
gluh@gluh.mysql.r18.ru
069438d1bb Fix for bug #6840: Default value is not checked in ALTER column SET DEFAULT 'x' 2004-12-07 14:08:56 +03:00
gluh@gluh.mysql.r18.ru
f2fa6fd343 merge 2004-12-07 13:56:48 +03:00
ram@gw.mysql.r18.ru
f449ba85e8 A fix (bug #6993: Max myisam_data_pointer_size limited to 7). 2004-12-07 14:51:13 +04:00
mskold@mysql.com
4458722f55 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-07 10:31:55 +01:00
hf@deer.(none)
477093eb8b Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.6755
2004-12-07 11:20:11 +04:00
bell@sanja.is.com.ua
b218560604 merge 2004-12-07 09:07:37 +02:00
mskold@mysql.com
36a16ffb0a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-06 22:58:15 +01:00
bar@mysql.com
248a968581 UCS2 support in ENUM and SET, which also fixes:
Bug #5174 SHOW CREATE TABLE hangs up if the table contains half-with katakana enum values
UCS2 values are stored in HEX encoding in FRM file
2004-12-06 20:45:32 +04:00
gluh@gluh.mysql.r18.ru
2775350d92 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
2004-12-06 19:45:30 +03:00
gluh@gluh.mysql.r18.ru
2686161c00 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
2004-12-06 19:03:39 +03:00
gluh@gluh.mysql.r18.ru
0282d03215 Syntax extention: 'ALTER DATABASE' without db name (after review) 2004-12-06 19:01:51 +03:00
serg@serg.mylan
39607559e9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-06 14:51:38 +01:00
mskold@mysql.com
3791170159 Fix for bug#6935 table rename does not work with ndb tables 2004-12-06 14:51:10 +01:00
serg@serg.mylan
05d038fc5a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-06 14:21:33 +01:00
mskold@mysql.com
75da2fb3f4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-06 14:15:52 +01:00
hf@deer.(none)
e211b26330 Fix for bug #6755 (ALTER TABLE ENABLE KEYS corrupts spatial index) 2004-12-06 11:42:41 +04:00
bell@sanja.is.com.ua
1b07e3b2db postreview fixes 2004-12-04 00:14:18 +02:00
bell@sanja.is.com.ua
a3ad1765a8 merge 2004-12-03 23:24:41 +02:00
bell@sanja.is.com.ua
b48ec20ac7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2004-12-03 22:40:11 +02:00
bell@sanja.is.com.ua
734ffb8452 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
2004-12-03 22:13:53 +02:00
jimw@mysql.com
5c29de39bd Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTS 2004-12-03 18:42:35 +01:00
jimw@mysql.com
48fc4cbc6b Merge 2004-12-03 17:48:19 +01:00
serg@serg.mylan
b00395fca8 compatibility fix (2G filesize limit) 2004-12-03 17:35:50 +01:00
mats@mysql.com
fe70f8c747 Merge mysql.com:/space/bkroot/mysql-4.1
into mysql.com:/space/bk/b6391-mysql-4.1
2004-12-03 12:15:31 +01:00
mats@mysql.com
2bbdf2403d Bug#6391 (binlog-do-db rules ignored)
CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database.
2004-12-03 12:13:51 +01:00
jimw@mysql.com
4b8e96d5ca Merge 2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682)
(Original fix reimplemented after review by Serg and Guilhem.)
2004-12-03 00:05:11 +01:00
mskold@mysql.com
cca3fc671f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-02 14:25:55 +01:00
monty@mysql.com
55cc515c8f merged on pull 2004-12-02 14:47:14 +02:00
hf@deer.(none)
c7ef44857f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-02 16:46:30 +04:00