sergefp@mysql.com
0700f27ca1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-bug6825
2004-12-21 02:32:30 +03:00
sergefp@mysql.com
88b63ab669
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/dbdata/psergey/mysql-5.0-nov-clean
2004-12-21 02:28:12 +03:00
sergefp@mysql.com
e89f5a7136
Fix for BUG#4480: In joins with SELECT_STRAIGHT_JOIN re-order tables by outer join dependency,
...
so we read dependent tables after tables they depend on (this is needed for outer joins)
2004-12-21 01:59:58 +03:00
ram@gw.mysql.r18.ru
da562b7e02
A fix (bug #7281 : RAND(RAND) crashes server).
2004-12-20 13:47:38 +04:00
dlenev@brandersnatch.localdomain
d65e78b527
Added test which covers nicely recent cleanup in derived tables
...
processing.
2004-12-20 09:55:06 +03:00
monty@mysql.com
6477b4dfd2
Merge with global tree
...
Fixed some found bugs in BIT fields
Added more test cases for BIT fields and varchar
2004-12-19 20:25:19 +02:00
guilhem@mysql.com
031474cf17
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-12-18 18:31:49 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1be319a708
Merge Bug#7391 from 4.0
2004-12-18 15:12:10 +00:00
monty@mysql.com
2a215c17bb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-18 12:49:14 +02:00
gluh@gluh.mysql.r18.ru
bc7860c80c
Fix for bug #7213 : information_schema: redundant non-standard TABLE_NAMES table
2004-12-18 13:49:13 +03:00
gluh@gluh.mysql.r18.ru
bf0104045d
Fix for bug #7210 : information_schema: can't access when table-name = reserved word
2004-12-18 12:48:01 +03:00
monty@mysql.com
f37fd31ddc
Merge with global tree
2004-12-18 06:05:16 +02:00
monty@mysql.com
3fb088a075
Add 0x before pointers (to help with debugging)
...
Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
2004-12-18 05:19:21 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
3047649845
Bug#7391 - Multi-table UPDATE security regression
...
Add in missing privilege checks.
Tests for the privileges.
2004-12-18 02:07:32 +00:00
guilhem@mysql.com
884663662b
Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it
...
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).
2004-12-17 23:37:43 +01:00
mleich@mysql.com
c5eb9f1e4c
Delete files which were accidently created within the last push
2004-12-17 17:03:15 +01:00
ram@gw.mysql.r18.ru
0be6a5b995
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new
2004-12-17 18:07:05 +04:00
ram@gw.mysql.r18.ru
92f89369ae
bit type
2004-12-17 18:06:05 +04:00
mleich@mysql.com
4f024d2388
The BIT patch by ramil causes that the old data type BIT is no
...
longer available for most storage engines.
Therefore column c18 BIT is switched TINYINT .
2004-12-17 14:27:39 +01:00
matthias@three.local.lan
006a512f8f
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-17 11:02:44 +01:00
sergefp@mysql.com
da332aca40
Fix for BUG#6825: When calculating Item_func_neg::max_length, add 1 for '-'.
...
For numeric constants we only need to add, since the parser doesn't produce
negative numbers.
For strings we only add (we actually could substract 1 if given string is a constant
and it has '-number' form but we're not doing that because
* we set max_length bigger then necessary in other cases as well.
* the current solution is simpler and safer (bigger max_length is better then cutting out)
2004-12-17 12:14:45 +03:00
patg@patrick-galbraiths-computer.local
dac98f9b45
WL# 2094 Federated Storage Handler, added fixes per suggestions by Bar and Antony
2004-12-16 19:08:32 -08:00
patg@patrick-galbraiths-computer.local
fe17793fdb
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into patrick-galbraiths-computer.local:/Users/patg/5.0-federated
2004-12-16 18:40:25 -08:00
brian@avenger.(none)
3cf8548cd1
Merge
2004-12-16 15:44:46 -08:00
guilhem@mysql.com
f057721954
A .test for BUG#6287 "Slave skips auto_increment values in Replication with InnoDB"
...
which Heikki fixed in 4.1.8 and 4.0.23. I verified that without Heikki's patch the test fails (7 gets inserted).
Test added to 4.1 because in testsuite of 4.0 it's impossible to start slave with InnoDB.
2004-12-16 23:14:41 +01:00
matthias@three.local.lan
5c4d2286d4
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-16 20:35:16 +01:00
timour@mysql.com
410086b347
Test for BUG#6054. The bug itsel is fixed by the fix for #5837 .
2004-12-16 18:46:38 +02:00
timour@mysql.com
cc6a30214c
Moved drop table statement to the end.
2004-12-16 18:44:39 +02:00
timour@mysql.com
53a9af8f1d
Test for BUG#6054. The bug itsel is fixed by the fix for #5837 .
2004-12-16 18:04:51 +02:00
gluh@gluh.mysql.r18.ru
6a4d28c096
Fix for bug#7211: information_schema: crash if bad view(after review)
2004-12-16 17:44:36 +03:00
gluh@gluh.mysql.r18.ru
4f9f136fb7
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
2004-12-16 17:33:21 +03:00
gluh@gluh.mysql.r18.ru
6372efa7da
Fix for bug#7212: information_schema: "Can't find file" errors if storage engine gone(after review)
2004-12-16 16:31:36 +03:00
ingo@mysql.com
05d5360e7f
Enlarged group item key_length by a varstring length field.
...
Group item fields are implemented as varstrings nowadays.
Made init_connect.test robust against existing t1.
2004-12-16 11:41:52 +01:00
matthias@three.local.lan
b91567cfcb
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-16 10:22:23 +01:00
ram@gw.mysql.r18.ru
d599808fbc
Clean-up.
...
TYPE=MyISAM replaced with ENGINE=MyISAM.
2004-12-14 18:47:34 +04:00
gluh@gluh.mysql.r18.ru
7a38322f3f
Fix bug#7222 information_schema: errors in "routines"
2004-12-14 14:55:28 +03:00
matthias@three.local.lan
621daba7b6
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-14 12:24:59 +01:00
ram@gw.mysql.r18.ru
d35c6c9c03
Portability fix (bug #7203 : "delayed" test fails on QNX when using prepared statements)
2004-12-14 11:35:23 +04:00
matthias@three.local.lan
9733292440
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-13 18:53:49 +01:00
sergefp@mysql.com
03acb8155f
Merged (will need a post-merge fix)
2004-12-13 20:10:07 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
4864dce086
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl2274.2
2004-12-13 14:19:20 +00:00
guilhem@mysql.com
ba77277952
flush_read_lock_kill-master.opt:
...
don't make non-debug builds fail the testsuite
2004-12-13 14:21:59 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
9818cadd1b
WL#2274 - INSERT..SELECT..UPDATE
...
UPDATE clause conflicts with SELECT for use of item_list field.
Alter UPDATE clause to use new lex field update_list
Tests included
2004-12-13 12:26:28 +00:00
matthias@three.local.lan
ac11cba790
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-13 12:24:35 +01:00
bell@sanja.is.com.ua
05c1385c50
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1
2004-12-13 01:32:49 +02:00
monty@mysql.com
b4dc75c877
Fix test results that may change from run to run
...
Added comments (from code review on pull)
2004-12-12 19:54:26 +02:00
monty@mysql.com
3b14ba64fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-12 18:44:15 +02:00
patg@patrick-galbraiths-computer.local
301c493252
First commit to mysql-5.0 tree to include MySQL Federated Storage Handler. This includes both the source and header files, test (results, test, require), and modifications to server and handler base files, and autoconf modifications to properly build federated handler.
2004-12-11 12:03:51 -08:00
sergefp@mysql.com
2d9fae642c
Merge fix for BUG#6976 from 4.0
2004-12-11 20:13:43 +03:00
sergefp@mysql.com
0de1d4a9a9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/dbdata/psergey/mysql-4.0-bug6976
2004-12-11 20:02:45 +03:00
sergefp@mysql.com
f78a60593a
Fix for BUG#6976:
...
In Item_ref::Item_ref set maybe_null (and other fields fix_fields sets) to be the
same as in (*ref), because Item_ref::fix_fields() will not be called. Previously
maybe_null was 0 always and this produced a bogus state where
maybe_null==0 && is_null() == true
which broke evaluation for some upper-level Items, like AND and OR.
2004-12-11 19:59:09 +03:00
bell@sanja.is.com.ua
b9abf25a55
new reference which refer to current value not to result used for resolving outer
...
refernces if subqueri is not in HAVING clause (BUG#7079)
and the same used for subquery transformetion
2004-12-11 17:13:19 +02:00
sergefp@mysql.com
5b0e3b132c
Post-merge fixes
2004-12-11 16:36:12 +03:00
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
gluh@gluh.mysql.r18.ru
2e912bbbe8
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
...
mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable
2004-12-10 12:07:11 +03: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
matthias@three.local.lan
2d90fe51b1
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-09 11:24:46 +01:00
brian@avenger.(none)
c8137bbb80
A few simple fixes plus the added support of being able to repair the meta data file via REPAIR TABLE. More information is now provided in SHOW TABLE STATUS.
2004-12-09 01:48:07 -08:00
monty@mysql.com
31b640c7db
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-08 23:55:01 +02: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
monty@mysql.com
1316954b3f
Fixed that mysql-test-run --ps-protocol works with system_mysql_db_fix.test
2004-12-08 01:17:52 +02: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
jani@ua141d10.elisa.omakaista.fi
f96a9a7a4a
Added some tests for new varchar.
2004-12-07 21:17:00 +02: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
matthias@three.local.lan
ddd4398799
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-07 17:18:49 +01: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
monty@mysql.com
563500994a
Update results for new varchar handling
...
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
2004-12-07 15:47:00 +02: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
monty@mysql.com
77207d19f2
Merge with new VARCHAR code
2004-12-06 19:18:35 +02: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
monty@mysql.com
75d0958dc3
After merge fixes
...
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
2004-12-06 17:15:54 +02: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
monty@mysql.com
0de4777187
Merge with 4.1
2004-12-06 11:38:56 +02:00
hf@deer.(none)
e211b26330
Fix for bug #6755 (ALTER TABLE ENABLE KEYS corrupts spatial index)
2004-12-06 11:42:41 +04:00