Commit graph

18692 commits

Author SHA1 Message Date
gluh@gluh.mysql.r18.ru
b4e78f39c2 The function should exit from loop on invalid byte sequence 2005-01-13 16:53:10 +03:00
tulin@build.mysql.com
5372254767 Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-13 09:02:20 +01:00
joreland@mysql.com
c4616595db Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-13 08:41:42 +01:00
joreland@mysql.com
4636237014 ndb - take booked scan frags into account when getting scan_fragconf 2005-01-13 08:40:32 +01:00
mwagner@here.mwagner.org
f06824ca4b Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-01-12 21:09:07 -06:00
mwagner@here.mwagner.org
292ca0959c libmysqld.def, libmysql.def:
Use the invisible tabs (!)
2005-01-12 21:04:31 -06:00
paul@kite-hub.kitebird.com
969b8ca5c4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-12 20:39:04 -06:00
paul@kite-hub.kitebird.com
231632e34f user_limits.result:
Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.
2005-01-12 20:38:05 -06:00
mwagner@here.mwagner.org
6bca7cb857 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-01-12 19:58:49 -06:00
mwagner@here.mwagner.org
ffdeb4f880 libmysqld.def, libmysql.def:
Add missing 'get_defaults_files' to fix linking error.
2005-01-12 19:56:49 -06:00
konstantin@mysql.com
019ff4c577 Manual merge. 2005-01-13 02:19:35 +03:00
konstantin@mysql.com
30c4d10e1a Add logging of COM_EXECUTE in the general query log. 2005-01-13 02:13:19 +03:00
tulin@build.mysql.com
ba193367de Merge bk-internal:/home/bk/mysql-5.0-ndb
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-12 22:16:30 +01:00
tomas@poseidon.ndb.mysql.com
476265a170 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 22:16:29 +01:00
tomas@poseidon.ndb.mysql.com
db19e047d5 added som signal printout functions
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
    not necessarily the same starts and stops...
    +error corrected in ref signal
    added print of error codes + more correct error handling of event errors
    + added goto instead of erroneous break to fix bug#7627
2005-01-12 22:09:43 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
3e3e140e3d Minor clean up. 2005-01-12 22:55:10 +02:00
paul@kite-hub.kitebird.com
72ce1f5055 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-12 14:53:11 -06:00
tulin@build.mysql.com
7cc1926b0c Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-12 21:25:16 +01:00
sergefp@mysql.com
106509992e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2
2005-01-12 23:22:12 +03:00
tulin@build.mysql.com
924ec83b99 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-12 21:22:11 +01:00
paul@kite-hub.kitebird.com
e608d27f5a Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-12 14:17:56 -06:00
vtkachenko@mail.mysql.com
306df48731 Merge 2005-01-12 21:03:06 +01:00
tulin@build.mysql.com
2c174baf8a Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-12 21:01:15 +01:00
tulin@build.mysql.com
d7a233261a Merge build.mysql.com:/users/tulin/mysql-4.1
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-12 20:58:07 +01:00
vtkachenko@mail.mysql.com
9f640bbad9 logging_ok:
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
2005-01-12 20:55:06 +01:00
konstantin@mysql.com
f01f721672 manual merge 2005-01-12 21:51:04 +03:00
paul@kite-hub.kitebird.com
e7810fa9b9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-12 12:42:53 -06:00
jimw@mysql.com
77fae11832 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-12 19:19:55 +01:00
tulin@build.mysql.com
422e37ee04 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1
2005-01-12 19:00:33 +01:00
konstantin@mysql.com
8b33aad4e4 A test case for Bug#6761 "mysql_list_fields doesn't work" 2005-01-12 20:28:31 +03:00
tulin@build.mysql.com
2d3f842ad0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1
2005-01-12 18:20:16 +01:00
tulin@build.mysql.com
3f8d669873 fix shm key 2005-01-12 18:19:30 +01:00
jimw@mysql.com
0b041fe2e1 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-12 18:09:44 +01:00
joreland@mysql.com
f70e030fd4 ndb - more test of partitioning wrt scans & lock modes 2005-01-12 17:29:46 +01:00
paul@kite-hub.kitebird.com
48802d5b32 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-12 10:27:09 -06:00
heikki@hundin.mysql.fi
f55cb90f93 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-01-12 18:26:56 +02:00
heikki@hundin.mysql.fi
bdc9823cb6 ha_innodb.cc:
Add comments about why the InnoDB latching order is obeyed also for the MySQL query cache mutex; add an error printf if that is not the case
sync0sync.h:
  Assign sync0sync.h ranks also for the MySQL query cache mutex and the MySQL binlog mutex; the latching order must be obeyed also for these
row0ins.c:
  Add a comment why the query cache invalidate operation cannot deadlock in a cascaded FOREIGN KEY operation
2005-01-12 18:25:39 +02:00
monty@mysql.com
a1321dff7e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-12 18:08:41 +02:00
jimw@mysql.com
fd7d355fbd Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-12 17:05:33 +01:00
paul@kite-hub.kitebird.com
86ed717a3f Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-12 10:05:33 -06:00
hf@deer.(none)
dba173c46b Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-01-12 20:05:32 +04:00
konstantin@mysql.com
2cc2844bbb Merge mysql.com:/home/kostja/work/mysql-4.0-6761
into mysql.com:/home/kostja/work/mysql-4.1-root
2005-01-12 19:00:04 +03:00
hf@deer.(none)
c64897dbe8 --defaults-extra-file bug fixed 2005-01-12 19:57:26 +04:00
joreland@mysql.com
f08340078c ndb - Add test-case file for 16-nodes 2005-01-12 16:20:21 +01:00
joreland@mysql.com
ed5b30df4c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 15:46:37 +01:00
joreland@mysql.com
408b489e7d ndb - Fix problem with parallelism < fragcount & committedread 2005-01-12 15:36:52 +01:00
konstantin@mysql.com
6058edbe18 A fix for Bug#6761 "mysql_list_fields() does not work": test
case will be added to client_test in 4.1
2005-01-12 17:04:45 +03:00
monty@mysql.com
073a8881ee Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-12 16:02:46 +02:00
tomas@poseidon.ndb.mysql.com
134e7f940c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 14:34:34 +01:00
tomas@poseidon.ndb.mysql.com
1640554fd4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 14:30:04 +01:00