tulin@dl145b.mysql.com
36fe10e531
moved all partition create table error tests to one test for easier maintenance
2005-07-20 14:46:02 +02:00
tulin@dl145b.mysql.com
bf6e3f9aa8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 07:53:10 +02:00
jimw@mysql.com
d4e0d60156
Clean up after merge of bug fixes
2005-07-19 19:59:36 -07:00
jimw@mysql.com
82a7a31cde
Merge mysql.com:/home/jimw/my/mysql-5.0-11954
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:35 -07:00
jimw@mysql.com
d7fbff3ec5
Merge mysql.com:/home/jimw/my/mysql-5.0-5906
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:34 -07:00
jimw@mysql.com
39efcdcf7c
Merge mysql.com:/home/jimw/my/mysql-5.0-11822
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:33 -07:00
jimw@mysql.com
2a06e5756e
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:32 -07:00
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
jimw@mysql.com
63c6ece728
Cleanups after merge from 4.1.
2005-07-19 16:32:38 -07:00
tulin@dl145b.mysql.com
7a37e58135
merge
2005-07-20 00:40:49 +02: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
tulin@dl145b.mysql.com
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
konstantin@mysql.com
7651ca7595
.del-var~62c955ccf2da1a21:
...
Delete: mysql-test/var
2005-07-19 21:55:39 +02:00
tulin@dl145b.mysql.com
519c5564b1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-19 20:40:19 +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
jimw@mysql.com
80c1c6b33f
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 11:05:49 -07: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
jimw@mysql.com
bb6918e312
Merge mysql.com:/home/jimw/my/mysql-4.1-7249
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-19 10:35:15 -07: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
monty@mishka.local
292aefeeca
Fixed some test cases that was not forgotten in a recent patch
2005-07-19 19:47:54 +03:00
monty@mishka.local
29d9aa65f3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-07-19 19:28:26 +03:00
monty@mishka.local
7e83d09ce7
Simple fixes during review of new code
2005-07-19 19:25:05 +03: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
tulin@dl145b.mysql.com
c9abae2ce2
printout of cluster config to use same tokens as documentation
2005-07-19 16:34:56 +02:00
tulin@dl145b.mysql.com
2f01676b37
ConfigInfo.cpp:
...
BUG#12028, cannot use default section for hostname in cluster config
made clearer error message
2005-07-19 15:25:55 +02:00
tulin@dl145b.mysql.com
74438e6683
BUG#12028, cannot use default value for HostName in cluster config
...
+ added switch --print-full-config
+ removed unused REP configuration
2005-07-19 14:33:38 +02: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
tulin@dl145b.mysql.com
1c2cfd80a2
perror.c:
...
BUG#11999, incorrect --help on perror with ndb
2005-07-19 11:52:24 +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
jimw@mysql.com
c5b433c3b3
Fix default for sql_mode so that proc table is actually created
...
by mysql-test-run.pl. (Bug #11954 )
2005-07-18 18:36:48 -07: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
jimw@mysql.com
aff38d8659
Handle systems where 127.0.0.1 doesn't always map to 'localhost'
...
first. (Bug #11822 )
2005-07-18 17:00:37 -07:00
tomas@poseidon.ndb.mysql.com
0b982e70a1
fixed makefiles in examples to adopt to change in file structure
2005-07-19 01:22:49 +02:00
jimw@mysql.com
dd2f631ec4
Fix number to date conversion so it always honors the NO_ZERO_DATE,
...
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906 )
2005-07-18 16:12:44 -07:00