Commit graph

20714 commits

Author SHA1 Message Date
pekka@mysql.com
91eaf92861 ndb - wl-1203 alignment fix 2005-02-26 16:56:39 +01:00
mskold@mysql.com
b9aa67bc76 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-26 16:15:36 +01:00
sergefp@mysql.com
eb5d5de05f Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary collation. max_sort_char is needed by
my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.
2005-02-26 17:15:04 +03:00
monty@mysql.com
265a3585e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-26 12:19:56 +02:00
monty@mysql.com
1ecb8c8fed Fixes while during review of last pull
Temporary patch to remove some warnings
2005-02-26 12:19:02 +02:00
heikki@hundin.mysql.fi
6d848111f2 trx0trx.c, trx0trx.h:
Fix wrong spelling
2005-02-25 22:54:33 +02:00
heikki@hundin.mysql.fi
ec248f78cf trx0undo.h, trx0undo.c, trx0trx.c, trx0roll.c:
Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
2005-02-25 22:35:33 +02:00
heikki@hundin.mysql.fi
41e45ab16a fil0fil.c:
Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message
2005-02-25 22:16:14 +02:00
heikki@hundin.mysql.fi
e40a88ea62 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-25 22:01:33 +02:00
svoj@mysql.com
800aaae1fb BUG#3190 fix (request for STDDEV_SAMP, VAR_SAMP).
This bug is also known as WL#1639.
2005-02-25 22:19:04 +04:00
monty@mysql.com
f949f6a915 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-25 19:51:29 +02:00
pem@mysql.comhem.se
2af86eafc7 Fixed BUG#8757: Stored Procedures: Scope of Begin and End Statements do not work properly. 2005-02-25 17:56:45 +01:00
monty@mysql.com
7e5f74f8f2 Merge with global tree 2005-02-25 17:12:06 +02:00
monty@mysql.com
0a6b7aedb2 Remove compiler warnings and remove not used variables
(Found during build process)
2005-02-25 16:53:22 +02:00
pem@mysql.comhem.se
e3f286a04f Fixed BUG#7620: Stored procedure packet error if show mutex status
Another multi result statement added.
  Note: No test case, as it's not possible to get a deterministic result from this.
2005-02-25 15:21:05 +01:00
bar@mysql.com
88e1ebd01a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1-again
2005-02-25 18:16:45 +04:00
bar@mysql.com
e42a8c454b mysqldump.c:
Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client
2005-02-25 18:12:53 +04:00
ramil@mysql.com
671fa8bd66 merge 2005-02-25 17:28:47 +04:00
ramil@mysql.com
4ab10bcedf merge 2005-02-25 16:34:17 +04:00
pem@mysql.com
4ad4a75ba9 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-25 13:26:25 +01:00
mskold@mysql.com
78627e1ab1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-25 13:21:17 +01:00
pem@mysql.comhem.se
76c6d9cd91 Fixed BUG#6857: current_time() in STORED PROCEDURES
Have to thd->set_time() before each substatement execution, to make
  current_time() et al return different times within the same procedure.
2005-02-25 13:19:44 +01:00
ramil@mysql.com
dee22632f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b4802
2005-02-25 15:47:36 +04:00
joreland@mysql.com
fe2a800423 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
joreland@mysql.com
54af1b8fc8 add auto generated ndb dsp-files (for msvc++ 6.0) to ignore file 2005-02-25 11:47:27 +01:00
joreland@mysql.com
65daa271c1 Cset exclude: joreland@mysql.com|ChangeSet|20050224071025|18754 2005-02-25 09:35:09 +01:00
joreland@mysql.com
3aa91e242b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 09:19:56 +01:00
joreland@mysql.com
1bbc88e9b1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-25 09:18:33 +01:00
joreland@mysql.com
8253f54524 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 09:17:55 +01:00
joreland@mysql.com
d51fa996ab Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 09:15:52 +01:00
joreland@mysql.com
b52ed0d669 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-25 09:14:43 +01:00
joreland@mysql.com
72127b52b3 BUG#8786 - ndb_autodiscover, post review
More explicit naming of variables
2005-02-25 09:10:35 +01:00
mskold@mysql.com
c7c2eacfb8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-25 08:28:43 +01:00
monty@mysql.com
cd78e701a5 Show all generated warnings in SHOW ERROR
Previously we only stored the first given error (the error sent to the client)
2005-02-24 23:33:42 +02:00
brian@zim.(none)
4c144143de Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.0
2005-02-24 12:44:41 -08:00
brian@zim.(none)
b6ed75e9a9 Solved bug 8691.
Funny sometimes how things work when in reality you would think it would crash pretty hard :)
2005-02-24 12:42:06 -08:00
joreland@mysql.com
9905a52011 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-24 20:58:26 +01:00
joreland@mysql.com
1029db2b6d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-24 20:57:32 +01:00
joreland@mysql.com
bed5d6e418 bug#8786 - ndb_autodiscover - 5.0 specific details
Wait some for all nodes to get connected
2005-02-24 20:56:59 +01:00
joreland@mysql.com
0a265b6d84 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-24 20:48:33 +01:00
guilhem@mysql.com
91d1cf4931 Fix for BUG#8783 kill.test must always sleep 2 seconds, even if
mysql-test-run runs with --sleep=10; otherwise GET_LOCK() times out
before being killed so we get 0 instead of NULL. Verified that it
works on our powermacg5 where the test was failing.
2005-02-24 19:13:55 +01:00
joreland@mysql.com
168847b8e1 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-24 19:01:36 +01:00
joreland@mysql.com
c25ce0e362 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 18:59:56 +01:00
joreland@mysql.com
15de06f290 bug#8786 - ndb autodiscover, sometimes fails
remove dict forwarding
  add api retries on NotMaster
2005-02-24 18:58:56 +01:00
brian@zim.(none)
02fe41a1fe Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.0
2005-02-24 09:05:36 -08:00
ramil@mysql.com
05eb8af434 fixed compilation failure affects build without InnoDB 2005-02-24 20:55:20 +04:00
lars@mysql.com
4390d18cb5 Merge mysql.com:/home/bk/mysql-4.1 into mysql.com:/home/bk/mysql-5.0 2005-02-24 17:33:32 +01:00
lars@mysql.com
c99c44805c Fix of an incorrect merge 2005-02-24 17:25:06 +01:00
mskold@mysql.com
4e6a4dfa13 Merge 2005-02-24 14:48:12 +01:00
mskold@mysql.com
d3573d7e21 Added tests for BINARY|VARBINARY LIKE|NOT LIKE 2005-02-24 14:20:12 +01:00