Commit graph

19327 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
7a8d763305 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 19:40:30 +01:00
tomas@poseidon.ndb.mysql.com
61b50b577e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-21 19:33:54 +01:00
tomas@poseidon.ndb.mysql.com
04a23e22d4 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 18:07:22 +01:00
timour@mysql.com
b04675c89a Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-01-21 19:02:12 +02:00
tomas@poseidon.ndb.mysql.com
e291e98d2d Bug#8070
corrected possible unalignment in NdbRecAttr access methods
2005-01-21 17:57:44 +01:00
timour@mysql.com
75195cff33 Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-01-21 18:56:18 +02:00
tomas@poseidon.ndb.mysql.com
bca11d8729 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 17:50:58 +01:00
ingo@mysql.com
12879fc30d WL#2126 - Multi_read_range.
Addendum for correct multi_range_count system variable handling.
Fixed a typo.
Added to sys_variables.
Added to init_vars.
2005-01-21 17:38:46 +01:00
heikki@hundin.mysql.fi
d1d68b1413 Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-01-21 18:16:02 +02:00
heikki@hundin.mysql.fi
d6706798d2 fil0fil.c:
Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works
2005-01-21 17:59:23 +02:00
heikki@hundin.mysql.fi
9a03676b69 dict0dict.c:
Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition
2005-01-21 17:54:50 +02:00
timour@mysql.com
e19c6a856d Manual merge of the fix for BUG#4285 from 4.1 2005-01-21 17:41:11 +02:00
timour@mysql.com
36f1e91b69 Merge of fix for BUG#4258 from 4.1.
Needs additional manual merge.
2005-01-21 17:38:36 +02:00
timour@mysql.com
b266ad2c24 Merge mysql.com:/home/timka/mysql/src/4.1-bug-4285
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-01-21 16:47:51 +02:00
heikki@hundin.mysql.fi
63abeebb55 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-21 16:10:41 +02:00
ingo@mysql.com
c7563247d1 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 14:57:57 +01:00
ram@gw.mysql.r18.ru
0bf3ae74b6 A fix (Bug #8015: server refuses to start with long basedir path). 2005-01-21 17:51:24 +04:00
tomas@poseidon.ndb.mysql.com
af3d3c427d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-new
2005-01-21 14:49:47 +01:00
tomas@poseidon.ndb.mysql.com
8073b2d565 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 14:41:01 +01:00
bar@mysql.com
10c4977878 sql_show.cc:
#7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.
2005-01-21 17:00:14 +04:00
bar@mysql.com
ecd8252e56 merge bug##7943: Wrong prefix lengths reported on UTF-8 columns 2005-01-21 16:55:17 +04:00
bar@mysql.com
2f6e0864ad Bug#7943: Wrong prefix lengths reported on UTF-8 columns
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
2005-01-21 16:49:20 +04:00
joreland@mysql.com
6296fde4d8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-21 13:21:00 +01:00
joreland@mysql.com
a44dea116e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-21 13:20:35 +01:00
joreland@mysql.com
228fe6ba54 Fix weird link error on sol9x86
- use incremental linker
2005-01-21 13:16:46 +01:00
tomas@poseidon.ndb.mysql.com
3d8e27eeb3 EventLogger.cpp:
fixed node id printout bug
2005-01-21 12:50:18 +01:00
tomas@poseidon.ndb.mysql.com
a5b0a5352a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 12:18:24 +01:00
tomas@poseidon.ndb.mysql.com
0735fc89a4 enabled adding option to ndb_mgm in mysql test run 2005-01-21 12:15:14 +01:00
ram@gw.mysql.r18.ru
9c3c566fcb A fix (bug #7261: Alter table loses temp table with lower_case_table_names=2). 2005-01-21 15:14:31 +04:00
ingo@mysql.com
da091f2c22 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 12:14:16 +01:00
joreland@mysql.com
424898725d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-21 11:47:12 +01:00
joreland@mysql.com
d233cadf66 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-21 11:46:13 +01:00
tomas@poseidon.ndb.mysql.com
ae618c7ba4 corrected "merge error" with wl2299 2005-01-21 11:43:25 +01:00
ingo@mysql.com
565c2fdb6c Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 09:53:31 +01:00
ingo@mysql.com
8555668067 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-21 09:52:49 +01:00
tomas@poseidon.ndb.mysql.com
8f86a38520 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-21 09:46:08 +01:00
ram@gw.mysql.r18.ru
84f0b1eeee Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
2005-01-21 12:10:19 +04:00
joreland@mysql.com
abdad0aa0e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-21 08:49:24 +01:00
joreland@mysql.com
31f2ddfa5d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-21 08:47:31 +01:00
joreland@mysql.com
b3a6628599 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-21 08:41:39 +01:00
tomas@poseidon.ndb.mysql.com
72dc9ff915 moved START_AND_EXIT check so it can actually be used
fix as not to overwrite previoulsy set flags in configure
2005-01-21 08:41:38 +01:00
joreland@mysql.com
770813b5a6 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-21 08:30:21 +01:00
joreland@mysql.com
e0df86cd35 bug#8051 - ndb, typo, more info on crash 2005-01-21 08:28:23 +01:00
joreland@mysql.com
6f8a1f03c0 Bug#8051 - ndb
Make sure to ship error code in system error signal
2005-01-21 07:53:02 +01:00
tomas@poseidon.ndb.mysql.com
8f2f573604 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-21 07:14:47 +01:00
patg@pc248.lfp.kcls.org
1da60b9f45 -Added quote_data and needs_quotes (moved from federated handler.
-New tests and results

logging_ok:
  Logging to logging@openlogging.org accepted
ha_federated.h:
  removed quote_data and type_quote (now in the Field class)
ha_federated.cc:
  moved quote_data and type_quote to field class
field.h:
  new methods quote_data and needs_quotes declared
field.cc:
  new field class methods quote_data and needs_quotes (per Monty's request)
federated.test:
  more tests, joins, index tests
have_federated_db.require:
  new name of federated system var
federated.result:
  new test results for federated handler
have_federated_db.inc:
  changed name of variable in test due to change in vars
sql_analyse.cc:
  over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler.
mysql_priv.h:
  define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler 
ha_federated.cc:
  implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions.
2005-01-20 18:36:40 -08:00
tomas@poseidon.ndb.mysql.com
61b1de9533 2005-01-20 23:23:15 +01:00
tomas@poseidon.ndb.mysql.com
500e582ae5 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-20 22:37:53 +01:00
tomas@poseidon.ndb.mysql.com
3dfcf07cc9 ha_ndbcluster.cc:
read row size with wrong type
2005-01-20 22:28:08 +01:00
tomas@poseidon.ndb.mysql.com
b1877967d1 ndb_autodiscover.result, ndb_autodiscover.test:
removed this since it easily gives errors if previous tests fail
2005-01-20 21:26:58 +01:00