serg@serg.mylan
29d6af8d9a
merged
2005-05-28 01:28:18 +02:00
monty@mysql.com
f8cb00640f
Fix broken test case (after merge)
2005-05-26 23:33:20 +03:00
bell@sanja.is.com.ua
b186d8b4f9
merge
2005-05-26 18:33:57 +03:00
bell@sanja.is.com.ua
db2ce1edf6
fixed problem with long string results of expressions in UNIONS (BUG#10025)
2005-05-26 17:30:12 +03:00
joerg@mysql.com
9504bd0ddd
Manual merge.
2005-05-26 12:51:44 +02:00
Sinisa@sinisa.nasamreza.org
edf2a16049
union.result:
...
Results for the above test case
union.test:
A test case for bug #10032 involving UNION's and ORDER BY clause
sql_yacc.yy:
Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY
2005-04-26 21:27:06 +03:00
bar@mysql.com
71f530c4ea
merge
2005-04-11 15:11:52 +05:00
bar@mysql.com
16e186779f
ctype_collate.result, ctype_collate.test, union.result, union.test:
...
fixing tests accordingly
item.cc:
Allow mixing non-binary collation and binary collation
even if coercibility is the same.
For easier 4.0 -> 4.1 migrating.
2005-04-10 12:40:33 +05:00
monty@mysql.com
5ba3f707f7
Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
...
Fix that mysql.proc works with new VARCHAR fields
Give warnings for wrong zero dates
2005-04-04 16:43:25 +03:00
bell@sanja.is.com.ua
05d4ed14e4
merge 4.1->5.0
2005-03-31 10:39:48 +03:00
bell@sanja.is.com.ua
dcdda90a11
Merge
2005-03-30 10:27:36 +03:00
bar@eagle.intranet.mysql.r18.ru
f0d41136df
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-28 14:23:03 +05:00
bar@mysql.com
9852c6a082
union.test:
...
Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
Prove that this problem was fixed with bug9425 fix too.
2005-03-28 14:17:47 +05:00
bell@sanja.is.com.ua
4554b1f263
fixed union types merging and table related metadata (BUG#8824)
2005-03-23 08:36:48 +02:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
4957c4850d
Bug#2435
...
Alter handling for UNION syntax
Tests for UNION and parentheses
2005-02-13 22:35:52 +00:00
jimw@mysql.com
8c8553af81
Merge changes
2005-02-04 11:59:02 -08:00
gluh@gluh.mysql.r18.ru
34915f7a91
A fix: bug#6931: Date Type column problem when using UNION-Table
...
bug#7833: Wrong datatype of aggregate column is returned
2005-02-04 15:31:36 +03:00
Sinisa@sinisa.nasamreza.org
a2e0ecbf03
after merge fixes
2005-01-18 23:34:15 +02:00
Sinisa@sinisa.nasamreza.org
477047401c
fixing wrong value for "examined rows" when UNION's are used.
2005-01-18 23:13:29 +02:00
monty@mysql.com
7cf8285b3f
After merge fixes
...
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
2005-01-04 13:46:53 +02:00
bar@mysql.com
fe3b359b74
Check that the third UNION part with COLLATE
...
clause resolves collation conflict for the
first and the second parts pair.
2004-11-18 16:15:48 +04:00
monty@mysql.com
6fbc869d18
A lot of fixes for prepared statements (PS):
...
New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb
2004-10-26 19:30:01 +03:00
bar@mysql.com
47f638054e
Bug #6139 UNION doesn't understand collate in the column of second select
2004-10-18 17:56:25 +05:00
bell@sanja.is.com.ua
d2474ee2e5
Do not try use fields examples is expression and fiend used or SET/ENUM field used in types merging procedure (BUG#5618)
2004-09-17 13:23:57 +03:00
monty@mysql.com
5d71817c70
After merge fixes
2004-09-05 02:31:11 +03:00
monty@mysql.com
9d8555c0f0
Merge with 4.0 to get latest bug fixes
2004-09-04 15:59:49 +03:00
ram@gw.mysql.r18.ru
f91ca0bd66
A fix (Bug #4980 : union statement with () union () order by produces wrong explain).
2004-09-03 19:59:29 +05:00
bell@sanja.is.com.ua
7483b3cf96
parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204)
2004-06-24 02:57:57 +03:00
bell@sanja.is.com.ua
002364c20f
new length detection for non-string in UNION (BUG#4067)
2004-06-16 16:06:30 +03:00
bell@sanja.is.com.ua
3aae50e8c0
EXPLAIN UNION using same routing which used for execution which allow return correct bug messages (Bug #3639 )
...
EXPLAIN of hidden SELECT of UNION
2004-05-06 20:40:21 +03:00
bell@sanja.is.com.ua
26f0825cae
merge
2004-05-05 22:30:01 +03:00
monty@mysql.com
a5d8b846fa
after merge fixes
2004-05-05 21:24:21 +03:00
bell@sanja.is.com.ua
c5c35c667e
caching of queries with isammerge tables forbiden using general way
...
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
2004-05-05 21:21:41 +03:00
Sinisa@sinisa.nasamreza.org
b58127689e
union.result:
...
fixing typo
union.test:
fixing type
2004-05-04 16:48:34 +03:00
Sinisa@sinisa.nasamreza.org
909d69ff0a
union.result, union.test:
...
a small fix for the test case
2004-05-04 14:11:23 +03:00
Sinisa@sinisa.nasamreza.org
333eadf1b2
Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT
2004-05-03 19:15:26 +03:00
bell@sanja.is.com.ua
1e4af935c1
removed old way to prevent using stack tables for caching Items in PS
...
fixed error code in union test
2004-04-04 03:05:44 +03:00
monty@mysql.com
e0e0314d60
Merge with 4.0
2004-03-25 23:29:45 +02:00
serg@serg.mylan
99886df867
correct support for a mix of UNION/UNION ALL in the same query.
...
Bug#1428
2004-03-23 14:43:24 +01:00
Sinisa@sinisa.nasamreza.org
2eaa07f199
union.result:
...
A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064 )
union.test:
A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064 )
sql_union.cc:
A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064 )
2004-03-22 16:35:15 +02:00
monty@mysql.com
b49b24d94a
Added test to show bug in current union implementation
...
After merge fixes
Portability fixes
2004-03-19 18:33:38 +02:00
bell@sanja.is.com.ua
f4d1ee971b
merge
2004-02-17 01:52:33 +02:00
monty@mysql.com
e9315f984d
Changed wellformedlen to well_formed_len
...
Fixed that blobs >16M can be inserted/updated
Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
2004-02-17 01:35:17 +02:00
bell@sanja.is.com.ua
3f86f10a57
ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure
2004-02-17 01:14:51 +02:00
monty@mysql.com
050af89dd8
Merge with public tree
2004-02-16 10:31:05 +02:00
monty@mysql.com
f43093ec0e
After merge fixes
...
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
2004-02-16 10:03:25 +02:00
serg@serg.mylan
03ffb63f08
no dots in the error messages!
...
--disable-warning in union.test
2004-02-15 19:16:38 +01:00
Sinisa@sinisa.nasamreza.org
d43f102020
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-02-14 20:24:49 +02:00
hf@deer.(none)
6e0cda9f65
error code changed in union.test
2004-02-14 21:27:09 +04:00
