Commit graph

27534 commits

Author SHA1 Message Date
ramil@mysql.com
70ba090d27 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b10303
2005-10-25 12:19:13 +05:00
brian@zim.(none)
ab0b049f85 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-10-24 23:57:15 -07:00
brian@zim.(none)
068f082960 Additional test request by Jonas. We check pushdown conditions for GEOM types. 2005-10-24 23:55:44 -07:00
brian@zim.(none)
82bcb8b369 This patch add support for storing Geometry types to Archive, Innodb, NDB, and BDB. 2005-10-24 23:20:39 -07:00
timour@mysql.com
d24027fa79 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-13832
2005-10-25 09:01:47 +03:00
timour@mysql.com
f5354eba90 Fix for BUG#13832 - Unknown column t1.a in 'on clause'.
The cause for the bug is that the priorities of all rules/terminals
that process the FROM clause are not fully specified, and the
parser generator produces a parser that doesn't always parse
the FROM clause so that JOINs are left-associative. As a result
the final join tree produced by the parser is incorrect, which
is the cause for subsequent name resolution to fail.
2005-10-25 09:00:57 +03:00
kent@mysql.com
3e62fcf2a6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-25 03:00:09 +02:00
kent@mysql.com
6a5a451cfb Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-25 02:36:51 +02:00
kent@mysql.com
4e44fead18 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
into mysql.com:/Users/kent/mysql/bk/mysql-4.0
2005-10-25 02:29:08 +02:00
kent@mysql.com
257b17ba2f Makefile.am:
Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num
2005-10-25 02:27:55 +02:00
monty@mysql.com
3e653fb922 Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization 2005-10-25 02:27:40 +03:00
lars@mysql.com
192bceafd9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
2005-10-25 00:37:08 +02:00
lars@mysql.com
a9d03b67c4 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
2005-10-25 00:23:14 +02:00
lars@mysql.com
7694eecc7d Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-10-25 00:16:51 +02:00
lars@mysql.com
8124629c51 Fixed enum numbering, patch 2 2005-10-24 23:09:14 +02:00
anozdrin@mysql.com
bfc8e85b06 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
2005-10-25 00:57:23 +04:00
anozdrin@mysql.com
6d2934cb69 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
2005-10-25 00:55:31 +04:00
anozdrin@mysql.com
6105040ac4 Fix for BUG#13095: Cannot create VIEWs in prepared statements
- allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
  - fix CREATE VIEW implementation to make it work in prepared statements.
2005-10-25 00:54:04 +04:00
patg@krsna.patg.net
4fdeb1f93b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-24 13:52:26 -07:00
patg@krsna.patg.net
89b2b92b4e Disabled federated test, added then removed
federated.disabled and instead using disabled.def (per
comments in this commit)

disabled.def:
  disabled federated until bug 14272 is fixed.
.del-federated.disabled~9e4cca59f547174d:
  Delete: mysql-test/t/federated.disabled
federated.disabled:
  New BitKeeper file ``t/federated.disabled'' to disable federated test until
  Bug 14272 is fixed.
  new file
2005-10-24 13:51:05 -07:00
sergefp@mysql.com
9a101971cf BUG#11704: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in
OPTIMIZE TABLE.
2005-10-25 00:27:15 +04:00
lars@mysql.com
827d745c89 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-10-24 20:03:40 +02:00
lars@mysql.com
4ce4068442 Reducing risk for incorrect merges. Since we are multiple teams working on
different features, adding numbering to enums reduce the risk that code will
be merged incorrectly.  This particular enum must have fixed values to ensure
that an upgraded server always can read old logs.  I added this, since I 
noticed the incorrect order in the RBR clone.
2005-10-24 19:06:32 +02:00
SergeyV@selena.
ba919bd168 Fixes bug #14137. Converts charsets_dir path to underlying
system representation.
2005-10-24 20:08:56 +04:00
lars@mysql.com
fbcf26777e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-24 17:23:45 +02:00
msvensson@neptunus.mysql.com
bb15425235 Fix for dropping a table with frm file consisting of "junk" 2005-10-24 15:05:06 +02:00
ramil@mysql.com
02c0fe62d8 a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH). 2005-10-24 16:45:27 +05:00
ramil@mysql.com
de26178f75 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b10303
2005-10-24 11:36:29 +05:00
sasha@asksasha.com
f6f22df951 fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is used 2005-10-22 18:17:11 -06:00
sergefp@mysql.com
ea3ea9ed10 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2
2005-10-23 02:49:57 +04:00
sergefp@mysql.com
e3f623d6e8 BUG#9622: post-review-fixes: better comments 2005-10-23 02:46:10 +04:00
jimw@mysql.com
7510c45423 Fix merge of test that left out a drop table. 2005-10-21 19:54:34 -07:00
jimw@mysql.com
2d018862fa Merge mysql.com:/home/jimw/my/mysql-4.1-11203
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-21 17:57:51 -07:00
paul@frost.snake.net
a381f9d291 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-21 09:40:11 -05:00
serg@serg.mylan
721873f7cd compilation failure fixed 2005-10-21 14:56:59 +02:00
pem@mysql.com
0647d280b3 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 14:51:51 +02:00
bar@mysql.com
b8e755ae0c ctype_utf8.result:
After merge fix.
2005-10-21 16:58:10 +05:00
bar@mysql.com
321d833eef Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 16:53:50 +05:00
paul@frost.snake.net
e1f77e5cc8 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-21 06:40:52 -05:00
pem@mysql.com
1d5aeb51da Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 13:24:41 +02:00
bar@mysql.com
fc771accbf Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 16:24:40 +05:00
pem@mysql.com
c865f491ef Post-review fix. 2005-10-21 13:08:00 +02:00
gluh@mysql.com
f921ca2830 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089
2005-10-21 14:42:00 +05:00
bar@mysql.com
a167ddc6e7 Bug#13233
select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
  Adding test case
sql_yacc.yy:
  Adding new syntax.
item_strfunc.h:
  Fixing wrong max_length calculation.
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0,
  according to Monty's suggestion.
2005-10-21 14:41:56 +05:00
gluh@eagle.intranet.mysql.r18.ru
e8d52711ad fix for bug#14089 FROM list subquery always fails when
information_schema is current database
  skip the check of I_S tables if table is derived table
2005-10-21 13:14:54 +05:00
bar@mysql.com
612c0560a4 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 11:55:46 +05:00
jonas@perch.ndb.mysql.com
c8ca75264c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-21 06:43:33 +02:00
jonas@perch.ndb.mysql.com
6f3caecffd bug#14199 - ndb leak of index opertaions in TC leading to error 288 2005-10-21 06:41:49 +02:00
sergefp@mysql.com
15a78334c3 BUG#9622, stage 2, work together with fix for BUG#12232:
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).
2005-10-21 06:29:17 +04:00
andrey@lmy004.
38b2e56d9f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy004.:/work/mysql-5.0-bug12595-4
2005-10-21 04:07:17 +03:00