Commit graph

24702 commits

Author SHA1 Message Date
evgen@moonbone.local
ef1d27e02a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-11760
2005-07-20 06:59:31 +04:00
evgen@moonbone.local
6b25219fea Fix bug #11760 Typo in Item_func_add_time::print() results in NULLs returned
by subtime() in view

Item_func_add_time::print() were printing arg[0] instead of arg[1] which
results in wrongly created view. Functions addtime() and subtime were
affected by this bug.
2005-07-20 06:55:51 +04:00
konstantin@mysql.com
5f5e10ed25 Fix a compilation failure. 2005-07-20 01:17:16 +04:00
elliot@mysql.com
d347568a12 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/emurphy/src/mysql-5.0
2005-07-19 22:32:08 +02:00
elliot@mysql.com
7e4179ea02 ha_ndbcluster.cc:
BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
2005-07-19 22:04:43 +02:00
konstantin@mysql.com
15ef68df0f Ignore mysql-test/var (I'm pushing it for the second time already :(() 2005-07-20 00:02:49 +04:00
konstantin@mysql.com
7651ca7595 .del-var~62c955ccf2da1a21:
Delete: mysql-test/var
2005-07-19 21:55:39 +02:00
konstantin@mysql.com
e3af1b6ec6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kostja/mysql/mysql-5.0-10760-new
2005-07-19 22:22:12 +04:00
konstantin@mysql.com
14344b658a A fix and a test case for Bug#10760 and complementary cleanups.
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same 
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
2005-07-19 22:21:12 +04:00
dlenev@mysql.com
a0170139a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-tn
2005-07-19 22:02:53 +04:00
dlenev@mysql.com
8ad9af446b After merge fix. 2005-07-19 21:38:12 +04:00
dlenev@mysql.com
b141437ad3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-tn
2005-07-19 20:55:09 +04:00
jimw@mysql.com
f40ac0bb99 Merge mysql.com:/home/jimw/my/mysql-5.0-readline
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 09:15:22 -07:00
dlenev@mysql.com
8a3e723b74 Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch)
"Triggers have the wrong namespace"
  "Triggers: duplicate names allowed"
  "Triggers: CREATE TRIGGER does not accept fully qualified names"
  "SHOW TRIGGERS"
2005-07-19 20:06:49 +04:00
ingo@mysql.com
ec15dda2bf Bug#10932 - Building server with key limit of 128, makes test cases fail
This patch allows to configure MyISAM for 128 indexes per table.
The main problem is the key_map, wich is implemented as an ulonglong.
To get rid of the limit and keep the efficient and flexible
implementation, the highest bit is now used for all upper keys.
This means that the lower keys can be disabled and enabled 
individually as usual and the high keys can only be disabled and
enabled as a block. That way the existing test suite is still
applicable, while more keys work, though slightly less efficient.
To really get more than 64 keys, some defines need to be changed.
Another patch will address this.
2005-07-19 14:13:56 +02:00
gluh@eagle.intranet.mysql.r18.ru
d1bc1b7c0e Fix for bug#11057 information_schema: columns table has some questionable contents
fixed BLOB, TEXT(wrong maximum length), BIT and integer types(wrong numeric_precision value)
2005-07-19 14:30:32 +05:00
gluh@mysql.com
2b1aa257d3 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-07-19 13:50:55 +05:00
gluh@eagle.intranet.mysql.r18.ru
d59ff2764c Bug#11577 'show procedure/function status' doesn't work for user with limited access
changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines
2005-07-19 13:49:43 +05:00
konstantin@mysql.com
2da0bc8bde Remove the ignored files. 2005-07-19 11:59:06 +04:00
konstantin@mysql.com
d2814fb1b5 Added mkinstalldirs (an auxiliary autotools symlink) to the ignore
list.
2005-07-19 11:35:16 +04:00
elliot@mysql.com
98dc8e3242 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
into  mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
2005-07-18 22:27:20 -04:00
patg@radha.local
164255fc81 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  radha.local:/Users/patg/mysql-build/mysql-5.0
2005-07-19 03:18:54 +02:00
jimw@mysql.com
48536b7668 Merge mysqldev@production.mysql.com:jimw/mysql-5.0-readline
into  mysql.com:/home/jimw/my/mysql-5.0-readline
2005-07-18 18:04:52 -07:00
patg@radha.local
e2d8644053 Eric's implentation of OPTIMIZE TABLE and REPAIR TABLE,
as well as changes to the test.
2005-07-19 03:04:51 +02:00
jimw@mysql.com
7d7a4626fc Reimplement use of "config_readline.h" to get readline configuration. 2005-07-18 18:00:19 -07:00
jimw@mysql.com
7cf58d1f86 Upgrade bundled readline to version 5.0. 2005-07-18 17:22:38 -07:00
konstantin@mysql.com
52ba7b69d7 After-merge fixes. 2005-07-19 03:01:25 +04:00
elliot@mysql.com
44f959ae81 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
into  mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
2005-07-18 17:55:26 -04:00
elliot@mysql.com
22be12ab86 BUG#11567 Fixed binlog tests on windows. 2005-07-18 17:47:26 -04:00
konstantin@mysql.com
52b8928b09 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into  mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
shuichi@mysql.com
8e60817dda Fixed the ucs2 -> eucjpms conversion bug (bug#11717) 2005-07-18 13:38:56 -07:00
konstantin@mysql.com
086c3206f0 Fix BUILD/autorun.sh to really bail out on error. 2005-07-18 21:33:05 +04:00
monty@mishka.local
21ae963205 Fixes to previous changeset
get_defaults_file() -> get_defaults_options()
2005-07-18 20:05:30 +03:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
evgen@moonbone.local
2275976fd5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-11482
2005-07-18 20:03:00 +04:00
evgen@moonbone.local
e75e566469 Merge moonbone.local:/work/mysql-4.1-bug-11868
into moonbone.local:/work/mysql-5.0-bug-11482
2005-07-18 19:37:42 +04:00
georg@lmy002.wdf.sap.corp
dfe50c5a97 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-07-18 17:34:30 +02:00
evgen@moonbone.local
0fda7038f9 select.test:
Changed test case comment to be more meaningful
2005-07-18 19:34:29 +04:00
evgen@moonbone.local
a6c63a18c3 Manual merge 2005-07-18 18:38:14 +04:00
evgen@moonbone.local
6e9447a80e Fix bug#11482 4.1.12 produces different resultset for a complex query
than in previous 4.1.x

Wrongly applied optimization were adding NOT NULL constraint which results in
rejecting valid rows and reduced result set.

The problem was that add_notnull_conds() while checking subquery were adding
NOT NULL constraint to left joined table, to which, normally, optimization 
don't have to be applied.
2005-07-18 18:30:19 +04:00
konstantin@mysql.com
8b3d39163a Alleviate the autoconf requirement. 2005-07-18 18:03:58 +04:00
gbichot@production.mysql.com
4853da1ae7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into production.mysql.com:/nfstmp1/guilhem/mysql-4.1-prod
2005-07-18 14:51:13 +02:00
gbichot@production.mysql.com
7cd2fb13ff Fix for BUG#12003 "assertion failure in testsuite (double lock of
LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0
for the size of all binlogs but the current one".
There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes 
are very small. Feel free to ask me if you have problems merging them.
2005-07-18 14:46:53 +02:00
monty@mishka.local
78c65b5adc Cleanups during review
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
joerg@mysql.com
b323a77375 QNX does not know "uint", so the cast is rewritten as "unsigned int". 2005-07-18 13:52:18 +02:00
lenz@mysql.com
00c3b9438d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-18 11:31:11 +02:00
lenz@mysql.com
e1d75fb4c3 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-07-18 11:25:09 +02:00
patg@krsna.patg.net
1394b43949 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-5.0
2005-07-17 10:20:11 -07:00
igor@rurik.mysql.com
54dd7e5ebf select.result, select.test:
Added a test case for bug #11745.
sql_select.cc:
  Fixed bug # 11745.
  Added support of where clause for queries with FROM DUAL.
sql_yacc.yy:
  Fixed bug # 11745.
  Added optional where clause for queries with FROM DUAL.
2005-07-17 09:46:14 -07:00
patg@radha.local
dd129ed329 Federated Storage Engine, bug 9925 "Federated query processor (step 2 or step 3) not using logic in
WHERE statement"
2005-07-17 04:10:19 +02:00