mskold@mysql.com
d125c6f06c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-04 09:57:38 +01:00
monty@mysql.com
309b1a2b6c
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
2005-01-03 23:04:52 +02:00
monty@mysql.com
2299e1eca4
Better handling of ensuring that setup_tables() are not called twice
...
This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
2005-01-03 21:04:33 +02:00
mskold@mysql.com
881b3a023f
Merge
2005-01-03 15:20:06 +01:00
monty@mysql.com
1bd22faa05
Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
...
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
2004-12-31 12:04:35 +02:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
gluh@gluh.mysql.r18.ru
50266af38c
wl#1629 SHOW with WHERE(final part, after review)
...
added syntax:
'show variables where', 'show status where', 'show open tables where'
2004-12-30 15:20:40 +03:00
mskold@mysql.com
86fda80fc9
Merge
2004-12-28 14:00:00 +01:00
monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
mskold@mysql.com
2d57281334
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2004-12-21 21:42:59 +01:00
sergefp@mysql.com
e89f5a7136
Fix for BUG#4480: In joins with SELECT_STRAIGHT_JOIN re-order tables by outer join dependency,
...
so we read dependent tables after tables they depend on (this is needed for outer joins)
2004-12-21 01:59:58 +03:00
mskold@mysql.com
4d384b61e4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2004-12-20 14:13:41 +01:00
monty@mysql.com
6477b4dfd2
Merge with global tree
...
Fixed some found bugs in BIT fields
Added more test cases for BIT fields and varchar
2004-12-19 20:25:19 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1be319a708
Merge Bug#7391 from 4.0
2004-12-18 15:12:10 +00:00
monty@mysql.com
eb83e8a046
Simplify code during review
2004-12-18 13:45:19 +02:00
monty@mysql.com
f37fd31ddc
Merge with global tree
2004-12-18 06:05:16 +02:00
monty@mysql.com
3fb088a075
Add 0x before pointers (to help with debugging)
...
Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
2004-12-18 05:19:21 +02:00
mskold@mysql.com
2836376a18
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2004-12-17 21:16:29 +01:00
mskold@mysql.com
3edf243875
Condition pushdown to storage engine
2004-12-17 21:13:22 +01:00
ram@gw.mysql.r18.ru
0be6a5b995
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new
2004-12-17 18:07:05 +04:00
ram@gw.mysql.r18.ru
92f89369ae
bit type
2004-12-17 18:06:05 +04:00
timour@mysql.com
68c2309a66
Fix for BUG#7266.
2004-12-16 16:44:40 +02:00
ingo@mysql.com
05d5360e7f
Enlarged group item key_length by a varstring length field.
...
Group item fields are implemented as varstrings nowadays.
Made init_connect.test robust against existing t1.
2004-12-16 11:41:52 +01:00
sergefp@mysql.com
3c8f48d2e3
* Added comments and one assert
...
* Backport of safety measures from 5.0: make numeorous replaces:
s/item->fix_fields()/if (!item->fixed) item->fix_fields()
2004-12-14 03:36:19 +03:00
bell@sanja.is.com.ua
157af12f36
fixed parameter to avoid accessing unallocated memory
2004-12-13 14:54:13 +02:00
sergefp@mysql.com
aee9340493
Fix for BUG#5837 merged from 4.0
2004-12-11 15:55:50 +03:00
sergefp@mysql.com
6b55909673
Fix for BUG#5837 - attempt 3.
...
Call mark_as_null_row in join_read_const and join_read_system.
2004-12-11 15:51:52 +03:00
monty@mysql.com
563500994a
Update results for new varchar handling
...
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
2004-12-07 15:47:00 +02:00
monty@mysql.com
77207d19f2
Merge with new VARCHAR code
2004-12-06 19:18:35 +02:00
monty@mysql.com
75d0958dc3
After merge fixes
...
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
2004-12-06 17:15:54 +02:00
monty@mysql.com
0de4777187
Merge with 4.1
2004-12-06 11:38:56 +02:00
monty@mysql.com
67ce247965
Add support for up to VARCHAR (size up to 65535)
...
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
bell@sanja.is.com.ua
4c017d18e2
Merge
2004-12-01 10:25:11 +02:00
bell@sanja.is.com.ua
f20e7a82b7
now we create temporary join for all queries with subqueries to make correct cleunup of tables and avoid too early unlock (BUG#6841)
2004-11-30 21:41:12 +02:00
serg@serg.mylan
ceb0d1cf87
compatibility fixes
2004-11-29 22:47:50 +01:00
serg@serg.mylan
f09429a4df
protection: TRASH in delete
...
fixed a bug that it discovered
2004-11-28 15:53:17 +01:00
serg@serg.mylan
7dabb64176
merged
2004-11-25 17:36:43 +01:00
serg@serg.mylan
831c02463c
order by group_func
2004-11-25 17:02:44 +01:00
bell@sanja.is.com.ua
69ec6a4592
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0
2004-11-25 02:27:02 +02:00
bell@sanja.is.com.ua
1e3d8b0839
post-merge fix
2004-11-25 02:23:13 +02:00
guilhem@mysql.com
d913f4e4ab
sql_select.cc:
...
my_message_sql does not tolerate a NullS argument (segfault)
2004-11-25 01:06:37 +01:00
gluh@gluh.mysql.r18.ru
22e76af9df
More test cases are added
...
Fixed bug 'using of alias with information schema tables in views'
removed compiler warnings
2004-11-23 17:41:39 +03:00
serg@serg.mylan
ee933cd198
merged
2004-11-22 21:33:15 +01:00
serg@serg.mylan
55575bea2e
typo fixed
2004-11-22 20:50:04 +01:00
serg@serg.mylan
41c33c29a3
Bug #6748 heap_rfirst() doesn't work (and never did!)
...
range for BETWEEN typo fixed
2004-11-22 14:53:18 +01:00
bell@sanja.is.com.ua
072d38eb12
merge
2004-11-21 20:08:12 +02:00
gluh@gluh.mysql.r18.ru
a68a9fe268
remove unused parts of code
...
fix for 'show create schema_table'
fix for usage schema tables in subselect
'wrong schema table charset' fix
2004-11-18 12:16:06 +03:00
bell@sanja.is.com.ua
bc5a9111d7
backport Serg's fix of FT interface (BUG#6523)
2004-11-16 22:58:02 +02:00
bell@sanja.is.com.ua
27395a2fb1
fixed joincleunup to avoid double deletin tables, and too earlyfull cleanup in case of EXPLAIN
...
fixed cleunup of TMP_TABLE_PARAM
(BUG#6406)
2004-11-16 00:16:04 +02:00
serg@serg.mylan
87840e841c
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 19:27:06 +01:00