1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Commit Graph

5330 Commits

Author SHA1 Message Date
serg@serg.mylan
cb235f43c9 Merge 2003-11-20 23:07:31 +01:00
sergefp@mysql.com
30b3c3bf1b Merged, most likely needs post-merge fix 2003-11-21 00:27:54 +03:00
serg@sergbook.mylan
55182340ba more left join tests 2003-11-20 22:20:54 +01:00
konstantin@mysql.com
c4a9dc4f8b fix for bug #1790:
"BIT_AND() result in GROUP BY different when SQL_BIG_RESULT used"

return value of BIT_AND changed to BIGINT SIGNED
Also the patch fixes another bug: when temporary table is in use and one of
values in group is NULL, BIT_AND always returns zero.
Fixed it to always skip null values.
2003-11-21 00:03:04 +03:00
monty@mysql.com
b01fcb4e14 Merge with 4.0 to get:
Fix for storing negative values in decimal fields
Fix for FLUSH TABLE with HANDLER
2003-11-20 22:30:48 +02:00
sergefp@mysql.com
4016048d81 logging_ok:
Logging to logging@openlogging.org accepted
sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
  Post-merge fixes
Many files:
  new file
2003-11-20 23:27:11 +03:00
monty@mysql.com
7c6113a39f Merge key cache structures to one
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
paul@ice.snake.net
4909a37eac Use same style for SHOW MASTER STATUS fields as
for SHOW SLAVE STATUS.
2003-11-20 13:49:05 -06:00
paul@ice.snake.net
53c93091f2 Write slave status field names using consistent style.
(Initial caps for each word.) For example, instead of writing
Until_condition, Until_Log_File, and Until_log_pos, write
Until_Condition, Until_Log_File, and Until_Log_pos.
2003-11-20 13:07:25 -06:00
paul@ice.snake.net
ee46b6909c Typo. 2003-11-20 12:55:07 -06:00
pem@mysql.comhem.se
5e46a05960 Fixed BUG#1874: Don't call fix_fields() indiscriminately, it resets null_value
for some items, which made aggregates like MIN(), MAX() and SUM() fail.
2003-11-20 18:30:02 +01:00
bell@sanja.is.com.ua
a1ceb1bd04 database invalidation invalidate queries only of given database (BUG#1898) 2003-11-20 18:12:49 +02:00
pem@mysql.comhem.se
05f25feaa9 Handle null values correctly in SP local variables. 2003-11-20 16:14:24 +01:00
pem@mysql.comhem.se
96f1252899 Bugfixes in SHOW CREATE PROCEDURE/FUNCTION and SHOW PROCEDURE/FUNCTION STATUS;
- dropped routines should not show up in status
- error handling for non-existing routines

+ some cleanup.
2003-11-20 15:07:22 +01:00
guilhem@mysql.com
a684227c4a Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-11-19 23:40:59 +01:00
guilhem@gbichot2
4bd3b096a0 Official builds are tested with mysql-test-run --sleep=10, and the slave
has (in mysql-test-run) a slave-net-timeout=10. So the 'sleep 1' below
was converted in 'sleep 10', so slave thought that connection was down,
so reconnected, so got an additional (fake) Rotate event, which shifted
the positions displayed by SHOW SLAVE STATUS.
2003-11-19 23:39:08 +01:00
serg@serg.mylan
707e7e8992 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-19 23:13:48 +01:00
pem@mysql.comhem.se
5b355ea6f5 Post-merge fixes. 2003-11-19 16:59:35 +01:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
pem@mysql.comhem.se
c4871b240d Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
2003-11-19 11:26:18 +01:00
serg@serg.mylan
11f70bdfc4 Bug#1826, HANDLER+ALTER TABLE=crash (unfortunately, it cannot be tested in mysql-test suite)
more user variable tests
2003-11-18 22:06:47 +01:00
lenz@mysql.com
8ab3160d7e Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-11-18 21:23:41 +01:00
lenz@kallisto.local
d2295c2c52 - fixed typo in mysql-test-run error message 2003-11-18 21:04:36 +01:00
bell@sanja.is.com.ua
8ed7ab1fe0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
2003-11-18 19:32:59 +02:00
monty@mashka.mysql.fi
a47d56088f Merge with 4.0 tree 2003-11-18 18:54:27 +02:00
guilhem@mysql.com
a780924979 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-11-18 17:36:09 +01:00
guilhem@mysql.com
8377acc7d1 Fix for BUG#1870
"CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
    So, in CHANGE MASTER:
    when it seems reasonable that the user did not want to discontinue
    its replication (i.e. when he is not specifying host or port or master_log_file
    or master_log_pos; this will be documented), set the coordinates of the
    I/O thread to those of the SQL thread. This way, the SQL thread will see
    no discontinuity in the relay log (i.e. will skip no events), because
    the I/O thread will fill the brand new relay log with the events which
    are just after the position where the SQL thread had stopped
    (before CHANGE MASTER was issued).
    And a new test for this bug.
2003-11-18 17:31:17 +01:00
bell@sanja.is.com.ua
d96b3aa939 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
2003-11-18 17:48:45 +02:00
monty@mashka.mysql.fi
b60aea4058 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-11-18 17:28:33 +02:00
monty@mashka.mysql.fi
c9ae785bc3 Delete duplicate error message names 2003-11-18 17:28:00 +02:00
sergefp@mysql.com
6c5b4af81c Fix for bug #1820 2003-11-18 17:04:52 +03:00
Sinisa@sinisa.nasamreza.org
f6ca9afdbd Fix for bug when zeros are to be prepended to decimal field 2003-11-18 15:58:27 +02:00
monty@mashka.mysql.fi
e5d75fb984 merge 2003-11-18 13:51:48 +02:00
monty@mashka.mysql.fi
cab1dc628c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
2003-11-18 13:47:27 +02:00
serg@serg.mylan
6d350964dc word substitution in error messages removed - can create problems for i18n 2003-11-18 10:23:49 +01:00
serg@serg.mylan
249c0f9b32 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-11-17 21:51:57 +01:00
bell@sanja.is.com.ua
5327ec1d09 IGNORE option was added for DELETE statement (WL#1334) 2003-11-17 22:45:07 +02:00
gluh@gluh.mysql.r18.ru
ee4ed0c969 WL#1241: SHOW PROCEDURE/FUNCTION
WL#1263: Support for the attributes COMMENT and SUID
         in CREATE/ALTER PROCEDURE/FUNCTION
2003-11-17 21:21:36 +04:00
gluh@gluh.mysql.r18.ru
74165e729c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.lastday
2003-11-17 18:02:47 +04:00
gluh@gluh.mysql.r18.ru
5ade64831e WL#1253: LAST_DAY 2003-11-17 18:02:08 +04:00
serg@serg.mylan
60d60a299e Item_uint::save_in_field() added to take into account bigint->decimal case 2003-11-16 17:37:15 +01:00
bell@sanja.is.com.ua
2cb4abb5a7 fixed error handling inside su_select() for multidelete
(BUG#1839)
2003-11-15 21:52:21 +02:00
serg@serg.mylan
01e1161676 cleanup 2003-11-15 12:30:32 +01:00
pem@mysql.comhem.se
81c4cca686 Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
Also fixed memory leak when aborting parsing for a duplicate cursor.
2003-11-14 13:46:50 +01:00
pem@mysql.comhem.se
c38bb3d79d Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
  - ITERATE in labelled BEGIN-END (not allowed).
  - Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
  - Empty BEGIN-END (now allowed).
  - End label (now optional).
2003-11-13 19:34:56 +01:00
serg@serg.mylan
f4d7afd213 multiple keycache fixes 2003-11-13 14:31:29 +01:00
gluh@gluh.mysql.r18.ru
e78f51fbe9 Fix for bug #1564: CREATE TABLE + UNION + same table name = crash 2003-11-11 18:14:49 +04:00
serg@sergbook.mylan
a1199c7749 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
2003-11-08 16:00:00 +01:00
serg@sergbook.mylan
cdd8a2a9a5 fulltext.test, fulltext.result, ft_nlq_search.c:
a bug in latin1_german2 FT fixed
2003-11-08 15:41:24 +01:00
serg@sergbook.mylan
05b3ff393f fulltext.test, fulltext.result:
one simple trunc* test
2003-11-08 15:39:10 +01:00