msvensson@neptunus.(none)
920c16c055
BUG#9626 valgrind warnings
...
- after review fixes
2005-05-19 20:38:48 +02:00
ramil@mysql.com
c7fd7a3c6a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b6961
2005-05-19 14:03:41 +05:00
ramil@mysql.com
4630afa4b7
a fix (bug #10599 : Numeric function 'abs' make server crash).
2005-05-19 13:35:13 +05:00
ramil@mysql.com
c09975eb96
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b6961
2005-05-19 12:06:40 +05:00
monty@mysql.com
1edd387dab
portablity fix
2005-05-19 05:54:31 +03:00
jimw@mysql.com
d5ee234917
Fixes to merge from 4.1
2005-05-18 15:40:34 -07:00
jimw@mysql.com
b7079ed027
Resolve merge from 4.1
2005-05-18 13:54:36 -07:00
bell@book.sanja.is.com.ua
816e84c1f6
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-18 22:58:48 +03:00
jimw@mysql.com
3f6aad900c
Resolve merge from 4.1
2005-05-18 11:06:34 -07:00
ingo@mysql.com
21bf35fce0
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-05-18 19:45:59 +02:00
ingo@mysql.com
26f2e57ecb
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
...
After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
2005-05-18 19:40:39 +02:00
jimw@mysql.com
9ef20027a6
Update mysqldump test and results
2005-05-18 09:40:12 -07:00
jimw@mysql.com
79ce5dcd90
Resolve bugfix merge
2005-05-18 09:25:06 -07:00
bell@book.sanja.is.com.ua
b22e2aca56
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-18 16:58:37 +03:00
bell@book.sanja.is.com.ua
203881d9a9
reduced 1 server reloding during test
2005-05-18 16:41:32 +03:00
ramil@mysql.com
8add105ff5
Merge mysql.com:/usr/home/ram/work/mysql-5.0-build
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-05-18 18:15:14 +05:00
igor@rurik.mysql.com
80aa0062db
olap.result, olap.test:
...
Added test cases for bug #7914 .
sql_select.cc:
Fixed bug #7914 : rollup over expresssions such as sum(a)+1.
2005-05-18 05:15:48 -07:00
ramil@mysql.com
7b3a9212df
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10339
2005-05-18 16:06:01 +05:00
gbichot@quadita2.mysql.com
56dbfc99ba
mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that,
...
to easily check the storage engine supports DELAYED).
2005-05-18 13:02:09 +02:00
ramil@mysql.com
f32c4cbdb5
A fix (bug #10703 : rpl_variables.test failure).
2005-05-18 15:10:43 +05:00
ramil@mysql.com
e08c287c93
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10339
2005-05-18 14:50:57 +05:00
gluh@mysql.com
4047905d8e
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286
2005-05-18 14:48:04 +05:00
ramil@mysql.com
66b6bbfaea
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10339
2005-05-18 14:46:05 +05:00
ramil@ram-book.(none)
6737c2f67c
test result change: now "enum... not null" doesn't print default value.
2005-05-18 14:02:03 +05:00
gluh@mysql.com
053f753a0d
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286
2005-05-18 12:52:02 +05:00
gluh@eagle.intranet.mysql.r18.ru
b44a474449
Fix for bug #9286 : SESSION/GLOBAL should be disallowed for user variables(for 5.0)
2005-05-18 12:47:45 +05:00
ramil@mysql.com
86538b338b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/ram/work/5.0.b6267
2005-05-18 12:41:36 +05:00
jimw@mysql.com
b2b9485a94
Merge mysql.com:/home/jimw/my/mysql-5.0-10251
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-17 16:59:39 -07:00
msvensson@neptunus.(none)
02bd2cf049
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-17 22:58:13 +02:00
acurtis@xiphis.org
11a174302b
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p1-bug10246.1
2005-05-17 19:57:27 +01:00
acurtis@xiphis.org
8df5887ad5
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
...
Rename some functions
more fine-grained sp privileges
make grant/revoke sp grammar less ambigious
2005-05-17 19:54:20 +01:00
msvensson@neptunus.(none)
02a3295a60
Merge neptunus.(none):/home/msvensson/mysql/bug9535
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-17 20:32:00 +02:00
msvensson@neptunus.(none)
e6ba48b942
BUG#9535 Warning for "create table t as select uuid();"
...
- Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5() etc will use 'ascii'
2005-05-17 20:31:26 +02:00
bell@book.sanja.is.com.ua
295722520f
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-17 19:10:53 +03:00
serg@serg.mylan
56fa40e558
sql_yacc.yy:
...
missing semicolon added
sql_base.cc:
bad merge fixed
sp_head.cc, view.test, view.result:
Correct restoring view name in SP table locking BUG#9758
configure.in:
restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure
2005-05-17 17:08:43 +02:00
jimw@mysql.com
be4920cd81
Merge mysql.com:/home/jimw/my/mysql-5.0-7800
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-16 14:33:46 -07:00
sergefp@mysql.com
cc13545413
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10095
2005-05-16 22:21:19 +02:00
monty@mysql.com
5641664de7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-16 15:26:40 +03:00
monty@mysql.com
d06bb6fa39
After merge fixes
2005-05-16 15:21:35 +03:00
monty@mysql.com
7d70579917
Fixed failing tests for not 32 bit intel machines
...
Fixed bug in mysql_stmt_fetch() when retrieving rows to return
2005-05-16 13:34:23 +03:00
bell@book.sanja.is.com.ua
1ff9f55920
relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020)
2005-05-16 12:19:10 +03:00
monty@mysql.com
9db45adb60
Merge with 4.1
2005-05-14 18:31:22 +03:00
monty@mysql.com
beb5867dfb
After merge fixes
2005-05-14 16:24:36 +03:00
konstantin@mysql.com
6b90352eac
More post-merge fixes.
2005-05-14 14:42:25 +04:00
konstantin@mysql.com
aa57e40df6
A post-merge fix.
2005-05-14 13:26:01 +04:00
konstantin@mysql.com
89bd09fed2
Manual merge (again)
2005-05-14 12:38:12 +04:00
sergefp@mysql.com
480957e7e6
Fix for BUG#9622: Make index statistics collection in MyISAM behave the same
...
way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal.
2005-05-14 00:21:53 +02:00
monty@mysql.com
b4e92e6360
Merge with 4.0
2005-05-14 00:01:40 +03:00
monty@mysql.com
9b39f8304e
Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045 )
2005-05-13 23:08:29 +03:00
monty@mishka.local
3ff39b3704
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-05-13 22:20:07 +03:00