Commit graph

12702 commits

Author SHA1 Message Date
tomas@poseidon.bredbandsbolaget.se
cc1d7aafdd more ndb restore cleanup 2004-06-10 01:38:38 +00:00
tomas@poseidon.bredbandsbolaget.se
f4a770ffc5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-09 19:29:49 +00:00
tomas@poseidon.bredbandsbolaget.se
cdd76505b2 re-enginered ndb restore to remove new/deletes and data copy 2004-06-09 19:24:36 +00:00
ndbdev@ndbmaster.mysql.com
83bde5f54b 3 retries for wait started 2004-06-09 06:09:13 +02:00
ndbdev@ndbmaster.mysql.com
6846316818 Use LOGNAME instead of USER 2004-06-08 17:01:47 +02:00
tomas@mc05.(none)
2bb2af5b4c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-08 12:36:42 +02:00
tomas@poseidon.ndb.mysql.com
8599b630f6 fix for automake-1.5 2004-06-08 10:36:41 +00:00
tomas@poseidon.ndb.mysql.com
e7abc7b7d5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-08 09:32:52 +00:00
heikki@hundin.mysql.fi
d9dc42b5be ha_innodb.cc:
Fix Bug #4047: remove the improvement ported from 4.0 that made InnoDB to remember the original select_lock_type inside LOCK TABLES
2004-06-08 10:41:14 +03:00
tomas@mc05.(none)
9889669758 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-08 08:33:17 +02:00
bar@bar.intranet.mysql.r18.ru
d04966e380 Sorry, forgot to commit together with the code change yesterday. 2004-06-08 11:33:16 +05:00
tomas@poseidon.bredbandsbolaget.se
23bf35987d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-08 00:12:55 +00:00
tomas@poseidon.bredbandsbolaget.se
ce2619a6ed some ndb printout cleanup 2004-06-08 00:12:11 +00:00
sergefp@mysql.com
26a5650d1b SQL Syntax for Prepared Statements: post-merge fixes 2004-06-08 00:43:03 +04:00
sergefp@mysql.com
7e0455f333 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-07 23:50:59 +04:00
joreland@mysql.com
f90ea9986a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-07 21:17:29 +02:00
joreland@mysql.com
469acb9e5c BUG#4034 2004-06-07 21:16:53 +02:00
joreland@mysql.com
a77d621a4e Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-07 21:01:19 +02:00
joreland@mysql.com
4817cde45e BUG#4037 fix printout of limits 2004-06-07 20:57:28 +02:00
tomas@poseidon.bredbandsbolaget.se
71d7838fae Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-07 18:26:12 +00:00
tomas@poseidon.ndb.mysql.com
20a42316ae ndb source tree cleanup, see respective file 2004-06-07 17:31:32 +00:00
guilhem@mysql.com
3786538112 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-07 18:56:33 +02:00
guilhem@mysql.com
7108e4b017 updating test's result now that SHOW BINLOG EVENTS quotes and escapes user variables. 2004-06-07 18:55:53 +02:00
tomas@mc05.(none)
52143c65bb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1
2004-06-07 17:58:35 +02:00
gluh@gluh.mysql.r18.ru
147c2988cc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
2004-06-07 19:58:34 +04:00
gluh@gluh.mysql.r18.ru
d381736c31 Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character 2004-06-07 17:39:17 +04:00
bar@bar.intranet.mysql.r18.ru
7d17da9018 mysqld.cc:
WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation
2004-06-07 18:33:17 +05:00
bar@bar.intranet.mysql.r18.ru
0860e3bfe4 mysqldump.c:
Dump could fail to load because of --default-character-set command line option.
  More safe dump is now produces, --default-character-set doesn't matter.
2004-06-07 18:12:23 +05:00
bar@bar.intranet.mysql.r18.ru
acbb3096b2 client.c:
Bug #3990  	`--with-charset' ./configure's switch doesn'taffect mysql client library.
2004-06-07 17:28:31 +05:00
brian@brian-akers-computer.local
f50066bdb9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-06-07 02:08:36 -07:00
brian@brian-akers-computer.local
589480e879 Last patch before push into main tree. Updated from code review and final once over.
A couple of small changes to ha_example (mainly comments).
2004-06-07 02:06:33 -07:00
sergefp@mysql.com
916579e3fd Merged 2004-06-07 12:21:26 +04:00
sergefp@mysql.com
1e05e6cb82 Post review fixes for "SQL Syntax for Prepared Statements". 2004-06-07 12:09:10 +04:00
bar@bar.intranet.mysql.r18.ru
b30b1ccc6a Bug #3928 regexp [[:>:]] and UTF-8 2004-06-07 12:51:18 +05:00
brian@brian-akers-computer.local
34ad857c8d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-06-05 22:58:13 -07:00
konstantin@mysql.com
dabc0e774e mysql_stmt_field_count() 2004-06-06 02:27:05 +04:00
konstantin@mysql.com
231ec66652 More comments in prepared statements code. 2004-06-06 00:33:16 +04:00
brian@brian-akers-computer.local
e24e1350a3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-06-05 10:43:22 -07:00
konstantin@mysql.com
21783e8537 Few more cleanups in client_test:
No need for mysql_commit, especially after DDL statements.
2004-06-05 03:09:53 +04:00
konstantin@mysql.com
1ae0504c6a The comment is not true any more.
Is there a way to sefely use MYSQL_BIND structure without bzero?
2004-06-05 02:56:50 +04:00
paul@kite-hub.kitebird.com
d77a3f6db1 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-06-04 10:35:57 -05:00
konstantin@mysql.com
7d09dd999a HAVE_DEPRECATED_411_API macro removed. 2004-06-04 18:38:18 +04:00
tomas@mc05.(none)
5a8303a3c1 moved ndb versioning to configure and fixed ndb docs make 2004-06-04 16:08:50 +02:00
tomas@poseidon.ndb.mysql.com
adf95ea16a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-04 14:08:49 +00:00
tomas@poseidon.ndb.mysql.com
df84c09341 automake ndb docs make 2004-06-04 14:08:16 +00:00
tomas@mc05.(none)
faa6c59eb1 fixed bug in ndb_waiter 2004-06-04 10:24:43 +02:00
tomas@poseidon.bredbandsbolaget.se
3327c6c080 added operator<< for NdbRecAttr and removed attrtype from Event impl 2004-06-04 08:24:42 +00:00
monty@mysql.com
8b2a735563 Portability fixes (and a typo after last merge) 2004-06-04 11:02:35 +03:00
bar@bar.intranet.mysql.r18.ru
3f556025a7 charset.c:
Typo fix.
  Thanks Vladimir Kolpakov who noticed it.
2004-06-04 09:07:46 +05:00
sergefp@mysql.com
bec20d1fd7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-04 05:37:14 +04:00