ramil@mysql.com
f32c4cbdb5
A fix (bug #10703 : rpl_variables.test failure).
2005-05-18 15:10:43 +05: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
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
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
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
igor@rurik.mysql.com
3351233349
Manual merge
2005-05-10 16:41:47 -07:00
igor@rurik.mysql.com
9d4b228b61
Many files:
...
Fixed bug #8528 .
Representation for single-table views was made similar to
representation for multi-table views.
view.test:
Added test case for bug #8528 .
view.result:
Added test case for bug #8528 . Fixed other test cases.
2005-05-10 16:31:13 -07:00
gbichot@quadita2.mysql.com
3c81444476
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 20:35:12 +02:00
gluh@mysql.com
efaeb069e7
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Devel/mysql-5.0
2005-05-10 18:35:11 +00:00
gbichot@quadita2.mysql.com
0fe9b5474a
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 14:04:02 +02:00
jani@ibmlab.site
e7c02801a0
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ibmlab.site:/home/my/bk/mysql-5.0
2005-05-10 13:34:17 +03:00
gbichot@quadita2.mysql.com
d6e1e5b417
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 11:31:46 +02:00
bar@noter.(none)
8a5c6502ca
bug#10344: some string function fail for UCS2
...
substr fix
2005-05-10 14:13:58 +05:00
jani@ibmlab.site
0b5cedca79
Fixed Bug#10232: update with subquery, precision math,
...
another column gets rotten value.
2005-05-10 09:25:25 +03:00
jimw@mysql.com
cde9f56b45
Merge
2005-05-09 11:28:57 -07:00
gluh@mysql.com
828237909f
after merge fix
2005-05-09 18:18:59 +00:00
gluh@mysql.com
03234c48cf
manual merge
2005-05-09 17:21:44 +00:00
gluh@mysql.com
12085567de
Fix for bug #9404 : information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries
2005-05-09 16:22:49 +00:00
bar@noter.(none)
c783cb3d7e
SUBSTR with negative argument didn't work
...
with multi-byte strings, length() instead
of numchars() where used in a mistake.
2005-05-09 20:55:06 +05:00
antony@ltantony.mysql.com
ddf6225def
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733
2005-05-09 14:50:56 +01:00
antony@ltantony.mysql.com
cc3bfc6ff1
Bug#8733 - server accepts malformed query (multiply mentioned distinct)
...
Detect conflicting options in SELECT
2005-05-09 14:31:46 +01:00
bell@book.sanja.is.com.ua
e4fe89fab2
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-09 15:34:41 +03:00
antony@ltantony.mysql.com
61d7f1db13
Fix outfile test/results
2005-05-09 08:33:45 +01:00
lenz@mysql.com
5cdf15a919
- added "--skip-comments" to the "mysqldump" test to avoid printing comments that include
...
version-dependent information (which causes test failures when running the test with a
different version string)
2005-05-09 09:25:47 +02:00
ramil@ram-book.(none)
2d21a31b60
Brian's mysqldump test modifications made on Ramil's laptop.
2005-05-09 12:21:19 +05:00
ramil@mysql.com
948ae47bc2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/ram/work/5.0
2005-05-09 12:06:42 +05:00
ramil@ram-book.(none)
1092c4d8b4
Fix for bug #9798 : Rollup crash with InnoDB in setup_sum_funcs().
2005-05-09 11:43:52 +05:00
brian@zim.(none)
8636468466
Merge
2005-05-08 16:19:06 -07:00
bell@book.sanja.is.com.ua
4c984c7cc6
merge
2005-05-09 02:06:18 +03:00
bell@book.sanja.is.com.ua
91dccaa36f
Item::fix_field need correct pointer on item reference to chnge it if itis need, so support of correct item address added to SP commands (BUG#5963)
...
some optimisation of IF/NOT IF ptomised to Pem
2005-05-09 01:59:10 +03:00
antony@ltantony.mysql.com
714994e3e6
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0
2005-05-08 23:24:33 +01:00
antony@ltantony.mysql.com
10b460e780
Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug8191
...
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0
2005-05-08 23:07:46 +01:00
antony@ltantony.mysql.com
b6609031fa
Bug#8191 - SELECT INTO OUTFILE insists on FROM clause
...
Fix bug + include test case.
Enable outfile tests.
2005-05-08 22:56:58 +01:00