1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-13 01:01:44 +03:00

14129 Commits

Author SHA1 Message Date
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
5a63dacdfa Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-19 07:41:58 -05:00
cps@outpost.site
ce2eb6d8cb WL1019: complete patch. Reapplied patch to the clean
tree to get rid of multiple typos in CS comments and
unify the patch.
2006-01-19 05:56:06 +03:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
f7196b8de9 BUG #16596
Moved init to lex_start
2006-01-18 16:18:42 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
5f147aa4e6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-18 16:11:35 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
07e5c13e89 Bug fix 2006-01-18 16:09:25 -05:00
holyfoot@mysql.com
6e42f6ee75 Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.15910
2006-01-18 21:53:03 +04:00
holyfoot@deer.(none)
9e338cf4c8 bug #15910 (Wrong value on error message) 2006-01-18 19:27:10 +04:00
mskold@mysql.com
1fb4202c6b Disabled fast/drop index temporarily 2006-01-18 12:44:08 +01:00
mskold@mysql.com
08d8691b40 disabled.def:
Disabled failing tests
mysql_priv.h:
  Removed compiler warning
2006-01-18 10:56:07 +01:00
mskold@mysql.com
b516d5bdea 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-18 10:29:27 +01:00
bar@mysql.com
0e665a7aa5 sql_show.cc:
Don't display charsets/collations with HIDDEN flag.
ctype-utf8.c:
  Adding HIDDEN flag to "filename"
  Changeing ID to 17 which was previosly
  used by deprecated "win1251", removed in 4.1.
charset-def.c:
  Adding "filename" as a hidden charset, for test purposes.
m_ctype.h:
  Adding MY_CS_HIDDEN flag,
  to hide charsets and collations from
  being displayed in SHOW.
2006-01-18 12:27:02 +04:00
mskold@mysql.com
b35d591095 Post review fixes of WL#1892 2006-01-17 18:35:17 +01:00
mskold@mysql.com
aae4a997d4 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-17 18:35:15 +01:00
joerg@mysql.com
be46467b1f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2006-01-17 18:35:12 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
fb79504889 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2747-push
2006-01-17 12:35:09 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a9ab4f9cb8 Fix for auto-partitioned tables and PARTITION BY KEY() tables 2006-01-17 11:19:48 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
b809a9d027 Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push
2006-01-17 09:36:55 -05:00
mskold@mysql.com
c18c667154 Resetting of alter table marker in NDB_SHARE (WL#1892) 2006-01-17 13:59:36 +01:00
joerg@mysql.com
728c67466d Manual merge of 5.1.5 build changes into the general tree. 2006-01-17 13:32:28 +01:00
mskold@mysql.com
1476b484c2 Additional fixes for WL#1892 2006-01-17 12:53:49 +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
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
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
evgen@moonbone.local
7f0aa55e36 Manually merged 2006-01-16 16:57:15 +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
knielsen@mysql.com
ae9c76b9cb Solaris compile fixes. 2006-01-14 11:06:44 +01: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