Commit graph

6082 commits

Author SHA1 Message Date
sergefp@mysql.com
a06c6d41bb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/psergey/mysql-4.0-look
2005-02-28 15:40:45 +03:00
sergefp@mysql.com
b44f24000b Merge 2005-02-28 14:52:35 +03:00
monty@mysql.com
3839e443a4 merge with 4.1 2005-02-28 12:18:39 +02:00
monty@mysql.com
253bfcf783 Fixed wrong memory references found by purify
(No really critical errors found, but a few possible wrong results)
2005-02-28 11:59:46 +02:00
pekka@mysql.com
0df7b6317c Merge mysql.com:/space/pekka/ndb/version/my50
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-02-27 17:25:31 +01:00
svoj@mysql.com
af026ef164 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/stddev-mysql-5.0
2005-02-27 13:33:20 +04: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
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
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
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
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
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
pem@mysql.comhem.se
2b1f0bf1f5 Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329
The warning sent is by itself ok, the problem was rather why it wasn't
  sent on some other platforms...
  The real problem was that a total_warn_count which was inconsistent with warn_list
  was sent back with send_eof() during SP execution, which in turn cause a protocol
  error in mysqltest.
2005-02-24 13:56:09 +01:00
pekka@mysql.com
8b8dc46513 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-02-24 13:07:34 +01:00
pekka@mysql.com
b67f82d901 ndb - wl-1203 fix binary LIKE binary in ndb api 2005-02-24 13:07:33 +01:00
joreland@mysql.com
2952f73c16 merge 2005-02-24 06:24:46 +01:00
bell@51.0.168.192.in-addr.arpa
cfdf5bcdc8 fixed test results 2005-02-24 04:07:58 +02:00
bell@51.0.168.192.in-addr.arpa
36265381fc Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-24 03:28:33 +02:00
bell@51.0.168.192.in-addr.arpa
3cb61419bd get time for thread switching 2005-02-24 03:25:53 +02:00
bell@51.0.168.192.in-addr.arpa
bf43b0d31a fixed typo in test 2005-02-24 02:59:36 +02:00
bell@51.0.168.192.in-addr.arpa
5d6cc9de06 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-24 01:11:59 +02:00
mats@mysql.com
bfce3aee8d Bug#8412: merged from 4.1 2005-02-23 23:01:51 +01:00
jimw@mysql.com
3ecabaa9f7 Don't try to create a symlink if the DATA DIRECTORY specified for a table
is the same as the normal datadir for that database. (Bug )
2005-02-23 13:59:04 -08:00
bell@51.0.168.192.in-addr.arpa
99114bb60e Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 23:00:41 +02:00
bell@51.0.168.192.in-addr.arpa
8655e4327e Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0
2005-02-23 22:56:24 +02:00
bell@51.0.168.192.in-addr.arpa
270d93b83d Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 22:16:51 +02:00
serg@serg.mylan
b8288584e9 innodb-dependent test moved from rpl_rotate_logs.test to binlog.test 2005-02-23 20:35:59 +01:00
serg@serg.mylan
e38b3e2390 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-23 20:10:58 +01:00
mskold@mysql.com
07cdc9e334 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-23 20:08:21 +01:00
guilhem@mysql.com
624aaa4b09 result fixes after my change to mysqlbinlog (which was accidentally
pushed some minutes ago)
2005-02-23 19:59:25 +01:00
mats@mysql.com
6ad51ffb3c Bug#8412: Merge from 4.0 2005-02-23 19:58:54 +01:00
mats@mysql.com
a4cdb93b38 Merge mysql.com:/home/bkroot/mysql-4.0
into mysql.com:/home/bk/b8412-mysql-4.0
2005-02-23 19:40:31 +01:00
serg@serg.mylan
9c9d1fd406 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-23 19:20:17 +01:00
patg@krsna.patg.net
0909b09b43 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.patg.net:/home/patg/mysql-5.0
2005-02-23 09:35:18 -08:00
serg@serg.mylan
383c6e312a don't log BEGIN in auto-commit mode
correct end_log_pos for Xid_log_event
2005-02-23 18:26:49 +01:00
bell@52.0.168.192.in-addr.arpa
25e87cd6f7 Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 19:22:52 +02:00
gluh@gluh.mysql.r18.ru
c6f1e9627a Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-02-23 20:22:51 +03:00
gluh@gluh.mysql.r18.ru
fc9c20995f Fix for bug : SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
mskold@mysql.com
e0dbdca79e ha_ndbcluster.cc:
Fixed faulty debug printout
ndb_condition_pushdown.test, ndb_condition_pushdown.result:
  Added BINARY and VARBINARY tests
2005-02-23 17:18:06 +01:00
gluh@gluh.mysql.r18.ru
907c7af3ce Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-02-23 18:47:00 +03:00
gluh@gluh.mysql.r18.ru
2b5ee94a33 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
mskold@mysql.com
364492239b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-23 15:54:22 +01:00
mskold@mysql.com
fcc37a0787 Fixes for condition pushdown to storage engine based on comments from code review 2005-02-23 15:51:26 +01:00