mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30186 commits 2784 branches 343 tags 1.6 GiB
Commit graph

14353 commits

Author SHA1 Message Date
mskold@mysql.com
1476b484c2 Additional fixes for WL#1892 2006-01-17 12:53:49 +01:00
pem@mysql.com
ba01e04a2c Post-review fix. (BUG#15231) 2006-01-17 12:48:48 +01:00
jani@hundin.mysql.fi
2df00e30f2 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jani/mysql-5.0
 2006-01-17 13:47:41 +02:00
pem@mysql.com
7817b99857 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0
 2006-01-17 12:44:51 +01:00
pem@mysql.com
2f44b60752 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
 2006-01-17 10:04:11 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6bf5c9113d WL #2747: Fix such that backup and restore works for user defined 
partitioned tables in NDB
 2006-01-17 09:25:12 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
e802a94284 WL #2604: Partition Management 
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes
 2006-01-17 08:40:00 +01:00
tomas@poseidon.ndb.mysql.com
31596d5456 added assert for when ndb share is not released as it should 
+ corrected the bugs in this resuling from mysql-test-run
+removed some debug printouts
 2006-01-17 07:36:50 +01:00
konstantin@mysql.com
34c37d1ac9 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-01-17 00:44:43 +03:00
reggie@linux.site
3573c2cf47 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1-bug15968
 2006-01-16 15:23:29 -06:00
jani@a193-229-222-105.elisa-laajakaista.fi
41ff5c80da Changed condition similar to code in 4.1. 2006-01-16 23:15:00 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b948c2941d Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2006-01-16 21:31:22 +02:00
svoj@april.(none)
237e80670a Merge april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.1-new
 2006-01-16 21:42:09 +04:00
serg@serg.mylan
ae3d815b41 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2006-01-16 18:09:04 +01:00
andrey@lmy004.
7b2238d484 Merge 2006-01-16 16:21:41 +01:00
pem@mysql.com
559a243686 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
 2006-01-16 15:37:25 +01:00
pem@mysql.com
a1b2960a8a Post-review fix (BUG#14498). 2006-01-16 15:22:29 +01:00
evgen@moonbone.local
7f0aa55e36 Manually merged 2006-01-16 16:57:15 +03:00
aivanov@mysql.com
442dcf8be7 Restore fix for bug #15108 (by ramil) erroneously erased 
by applying innodb-5.0-ss115 snapshot.
 2006-01-16 15:23:02 +03:00
aivanov@mysql.com
708f9b3ceb Changes from the innodb-5.0-ss115 snapshot. 
Fixed bugs:
 BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
 BUG#15650: "DELETE with LEFT JOIN crashes server"
 BUG#15308: "Problem of Order with Enum Column in Primary Key"
 BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"
 2006-01-16 14:32:43 +03:00
aivanov@mysql.com
55d77bdc36 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/dev/mysql-5.1-studio
 2006-01-15 17:41:32 +03:00
aivanov@mysql.com
8e499f0292 Changes to avoid compilation errors in MS Visual Studio 7.1 
(reviewed by Mats)
 2006-01-15 15:47:27 +03:00
aivanov@mysql.com
c46f11fa96 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14
 2006-01-15 14:56:38 +03:00
aivanov@mysql.com
ee2b765751 Changes from innodb-4.1-ss14 snapshot 
Fixed BUG#14056: Column prefix index on UTF-8 primary key
 causes "Can't find record.."
 Also fixed bug 15991.
 2006-01-15 14:50:47 +03:00
konstantin@mysql.com
0a64381cee Merge mysql.com:/opt/local/work/mysql-4.1-12734 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-01-14 19:12:07 +03:00
knielsen@mysql.com
ae9c76b9cb Solaris compile fixes. 2006-01-14 11:06:44 +01:00
konstantin@mysql.com
48d48bc936 A fix and a test case for Bug#12734 " prepared statement may 
return incorrect result set for a select SQL request"
 2006-01-14 04:55:07 +03:00
sergefp@mysql.com
86daf2d493 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug16393-r2
 2006-01-14 01:28:42 +03:00
sergefp@mysql.com
dc14d007db BUG#16393: post-review fixes: fix comments. 2006-01-14 01:26:42 +03:00
knielsen@mysql.com
12cb3f4c5e Windows/Visual Studio 2003 fixes for the 5.1.5 release. 2006-01-13 22:09:48 +01:00
sergefp@mysql.com
e58314d482 BUG#16393: Let the 'ref' optimizer use ON condition of nested join to construct 
'ref' accesses to all tables that are direct children of the nested join and are 
not inner wrt their siblings.
 2006-01-13 23:55:30 +03:00
svoj@april.(none)
d0a5e3db9f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
 2006-01-13 21:30:05 +04:00
svoj@april.(none)
5581ef960a BUG#13835: max key length is 1000 bytes when trying to create a fulltext index 
Allow fulltext index on VARCHAR columns longer than max key length.
 2006-01-13 21:25:12 +04:00
anozdrin@mysql.com
4e1ccbe244 Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15103 
into  mysql.com:/home/alik/MySQL/devel/5.1-tree
 2006-01-13 19:46:39 +03:00
anozdrin@mysql.com
acbacd921f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
 2006-01-13 19:46:38 +03:00
tomas@poseidon.ndb.mysql.com
f4bb80b691 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-01-13 17:46:37 +01:00
anozdrin@mysql.com
b1705ae5c4 Merge BUG#15110 from 5.0 into 5.1. 
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
 2006-01-13 19:09:27 +03:00
evgen@moonbone.local
cea01c7387 Merge 2006-01-13 16:27:38 +03:00
tomas@poseidon.ndb.mysql.com
fff1caa0be enabled test 
added missing debug_return
 2006-01-13 13:01:19 +01:00
evgen@moonbone.local
02570c20bf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/15538-bug-5.0-mysql
 2006-01-13 14:30:20 +03:00
mskold@mysql.com
d9ea73d054 Added new calls for WL#1892 NDB Handler: Add support for CREATE/DROP INDEX 2006-01-13 11:51:30 +01:00
evgen@moonbone.local
8dbedc9ffd Merge 2006-01-13 12:13:50 +03:00
mskold@mysql.com
61f62f6294 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-01-13 09:42:50 +01:00
tomas@poseidon.ndb.mysql.com
931ec48085 coreect build error without ndb 2006-01-13 09:42:49 +01:00
tomas@poseidon.ndb.mysql.com
1246d2a264 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/v7
 2006-01-13 07:50:45 +01:00
brian@zim.tangent.org
8651cee8ef New support for ignoring blobs during scans. We now seek past them if we determine that they are of no use to us. This is a big save in tables with blobs. Far less memory overhead and the seek is quite a bit faster. 2006-01-12 20:32:40 -08:00
tomas@poseidon.ndb.mysql.com
e648a8fe52 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/v7
 2006-01-13 03:17:09 +01:00
dlenev@mysql.com
f9ea947bdc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
 2006-01-13 01:56:57 +03:00
dlenev@mysql.com
d14e701446 Fix for bug #12198 "Temporary table aliasing does not work inside stored 
functions".

We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
 2006-01-13 01:51:56 +03:00
mskold@mysql.com
4f93c28fb3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-01-12 22:58:20 +01:00
ingo@mysql.com
acb31ce696 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563
 2006-01-12 20:21:20 +01:00
andrey@lmy004.
4621320edf WL #1034 (Internal CRON) post-push fix 
fix problem that gcc4 does not like at all
 2006-01-12 19:51:13 +01:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4 wl2325 wl2324 2006-01-12 19:51:02 +01:00
jani@ua141d10.elisa.omakaista.fi
4d59111a1c Fixed a bug in merge. 2006-01-12 20:49:47 +02:00
jani@ua141d10.elisa.omakaista.fi
617585eb33 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2006-01-12 20:28:23 +02:00
ingo@mysql.com
01d8c6678e Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563
 2006-01-12 17:29:14 +01:00
andrey@lmy004.
e385a68fc0 WL #1034 (Internal CRON) post-push update 
- fix compile failure on QNX and FreeBSD
 2006-01-12 16:51:45 +01:00
jani@ua141d10.elisa.omakaista.fi
8c6a32b997 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2006-01-12 17:47:58 +02:00
jani@ua141d10.elisa.omakaista.fi
af845f6eff NetWare specific change to increase thread stack size. 
Changes to Netware specific mysqld_safe.c
 2006-01-12 15:10:12 +02:00
monty@mysql.com
4d0fd66bdd Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-01-12 14:40:39 +02:00
bar@mysql.com
6301568290 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 16:07:06 +04:00
bar@mysql.com
5f17cbaba4 sql_show.cc: 
after-merge fix for
  bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
 2006-01-12 16:05:46 +04:00
ingo@mysql.com
16437321cb WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX 
NDB cluster is not fully supported. This will be added with
WL 1892 (NDB Handler: Add support for CREATE/DROP INDEX).
Some preparatory code for this is already present though.
A change for the "duplicate key" error message is planned
for another changeset.
 2006-01-12 10:05:07 +01:00
sergefp@mysql.com
40b7fab55d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
 2006-01-12 11:55:34 +03:00
mskold@mysql.com
f5834451a8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-01-12 09:14:00 +01:00
sergefp@mysql.com
aa00d65ead Fix typo bug in previous cset 2006-01-12 11:11:16 +03:00
bar@mysql.com
77e9461f88 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
 2006-01-12 11:48:48 +04:00
sergefp@mysql.com
e40759e370 BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into 
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
 2006-01-12 10:48:27 +03:00
bar@mysql.com
28ed7c0c9f sql_table.cc: 
Typo fix.
  Thanks Serg for noticing this.
 2006-01-12 11:41:57 +04:00
bar@mysql.com
0e9c8395c7 Merge mysql.com:/usr/home/bar/mysql-4.1.b15581 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15581
 2006-01-12 11:13:34 +04:00
brian@zim.tangent.org
fb7288c2a2 Fixed typo. 
Really dumb typo....
 2006-01-11 22:59:08 -08:00
brian@zim.tangent.org
c30f88f86d Added bitfield support and a test for it. 
Archive uses native row format, so honestly this is just the change in a flag.
 2006-01-11 21:16:51 -08:00
anozdrin@mysql.com
dae00c191f Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem. 2006-01-12 03:02:52 +03:00
evgen@moonbone.local
41ef34356c Fixed bug #15538: unchecked table absence caused server crash. 
Absence of table in left part of LEFT/RIGHT join wasn't checked before
name resolution which resulted in NULL dereferencing and server crash.

Modified rules: 
"table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer 
JOIN_SYM table_ref"
NULL check is moved before push_new_name_resolution_context()
 2006-01-11 23:39:09 +03:00
evgen@moonbone.local
3e23d458f9 Fixed bug #15347: Wrong result of subselect when records cache and set 
functions are involved.

When subselect is a join with set functions and no record have been found in
it, end_send_group() sets null_row for all tables in order aggregate functions 
to calculate their values correctly. Normally this null_row flag is cleared for 
each table in sub_select(), but flush_cached_records() doesn't do so.
Due to this all fields from the table processed by flush_cached_records() are 
always evaluated as nulls and whole select produces wrong result.

flush_cached_records() now clears null_row flag at the very beginning.
 2006-01-11 23:16:21 +03:00
brian@zim.(none)
605f3ab586 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/archive-5.1
 2006-01-11 12:06:30 -08:00
evgen@moonbone.local
605f62fce8 Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong 
select result

Item equal objects are employed only at the optimize phase. Usually they are not
supposed to be evaluated.  Yet in some cases we call the method val_int() for
them. Here we have to take care of restricting the predicate such an object
represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.

Added a check for field's table being const in Item_equal::val_int().
If the field's table is not const val_int() just skips that field when
evaluating Item_equal.
 2006-01-11 22:49:43 +03:00
andrey@lmy004.
b9de3d7f32 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-tt-copy-works
 2006-01-11 19:50:59 +01:00
tomas@poseidon.ndb.mysql.com
25af1c1daf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-01-11 19:50:58 +01:00
tomas@poseidon.ndb.mysql.com
0a0fe2b1c0 bug: replication of table spaces to work 
bug: check if storage engine is enabled to avoif code dump
 2006-01-11 19:49:38 +01:00
andrey@lmy004.
a6d4732ccb WL #1034 
- add a bit more debug messages
- disable events.test for now due to a bug
 2006-01-11 19:31:21 +01:00
brian@zim.(none)
bee896be2d Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/archive-5.1
 2006-01-11 09:37:48 -08:00
andrey@lmy004.
71eb7d7ec9 WL #1034 (Internal CRON) pre-push updates 
- various fixes of test cases
(hopefully the last pre-push update before the push)
 2006-01-11 18:09:05 +01:00
andrey@lmy004.
079237a90f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-tt-copy-works
 2006-01-11 16:06:05 +01:00
konstantin@mysql.com
4d272aba67 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-01-11 17:49:56 +03:00
konstantin@mysql.com
9105d06dd6 A fix for Bug#13944 "libmysqlclient exporting sha1_result function": 
rename sha1_* to mysql_sha1_*
 2006-01-11 17:31:52 +03:00
pem@mysql.com
0cc1acd51c Fixing BUG#15658: Server crashes after creating function as empty string 
Empty strings (and names with trailing spaces) should not be allowed.
 2006-01-11 15:11:05 +01:00
mskold@mysql.com
0453feff9a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-01-11 13:55:04 +01:00
mats@mysql.com
67a48b02bf Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/bkroot/mysql-5.1-new
 2006-01-11 13:53:35 +01:00
andrey@lmy004.
b7117c448e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-tt-copy-works
 2006-01-11 12:51:17 +01:00
andrey@lmy004.
c326d96535 WL #1034 (Internal CRON) pre-push fixes 
after another merge fixes.
 2006-01-11 12:49:56 +01:00
mskold@mysql.com
946300c89b WL#1892 Post-review fix, removed index insertion in list at create 2006-01-11 12:41:38 +01:00
mskold@mysql.com
e39e2d9a22 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-01-11 12:36:38 +01:00
mskold@mysql.com
67cbb3b11e Restructered index management, to prepare for add/drop index (WL#1892) 2006-01-11 12:35:28 +01:00
gluh@mysql.com
f07d2aaac6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
 2006-01-11 15:05:40 +04:00
gluh@eagle.intranet.mysql.r18.ru
9f729c45d7 Additional fix for wl#2506 2006-01-11 15:04:18 +04:00
andrey@lmy004.
8515610f2e manual merge 2006-01-11 12:01:36 +01:00
mats@mysql.com
0933a3bc34 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b16095-mysql-5.1-new
 2006-01-11 11:50:09 +01:00
jonas@perch.ndb.mysql.com
161645c81e wl2723 - ndb opt. nr 2006-01-11 11:35:25 +01:00
mats@mysql.com
31c3ae5603 Bug#16095 (INSERT DELAYED crashes mysqld server): 
Checking that binlog is open before calling binlog_query().
 2006-01-11 09:16:24 +01:00
brian@zim.(none)
b56432cd19 Added support for CREATE TABLE AUTO_INCREMENT and added more tests. Also non-unique index scans of autoincrement not function. 2006-01-10 22:54:34 -08:00
anozdrin@mysql.com
e5d26fc446 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/MySQL/devel/5.0-bug15110
 2006-01-11 02:10:59 +03:00
anozdrin@mysql.com
b04b851ef9 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause 
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.
 2006-01-11 02:07:40 +03:00
andrey@lmy004.
cda83534b1 WL #1034 (Internal CRON) pre-push update 
fix errmsg.txt
 2006-01-10 21:47:12 +01:00
andrey@lmy004.
7c049782fa WL #1034 (Internal CRON) 
merge before push
 2006-01-10 21:02:19 +01:00
andrey@lmy004.
d2f0002e77 WL #1034 (Internal CRON) pre-push updates 
- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
  variables are very nice but extremely error-prone (Count one more
  time just to be sure).
 2006-01-10 19:16:58 +01:00
jani@ua141d10.elisa.omakaista.fi
d9d6dfea3a Changed function prototype. 2006-01-10 19:19:56 +02:00
monty@mysql.com
2970e71ce8 Re-run fix-fields on condition if table was reopened in HANDLERREAD 2006-01-10 19:13:12 +02:00
jani@ua141d10.elisa.omakaista.fi
df801decef Fixed refresh_status function. 2006-01-10 18:56:23 +02:00
monty@mysql.com
3143daf8ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-01-10 18:03:54 +02:00
gluh@eagle.intranet.mysql.r18.ru
be4ebd9038 WL#2506: Information Schema tables for PARTITIONing 
added I_S 'PARTITIONS' table
 2006-01-10 19:44:04 +04:00
andrey@lmy004.
64d2033f09 WL 1034 update 
(pre-push cleanups removing debugging code)
 2006-01-10 11:31:45 +01:00
igor@rurik.mysql.com
19f3821ccb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-01-10 02:19:01 -08:00
joerg@mysql.com
74ef14158f Some casts and simple fixes to fix compile errors in Visual 2005, 
cleaned up some of the casts as a result of Mats' review.
(transferred from "2005/12/10 22:31:58-06:00 reggie@fedora.(none)"
and from "2006/01/03 22:37:24-06:00 reggie@fedora.(none)")
 2006-01-10 10:35:43 +01:00
msvensson@neptunus.(none)
d37c04d125 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598
 2006-01-10 09:20:30 +01:00
igor@rurik.mysql.com
ed7a11895f Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-01-10 00:14:39 -08:00
igor@rurik.mysql.com
32c7a0b62f Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-01-09 21:46:33 -08:00
igor@rurik.mysql.com
a3a2f065fb Ajustement after merge 2006-01-09 21:44:42 -08:00
brian@zim.(none)
b296f64c0e Removing unneeded include. 2006-01-09 21:04:58 -08:00
brian@zim.(none)
50dd013cf4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/archive-5.1
 2006-01-09 18:53:02 -08:00
brian@zim.(none)
de44001afd Corrections from code review for auto_increment. Added test cases. 2006-01-09 18:41:37 -08:00
paul@snake-hub.snake.net
5088f5b343 errmsg.txt: 
Fix word.
  (no test results needed fixing)
 2006-01-09 20:13:27 -06:00
reggie@linux.site
74e8c453b6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups
 2006-01-09 17:35:25 -06:00
igor@rurik.mysql.com
e4b1399b5a Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-01-09 15:20:01 -08:00
knielsen@mysql.com
535515aeb2 Complete missing part of Mats' HPUX NO_FLAGS fix 2006-01-09 22:17:52 +01:00
brian@zim.(none)
be69338259 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/archive-5.1
 2006-01-09 13:02:00 -08:00
msvensson@neptunus.(none)
0d6d232dec Merge neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598 
into  neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598
 2006-01-09 18:04:53 +01:00
monty@mysql.com
3c808fe928 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-01-09 18:52:22 +02:00
msvensson@neptunus.(none)
33d5dc041d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
 2006-01-09 17:18:49 +01:00
mats@mysql.com
1c0b916ec1 Changes to support HP-UX. 2006-01-09 16:37:24 +01:00
mats@mysql.com
c600d05fec Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/mkindahl/bk/fix-mysql-5.1-new
 2006-01-09 16:02:14 +01:00
mats@mysql.com
94d3a8e050 Changes to support aCC on HP-UX. 2006-01-09 15:59:39 +01:00
brian@zim.(none)
9e22159558 This changeset adds support for autoincrements to archive. It allows it to have them with both unique and non-unique indexes. 
Test cases will come in the next push (just doing this one so I can get a couple of reviews in). This is not the final patch.
 2006-01-09 02:35:40 -08:00
knielsen@mysql.com
e952a7005b Fix "jump to label crosses initialization" compile error. 2006-01-09 11:23:15 +01:00
msvensson@neptunus.(none)
7bda1e9191 Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598 
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
 2006-01-09 11:16:29 +01:00
knielsen@mysql.com
848383feb8 Fix template problem with Sun compiler by using anonymous namespace instead 
of static for referenged function.
 2006-01-09 11:08:23 +01:00
msvensson@devsrv-b.mysql.com
175a946e55 Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598 
into  devsrv-b.mysql.com:/space/magnus/my41-bug15598
 2006-01-09 10:57:28 +01:00
msvensson@neptunus.(none)
2a05a6ba87 Bug #15598 Server crashes in specific case during setting new password 
- When acl_user->host.hostname is NULL compare it as ""
 2006-01-09 10:31:07 +01:00
monty@mysql.com
1378eda3c4 After merge fix (Lines lost in manual merge) 2006-01-09 11:10:49 +02:00
mats@mysql.com
373abaf476 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/mkindahl/bk/b15923-mysql-5.1-new
 2006-01-09 09:47:23 +01:00
mats@mysql.com
fb0145c55c Bug#15923 (Test ps_7ndb cause master crash): 
Always log statements "DELETE FROM x" statement-based.
 2006-01-09 09:37:21 +01:00
igor@rurik.mysql.com
4477f96365 Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-01-08 17:21:26 -08:00
igor@rurik.mysql.com
7dc0ecb4b0 Adjustment after a merge. 2006-01-08 17:17:22 -08:00
igor@rurik.mysql.com
63d94fb9bc Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-01-08 14:46:47 -08:00
monty@mysql.com
c44d6124ed Merge mysql.com:/home/my/mysql-4.0 
into  mysql.com:/home/my/mysql-4.1
 2006-01-08 19:07:49 +02:00
igor@rurik.mysql.com
bf78fd5438 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-01-07 23:10:08 -08:00
igor@rurik.mysql.com
05947d9916 Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set. 2006-01-07 23:00:06 -08:00
serg@serg.mylan
86e35affcf after merge fix 2006-01-07 16:27:40 +01:00
serg@serg.mylan
923e7cfd73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-01-07 14:50:03 +01:00
serg@serg.mylan
cfbaad9952 WL#2935 - SHOW STATUS support in plugins 
The patch adds DYNAMIC_ARRAY all_status_vars, which is now the
sole source of status information for SHOW STATUS.  Status
variables can be added to and removed from the array dynamically.
SHOW STATUS command uses this array instead of static array
from mysqld.cc
Compatibility with the old, global list of status variables is
preserved in init_server_components(), where this global list is
simply appended to all_status_vars.
 2006-01-07 14:41:57 +01:00
igor@rurik.mysql.com
aade22bad2 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-01-06 23:26:20 -08:00
igor@rurik.mysql.com
d2cfad167b Fixed bug #16016: MIN/MAX optimization was not applied to views. 2006-01-06 22:28:26 -08:00
reggie@linux.site
557a68327f Bug# 15968 - Partitions: crash when insert with f1 = -1 into partition by hash(f1) 
fixed
 2006-01-06 18:52:49 -06:00
monty@mysql.com
fd4a040325 Fixes during review of new pushed code: 
Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Safety fix for bug #13855 "select distinct with group by caused server crash"
 2006-01-06 21:42:17 +02:00
jimw@mysql.com
96ae7c2e78 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-01-06 10:42:58 -08:00
serg@serg.mylan
8dc77f267b merged 2006-01-06 18:26:59 +01:00
jimw@mysql.com
d8a4aafe33 Merge mysql.com:/home/jimw/my/mysql-5.0-14212 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-01-06 08:34:55 -08:00
knielsen@mysql.com
dca852ff68 BUG#16155: Workaround AIX 5.2 64-bit compiler bug. 2006-01-06 17:02:57 +01:00
knielsen@mysql.com
be8f21e8f1 Fix compile failure on QNX. 2006-01-06 14:30:25 +01:00
joerg@mysql.com
4a0fe7348a Compile fix: An "int" function had accidentally lost its "return 0;", re-add it. 2006-01-06 12:21:15 +01:00
monty@mysql.com
64cab9d767 After merge fix and a safety fix for handler 2006-01-06 12:48:14 +02:00
monty@mysql.com
b0a5ea01ef Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-01-06 01:08:48 +02:00
monty@mysql.com
6e22e29de6 Review fixes of new pushed code 
- Fixed tests
- Optimized new code
- Fixed some unlikely core dumps
- Better bug fixes for:
  - #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  - #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null
 2006-01-06 00:47:49 +02:00
jimw@mysql.com
7d551b8a4e Merge mysql.com:/home/jimw/my/mysql-5.0-15185 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-01-05 10:27:06 -08:00
sergefp@mysql.com
62942018e1 WL#2985 "Partition-pruning", "range walking" addition: better comments. 2006-01-05 17:47:07 +03:00
knielsen@mysql.com
eed5285e8c Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-01-05 10:54:14 +01:00
mats@mysql.com
e46dab62c1 Bug#15923 (Test ps_7ndb cause master crash): 
Always logging statements of the form "DELETE FROM x" statement-based.
 2006-01-05 10:52:58 +01:00
knielsen@mysql.com
ed7c09da36 Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-01-05 10:45:34 +01:00
konstantin@mysql.com
9bf1e22b4c Fix -ansi -pedantic compile 2006-01-05 11:18:26 +03:00
konstantin@mysql.com
8e9af5d72a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-01-05 11:05:27 +03:00
sergefp@mysql.com
e40e1003f7 WL#2985 "Partition pruning": Make compilable without partitioning engine. 2006-01-05 03:12:51 +03:00
konstantin@mysql.com
f4cc6c4d15 Merge mysql.com:/opt/local/work/mysql-5.0-merge 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-01-05 00:38:51 +03:00
paul@snake-hub.snake.net
ebe0b0b8b3 set_var.cc: 
Fix out of order system variable.
 2006-01-04 13:43:21 -06:00
konstantin@mysql.com
4a4b8eacc1 Post-merge fixes. 2006-01-04 21:39:39 +03:00
knielsen@mysql.com
f13dff7a72 EADDRINUSE is not defined on Windows. 2006-01-04 16:38:54 +01:00
lars@mysql.com
9e24aedea5 BUG#16188: Could not compile 2006-01-04 16:24:58 +01:00
konstantin@mysql.com
6502e6bba7 Merge mysql.com:/opt/local/work/mysql-4.1-7209-new 
into  mysql.com:/opt/local/work/mysql-5.0-merge
 2006-01-04 17:49:45 +03:00
konstantin@mysql.com
f7d6fa6f17 A fix for Bug#7209 "Client error with "Access Denied" on updates 
when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a 
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.
 2006-01-04 17:35:30 +03:00
mats@mysql.com
3377014a3c Post-merge fixes. 2006-01-04 15:04:36 +01:00
mats@mysql.com
c3d029bde5 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b15924-mysql-5.1-new
 2006-01-04 14:05:50 +01:00
mats@mysql.com
e6bd8be4f3 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b15924-mysql-5.1-new
 2006-01-04 14:00:35 +01:00
mats@mysql.com
d2277ec43d Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b15942-mysql-5.1-new
 2006-01-04 13:57:02 +01:00
holyfoot@mysql.com
42dd692212 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-04 14:28:41 +04:00
holyfoot@deer.(none)
e8697cf428 Big patch to make embedded-server working in 5.x 
Now it supports queries returning several results
(particularly important with the SP)
 2006-01-04 14:20:28 +04:00
serg@serg.mylan
8241a5a8e8 cleanup 2006-01-04 10:36:49 +01:00
sergefp@mysql.com
56ba8abd12 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/psergey/mysql-5.1-ppruning-r4
 2006-01-04 11:25:48 +03:00
sergefp@mysql.com
7c3fe127e0 Fix compiler warning 2006-01-04 11:16:34 +03:00
sergefp@mysql.com
0661f845ef WL#2985 "Partition pruning": added "integer range walking", small change forgotten in previous cset 2006-01-04 11:11:27 +03:00
sergefp@mysql.com
93669bfe0b WL#2985 "Partition Pruning": 
- post-...-post review fixes
- Added "integer range walking" that allows to do partition pruning for "a <=? t.field <=? b"
  by finding used partitions for a, a+1, a+2, ..., b-1, b.
 2006-01-04 11:09:01 +03:00
reggie@fedora.(none)
ffd8a0e5f9 cleaned up some of the casts as a result of Mats' review 2006-01-03 22:37:24 -06:00
serg@serg.mylan
30c09d6dc0 merged 2006-01-03 18:12:03 +01:00
serg@serg.mylan
14f94dc0ca many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
reggie@fedora.(none)
8df01571bf Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  fedora.(none):/home/reggie/bk/mysql-5.1-new2
 2006-01-03 07:46:09 -06:00
gluh@eagle.intranet.mysql.r18.ru
8ce6f3e6ca Fix for bug#15533 crash, information_schema, function, view 
enable view prepared mode during getting metedata for I_S table
 2006-01-03 14:25:19 +04:00
serg@serg.mylan
533b18c8f9 cleanup of SHOW STATUS code, as a preparation for WL#2935 
(MySQL plugin interface: status variables)

adding SHOW_FUNC, removing SHOW_some_specific_value,
only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
changing to use SHOW_FUNC instead of ha_update_statistics
 2006-01-02 15:41:13 +01:00
knielsen@mysql.com
a51bce1b17 Compile fixes for hpita2. 2006-01-01 23:13:16 +01:00
knielsen@mysql.com
03e47beb07 Compile fixes for aix52-64bit. 2006-01-01 22:18:02 +01:00
serg@serg.mylan
70d13a7cb7 plugin versioning: we cannot assume that sizeof(st_mysql_plugin) 
is the same in the plugin and in the mysqld.
store the size in the plugin.

To simplify access to plugin's st_mysql_plugin, copy it on open and
convert to the latest version, so that the rest of the code would
not need to care about versions.
 2006-01-01 16:43:34 +01:00
serg@serg.mylan
ff6507c946 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2005-12-31 10:16:19 +01:00
serg@serg.mylan
850391e6c5 libarchive.a and storage/archive/Makefile should be specified in 
MYSQL_STORAGE_ENGINE macro (and nowhere else)
 2005-12-31 10:13:45 +01:00
bar@mysql.com
dc1b2cd312 Making old tables seen with "#mysql50#" prefix, 
which makes it possible to run RENAME TABLE
  on old tables when upgrading from 5.0.
  TODO: A stored procedure to rename all tables and
  databases with old name format into new format,
  it will simplify upgrade.
sql_table.cc:
  Making old tables seen with "#mysql50#" prefix.
  Adding warning into .err log when an old name is found.
sql_show.cc:
  Skip non-directories before filename_to_tablename
  call, to avoid unnecessary warnings.
strfunc.cc:
  Adding "error" argument to strconvert()
mysql_priv.h:
  Adding "error" agrument to strconvert()
 2005-12-31 12:34:39 +04:00
bar@mysql.com
ce1f07078e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
 2005-12-31 09:02:56 +04:00
bar@mysql.com
6ff211329f WL#1324 table name to file name encoding 
- Encoding itself, implemented as a charset
  "filename". Originally planned to use '.'
  as an escape character, but now changed to '@'
  for two reasons: "ls" does not return
  file names starting with '.' considering them
  as a kind of hidden files; some platforms
  do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
  strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
  an extention rather that replace it.
- Replacing all numeric constants in fn_format
  flag arguments to their mysys definitions, e.g.
  MY_UNPACK_FILENAME,
- Predictability in several function/methods:
  when a table name can appear with or withot .frm
  extension. Some functions/methods were changed
  so accept names strictly with .frm, other - strictly
  without .frm extensions. Several DBUG_ASSERTs were
  added to check whether an extension is passed.
Many files:
  table name to file name encoding
mysql_priv.h:
  Prototypes for new table name encoding tools.
ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
row0mysql.c:
  Fixing table name prefix.
mf_format.c:
  Adding MY_APPEND_EXT processing.
Many files:
  Fixing tests.
my_sys.h:
  Adding new flag to append rather than replace an extension.
m_ctype.h:
  Adding "filename" charset definition.
 2005-12-31 09:01:26 +04:00
reggie@fedora.(none)
c77ee8c96a some casts and simple fixes to fix compile errors in Visual 2005 2005-12-30 06:32:33 -06:00
svoj@april.(none)
a1e8e4cee9 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  april.(none):/home/svoj/devel/mysql/mysql-5.1-new
 2005-12-30 15:07:54 +04:00
joerg@mysql.com
e97f38b2d8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-12-29 22:37:58 +01:00
serg@serg.mylan
a2689bae45 after pull fixes 2005-12-29 21:29:02 +01:00
joerg@mysql.com
be217374a0 Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1 2005-12-29 19:11:36 +01:00
ingo@mysql.com
4b3b1fc0b2 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug15591
 2005-12-29 18:17:02 +01:00
svoj@april.(none)
c0c5b1ac84 BUG#16068: Plugin related bugs 
Fixed that --plugin_dir option doesn't work.
Fixed that parser name is not restored correctly from the table.
 2005-12-29 17:28:59 +04:00
ingo@mysql.com
49e294de70 Merge mysql.com:/home/mydev/mysql-5.0-bug15591 
into  mysql.com:/home/mydev/mysql-5.1-bug15591
 2005-12-29 13:37:37 +01:00
ingo@mysql.com
2547cdc7a3 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug15591
 2005-12-29 11:07:27 +01:00
ramil@mysql.com
6ccd21cf97 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b15108
 2005-12-29 12:39:49 +04:00
msvensson@neptunus.(none)
6de9519966 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
 2005-12-29 09:19:25 +01:00
sergefp@mysql.com
f2d603c245 WL#2985 "Partition Pruning": post-review fixes: Better comments 2005-12-29 09:32:46 +03:00
msvensson@devsrv-b.mysql.com
0583507f88 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2 
into  devsrv-b.mysql.com:/space/magnus/my51-bug15775_part2
 2005-12-28 23:28:45 +01:00
ingo@mysql.com
b1214d232e Bug#15591 Occasional test suite abort due to port in use 
If the server is started with --port-open-timeout=# 
retry to bind the TCP port if it fails with EADDRINUSE.
Use the new option in mysql-test-run.sh.
 2005-12-28 20:30:57 +01:00
msvensson@devsrv-b.mysql.com
45864dbf4b Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2 
into  devsrv-b.mysql.com:/space/magnus/my50-bug15775_part2
 2005-12-28 17:37:28 +01:00
andrey@lmy004.
3cd5a23f49 WL #1034 update 
- fix problem with too long identifier name
 2005-12-28 18:29:32 +02:00
msvensson@neptunus.(none)
6717a17fe7 Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2 
into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2
 2005-12-28 14:46:00 +01:00
msvensson@neptunus.(none)
e1ef24e38c Bug #15775 "drop user" command does not refresh acl_check_hosts 
- Update patch for 5.0 
 - Added common function to be called when 'acl_users' has been modified
 2005-12-28 14:43:50 +01:00
svoj@mysql.com
a3f445151f WL#2575 - Fulltext: Parser plugin for FTS 
Manual merge.
 2005-12-28 16:05:30 +04:00
andrey@lmy004.
02983835b4 WL#1034 update 
- fix crash of an event that alters itself
- make "alter event xyz;" invalid because at least 1 clause is needed.
 2005-12-28 13:43:27 +02:00
andrey@lmy004.
b5d583aef2 WL #1034 update 
- enable/disable -> enabled/disabled
- fixed error message
 2005-12-28 13:00:13 +02:00
ramil@mysql.com
c1287769b9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b15108
 2005-12-28 14:16:46 +04:00
andrey@lmy004.
b95f342fad WL #1034 (update) 
- improve the stability of the executor
- make create event if not exists work as before
 2005-12-28 12:07:57 +02:00
msvensson@neptunus.(none)
2fb6cb5a5a BUG#15775 "drop user" command does not refresh acl_check_hosts 
- DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
     connect's via TCP to fail randomly.
   - 4.1 version
 2005-12-28 09:23:27 +01:00
stewart@mysql.com
cac298e07b Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
 2005-12-28 13:55:59 +11:00
acurtis@xiphis.org
986cd20a0f Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/antony/work2/p4-bug15976
 2005-12-27 11:15:56 -08:00
ingo@mysql.com
bd1b724bbf Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2005-12-27 19:25:54 +01:00
stewart@mysql.com
efbdf7b225 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-12-28 00:57:18 +11:00
sergefp@mysql.com
328f8fa735 WL#2985 "Partition pruning", postreview fixes: Small code fixes and better comments 2005-12-27 15:04:35 +03:00
mats@mysql.com
3440170618 Bug#15942 (RBR ignored --binlog_ignore_db and tries to map table on slave for writes): 
Added code to do the filtering (seems to have gone away).
 2005-12-27 12:06:48 +01:00
ingo@mysql.com
44ef4989bb Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-bug5390
 2005-12-27 10:36:19 +01:00
ingo@mysql.com
ef52a59418 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2005-12-27 10:31:00 +01:00
ingo@mysql.com
b3803a490b Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug5390
 2005-12-26 21:35:45 +01:00
sergefp@mysql.com
530cddb6cd WL#2985: fix typo bug when partitioning is not compiled in 2005-12-26 19:46:06 +03:00
ingo@mysql.com
864f575615 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug5390
 2005-12-26 14:22:13 +01:00
ramil@mysql.com
c4911a404a Fix for SQLCOM_BINLOG_BASE64_EVENT related code. 2005-12-26 17:22:12 +04:00
sergefp@mysql.com
e597607cb8 Merge newbox:mysql-5.1-ppruning-r4 
into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
 2005-12-26 14:56:15 +03:00
ramil@mysql.com
f6a61875f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b15108
 2005-12-26 11:18:01 +04:00
sergefp@mysql.com
81452dbcfc WL#2985 "Partition pruning": fixes to post-review fixes: when modifying SEL_TREE::keys, 
adjust SEL_TREE::keys_map appropriately.
 2005-12-26 09:46:25 +03:00
sergefp@mysql.com
15780cb398 Fix typo bug in previous cset 2005-12-26 08:51:29 +03:00
sergefp@mysql.com
2a3943dbec WL#2985 "Partition Pruning": post-review fixes: 
- Added more comments.
- Added a RANGE_OPT_PARAM::remove_jump_scans flag that disables construction of index_merge
  SEL_TREEs that represent unusable conditions like "key1part1<c1 OR key2part2<c2"
- make prune_partitions() function handle the case where range analysis produces a list of 
  index_merge trees (it turned out that this is possible, appropriate test case added).
- Other small fixes.
 2005-12-26 08:40:09 +03:00
acurtis@xiphis.org
9aaa8a81eb Bug#15976: Multiply warnings about unfreed memory 
leaks caused by Archive storage engine not closing files and
  storage engines not receiving panic() during shutdown
 2005-12-25 03:29:49 -08:00
dlenev@mysql.com
15c86158a7 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2005-12-24 20:13:51 +03:00
serg@serg.mylan
d5d6b51422 remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source 2005-12-24 14:32:50 +01:00
mats@mysql.com
56db7a6b6e Bug#15924 (Core dump in sp_trans): 
Added code for pending event flush just before executing the
  function or trigger.
 2005-12-24 12:07:07 +01:00
brian@zim.(none)
56fd453c5d Fix for Antony's push. I've also changed from using the zlib off_t pointer type to my_off_t to fix issues around buggy zlib versions and to make sure file sizes are consistent through out mysql. 2005-12-23 12:22:31 -08:00