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
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
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
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
bacc512193
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/my/mysql-5.0
2005-05-16 13:36:17 +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
kent@mysql.com
0d73975517
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 20:53:19 +02:00
kent@mysql.com
6374bfeb61
mysqltest.c:
...
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
In cleanup, remove possible soft link to var directory
2005-05-15 20:38:54 +02:00
kent@mysql.com
7858004c51
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 17:36:36 +02:00
kent@mysql.com
81b36addc9
mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
...
Added option --vardir=<directory> for feature bug#10096
2005-05-15 17:22:54 +02:00
kent@mysql.com
e2d7efb238
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 07:38:42 +02:00
kent@mysql.com
f37bdbe059
mysql-test-run.pl:
...
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
Initial db updates
2005-05-15 07:34:09 +02:00
kent@mysql.com
bd70ce726b
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 07:06:47 +02:00
kent@mysql.com
221b1ccae8
mysqltest.c, mysql-test-run.sh:
...
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
Use Purify suppress file
2005-05-15 06:59:34 +02:00
monty@mishka.local
567712b9e7
Portability fix (for 64 bit intel)
2005-05-15 00:30:23 +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
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
ramil@ram-book.(none)
d85e052d71
a fix (bug #6267 : ENUM ... NOT NULL w/o default treated differently than other data types).
...
the behavior of enum changed to be consistent.
2005-05-13 16:44:14 +05:00
ramil@mysql.com
122c72e248
a fix (bug #10339 : Incorrect error is displayed if try to set value of internal ' warning_count ').
2005-05-13 16:18:27 +05:00
monty@mysql.com
b54d7d04bd
Fixes during review
2005-05-13 14:04:32 +03:00
monty@mishka.local
2d4a417330
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-05-13 13:36:02 +03:00
monty@mishka.local
2d25da2a4b
concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file
...
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
2005-05-13 12:08:08 +03:00
monty@mysql.com
20f969b256
Change create_field->offset to store offset from start of fields, independent of null bits.
...
Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236
2005-05-13 11:11:50 +03:00
bell@book.sanja.is.com.ua
6e71a81915
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-bug-5.0
2005-05-13 09:22:48 +03:00
mleich@mysql.com
1494f0ab68
If the system is under high load 'show full processlist' might report the
...
process of the predecessing test case instead of the current test case.
Shifting the command to the end of the current test case should avoid this problem.
2005-05-12 17:49:34 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
187ee4712b
Fixed bug 10465.
2005-05-12 17:37:38 +03:00
ramil@mysql.com
152f751831
fix (Bug #8295 and #8296 : varchar and varbinary conversion)
...
select, gis & gis-tree tests fails at the moment, but
I will push this CS because it was tested before and I'm absolutely
sure it's right.
2005-05-12 15:56:04 +05:00