Commit graph

8951 commits

Author SHA1 Message Date
joreland@mysql.com
b4c251134f Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-09 11:01:47 +01:00
paul@kite-hub.kitebird.com
61041e55fe Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-08 19:46:52 -06:00
paul@kite-hub.kitebird.com
7585b5cb61 set_var.cc:
Whack duplicate variable line. (Affects SHOW VARIABLES.)
2005-01-08 19:43:15 -06:00
paul@kite-hub.kitebird.com
8f12ea836e sql_select.cc:
silence picky compiler warning.
2005-01-08 19:40:58 -06:00
paul@kite-hub.kitebird.com
840dd7c764 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-08 18:42:48 -06:00
paul@kite-hub.kitebird.com
cbd56fce87 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-08 18:32:57 -06:00
pekka@mysql.com
51adbae299 Merge 2005-01-09 00:45:06 +01:00
jimw@mysql.com
442fae37c5 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-08 23:32:53 +01:00
pekka@mysql.com
195f7bda02 Merge 2005-01-08 22:34:16 +01:00
jimw@mysql.com
e959e0b8fc Merge mysql.com:/home/jwinstead2/mysql-4.1-7233
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-08 22:22:41 +01:00
pekka@mysql.com
50c3a883b2 ndb - wl-1442 fix Time ordering 2005-01-08 19:28:44 +01:00
pekka@mysql.com
0462ccfe3c ndb - wl-1442 fix Date ordering 2005-01-08 16:57:51 +01:00
jimw@mysql.com
5c497ef3a8 Use 'USING <indextype>' in results of SHOW CREATE TABLE, it's the preferred
syntax. (Bug )
2005-01-08 07:31:13 +01:00
tulin@build.mysql.com
3d773f79ea Merge bk-internal:/home/bk/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-08 00:34:08 +01:00
pekka@mysql.com
7043c9d4aa ndb - wl-1442 minor 2005-01-08 00:03:19 +01:00
paul@kite-hub.kitebird.com
7e807dc727 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-07 14:18:38 -06:00
paul@kite-hub.kitebird.com
76b823cebe set_var.cc:
Reorder variables to properly alphabetize SHOW VARIABLES output.
2005-01-07 14:17:08 -06:00
paul@kite-hub.kitebird.com
8abb85a101 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-07 12:26:55 -06:00
jimw@mysql.com
6db6171494 Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-07 19:03:35 +01:00
jimw@mysql.com
c2eb3bf9f6 Correctly truncate integers inserted into field and double columns
with a number of decimals specified. (Bug )
2005-01-07 17:44:18 +01:00
marko@hundin.mysql.fi
52ebc04fc5 Introduce ROW_TYPE=REDUNDANT and ROW_TYPE=COMPACT for InnoDB table formats 2005-01-07 16:43:27 +02:00
serg@sergbook.mysql.com
a609bc45f2 merge 2005-01-07 15:02:25 +02:00
serg@sergbook.mysql.com
ea737638e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-07 14:27:07 +02:00
serg@sergbook.mysql.com
98bfc75d6a don't cast lvalue 2005-01-07 14:25:48 +02:00
pekka@mysql.com
f3103c489c ndb - wl-1442 new varchar 2005-01-07 11:55:20 +01:00
joreland@mysql.com
013f9bbfb5 merge 2005-01-07 07:15:08 +01:00
joreland@mysql.com
f3baf38dbc merge 2005-01-07 06:47:41 +01:00
brian@zim.(none)
3be57f961b This just fixes the compile issues for table structure changes.
The test case does not currently work (I am comitting this so that Patrick will have a working copy).
I am going to look at the test case next. It is suspected that it is failing do to a change in mysql_test_run.
2005-01-06 19:37:16 -08:00
brian@zim.(none)
2ee9d854b4 Updates for Monty's changes in the table structure. All tests pass currently.
Seems like such a short commit message...
2005-01-06 18:34:17 -08:00
brian@zim.(none)
75f282df27 Fix for compiling error in sql_parse 2005-01-06 16:31:18 -08:00
guilhem@mysql.com
60f5a69160 2 small fixes for binlog (sorry for grouping them - I won't do it again):
WL#2335 (wait if binlog or binlog index file hits disk full or quota exceeded),
fix for BUG#7236 ("--expire_logs_days does not apply if all statements
happen in transactions"), and a behaviour change: abort if mysqld can't start
binlog at startup (if running with --log-bin of course).
2005-01-06 23:53:58 +01:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00
serg@sergbook.mysql.com
15133e70ac Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-06 17:53:32 +02:00
bell@sanja.is.com.ua
421738e8ce removed unused label 2005-01-06 17:08:38 +02: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
joreland@mysql.com
c39db2febf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-05 21:22:38 +01:00
tomas@poseidon.ndb.mysql.com
79fb236b0a changed to using NdbTransaction scoped enums
and removed usage of Ndb::waitUntilReady()
2005-01-05 17:59:24 +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
e3045e85f3 added correct res initialisation
and check of handler compatibility
2005-01-05 17:42:22 +02:00
bell@sanja.is.com.ua
dffac28b76 fixed views with PS protocol 2005-01-05 16:48:23 +02:00
serg@sergbook.mysql.com
490d522408 fix alignment issues 2005-01-05 11:56:15 +02:00
serg@sergbook.mysql.com
4cbe322517 reverting the change that results in infinite recursion 2005-01-05 02:19:04 +02:00
serg@sergbook.mysql.com
11f445f9e4 federated: compilation errors and crash fixed. test still fails. 2005-01-05 00:39:13 +02:00
joreland@mysql.com
597ecc8e05 merge failure 2005-01-04 20:39:07 +01: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
bell@sanja.is.com.ua
a8a5f3590c fixed bugs in view code with prepared statemnts 2005-01-04 18:04:16 +02:00