pekka@mysql.com
f3103c489c
ndb - wl-1442 new varchar
2005-01-07 11:55:20 +01:00
joreland@mysql.com
f3baf38dbc
merge
2005-01-07 06:47:41 +01:00
monty@mysql.com
ef74d8d898
Fixed a bug in prepared statements error handling
...
After merge fixes
2005-01-06 16:59:29 +02:00
monty@mysql.com
bda0a78184
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-06 13:31:31 +02:00
monty@mysql.com
d35140a851
First stage of table definition cache
...
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
2005-01-06 13:00:13 +02:00
joreland@mysql.com
738cb6ab81
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-05 21:22:39 +01:00
jimw@mysql.com
fb0d89a85b
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-05 17:57:55 +01:00
bell@sanja.is.com.ua
dffac28b76
fixed views with PS protocol
2005-01-05 16:48:23 +02:00
joreland@mysql.com
c62ed85054
Merge
2005-01-04 19:12:01 +01:00
jimw@mysql.com
652fc10467
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-04 19:00:22 +01: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
monty@mysql.com
3c6d5e43f9
Merge
2005-01-04 13:23:04 +02:00
jimw@mysql.com
050e229162
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-04 02:47:48 +01:00
serg@sergbook.mysql.com
4da9825acd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-04 01:59:24 +02:00
joreland@mysql.com
8808669218
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-03 23:36:19 +01:00
serg@sergbook.mysql.com
b23a226151
mysql-test/r/multi_update.result, mysql-test/t/multi_update.test
...
don't fail w/o bdb (or innodb)
sql/sql_base.cc
typo fixed.
"mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
2005-01-04 00:22:22 +02: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
joreland@mysql.com
3ffeca9a5c
merge 5.0->5.0-ndb
2005-01-03 21:42:43 +01:00
monty@mysql.com
d35d4eab91
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-03 21:14:20 +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
jimw@mysql.com
0e8d3f1ccd
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-03 19:56:20 +01:00
jimw@mysql.com
98d7964d2a
Fix 'SHOW CREATE FUNCTION' to say 'FUNCTION' in its error message. (Bug #6338 )
2005-01-03 19:53:54 +01:00
mskold@mysql.com
9647a076a6
Merge
2005-01-03 14:33:00 +01:00
mskold@mysql.com
ce103eeff7
Merge
2005-01-03 13:52:17 +01:00
monty@mysql.com
ce456b6a20
Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases
...
(Old code failed for INSERT ... ON DUPLICATE with prepared statements)
Instead, always reset table->insert_values on open.
2005-01-03 13:56:23 +02:00
tomas@poseidon.ndb.mysql.com
864b3b2080
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-03 11:11:32 +01:00
monty@mysql.com
1e88bdbf90
Streamlined code for trim, ltrim and rtrim
...
Portability fixes
2005-01-02 23:31:37 +02:00
sergefp@mysql.com
9bb8f6d031
Fix the tests: allow result of concat('a', -0.0) be both 'a0.0' and 'a-0.0'
...
(this depends on s[n]printf implementation and differs from system to system)
2005-01-02 14:15:51 +03:00
joreland@mysql.com
fe8f4ab012
merge
2005-01-01 14:01:37 +01:00
joreland@mysql.com
a7c2a9e0b8
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-01 09:13:17 +01:00
serg@sergbook.mysql.com
203cc19e48
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2004-12-31 18:00:49 +01:00
serg@sergbook.mysql.com
a9c7fb9dfd
post-merge
2004-12-31 17:59:43 +01:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01:00
sergefp@mysql.com
98ccc21011
Make test results independent on who runs them
2004-12-31 15:48:19 +03:00
sergefp@mysql.com
849d1203ff
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-debug-31dec
2004-12-31 15:13:48 +03:00
sergefp@mysql.com
b572374c0b
Remove display of join buffer size, test fails when someone changes the minimum
2004-12-31 15:11:07 +03:00
sergefp@mysql.com
91ab26eaf1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
2004-12-31 14:55:34 +03:00
sergefp@mysql.com
034c59ed59
Fix test results to account for difference between release BDB, debug BDB and MyISAM.
2004-12-31 14:48:11 +03:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
joreland@mysql.com
3c52b247ac
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 11:39:43 +01:00
dlenev@mysql.com
2f8dcec05a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-1339
2004-12-31 13:33:00 +03:00
sergefp@mysql.com
a09df7488d
Merge mysql.com:/dbdata/psergey/mysql-5.0-bug7264
...
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
2004-12-31 13:15:54 +03:00
monty@mysql.com
78da7196ad
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-12-31 12:05:43 +02: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
dlenev@mysql.com
536cb92195
Manual merge.
2004-12-31 12:48:27 +03:00
joreland@mysql.com
7f6fb4d9de
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 10:07:49 +01:00
vtkachenko@intelp4d.mysql.com
ae1b969c8f
Merge bk-internal:/home/bk/mysql-5.0
...
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
2004-12-31 09:00:34 +01:00
joreland@mysql.com
8f2d0ec1a1
merge
2004-12-31 06:36:32 +01:00
monty@mysql.com
5e03ebbcad
After merge fixes
...
Cleanup of mi_print_error() handling
Deleted 'merge' directory
2004-12-31 03:47:56 +02:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00