1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Commit Graph

2446 Commits

Author SHA1 Message Date
guilhem@mysql.com
3826a01ee4 A previous changeset by me today about SQL_LOG_BIN had the problem
that it tested the privilege in ::update() whereas it should be
in ::check() (see email from Serg, subject
"Re: bk commit - 4.1 tree (guilhem:1.1706)").
So I add instead a check_func function to sys_var_thd_bit.
I do the same addition to sys_var_thd_ulong, to unify handling
of PSEUDO_THREAD_ID with the one of SQL_LOG_BIN. So class
sys_var_pseudo_thread_id is not needed anymore, removing it.
2004-03-27 01:07:09 +01:00
guilhem@mysql.com
380134891d Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-03-26 19:29:10 +01:00
guilhem@mysql.com
8066c2ce75 Changing SET SQL_LOG_BIN so that it explicitely throws an error if
user is not SUPER, instead of setting the value but ignoring it
silently internally.
2004-03-26 19:25:22 +01:00
bar@bar.intranet.mysql.r18.ru
36e7f41d63 UTF8 now process space as PAD character correctly. 2004-03-26 18:14:39 +04:00
bar@bar.intranet.mysql.r18.ru
3aea3e92ce 1. New data types, from the user point of view:
BINARY(N) and VARBIBARY(N)
2. More 4.0 compatibility and more BINARY keyword consistency:
2a. CREATE TABLE a (a CHAR(N) BINARY) 
    is now synonym for
    CREATE TABLE a (a CHAR(N) COLLATE xxxx_bin)
2b. SELECT BINARY x
    is still synonin for
    SELECT x COLLATE xxxxx_bin.
2004-03-26 16:11:46 +04:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
monty@mysql.com
488fe61074 Updated tests after merge 2004-03-25 23:08:42 +02:00
monty@mysql.com
1448199bd7 Cleanups & safety fixes 2004-03-25 22:11:22 +02:00
monty@mysql.com
ce79eb9ca7 merge with 3.23 2004-03-25 22:05:09 +02:00
monty@mysql.com
d6f9fa0376 Improved test case
service backport from 4.0
2004-03-25 21:52:25 +02:00
monty@mysql.com
eb91f7b478 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-25 15:05:42 +02:00
monty@mysql.com
ebc3b3afac BTREE-indexes in HEAP tables can now be used to optimize ORDER BY
Don't read character set files if we are using only the default charset. In most cases the user will not anymore get a warning about missing character set files
Compare strings with space extend instead of space strip. Now the following comparisons holds:  "a" == "a " and "a\t" < "a". (Bug #3152).
Note: Because of the above fix, one has to do a REPAIR on any table that has an ascii character < 32 last in a CHAR/VARCHAR/TEXT columns.
2004-03-25 15:05:01 +02:00
bar@bar.intranet.mysql.r18.ru
ed33257c6e Bug #3290 [Ver]: Can't convert sjis&ujis half-width katakana correctly
UJIS part fix
2004-03-25 16:15:52 +04:00
bar@bar.intranet.mysql.r18.ru
1741cb88c0 #3290: Can't convert sjis&ujis half-width katakana correctly 2004-03-25 14:29:56 +04:00
hf@deer.(none)
1d5c7c2f9b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-25 12:50:23 +04:00
hf@deer.(none)
7e5a6efcf1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-25 11:38:53 +04:00
hf@deer.(none)
44e34ad816 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3264
2004-03-25 11:36:52 +04:00
hf@deer.(none)
386feb494b Fix for #3264 (FROM_DAYS doesn't work properly in range comparison)
Item_func_from_days::get_date didn't change 'hr', 'min' and some
other fields of incoming ltime, so they got random values.

bzeroing of the ltime added
2004-03-23 21:10:23 +04:00
bell@sanja.is.com.ua
19ffa1cd53 used right table for grants check (BUG#3270) 2004-03-23 17:15:20 +02:00
serg@serg.mylan
0d0910381a Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-23 15:25:45 +01:00
hf@deer.(none)
023b86b984 small addition to the fix for #3188
dropping of tables added to the testcase
2004-03-23 18:25:44 +04:00
hf@deer.(none)
87612b5294 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-23 17:58:55 +04:00
hf@deer.(none)
7ab1c2106d Fix for #3266 (garbled TEXT fields as a result of CREATE TABLE SELECT)
Problem is that Item::save_in_field modifies str_value member
 before it calls val_str but Item_copy_string::val_str just returns
this str_value as the result.
I added local String variable to the Item::save_in_field
2004-03-23 17:57:14 +04:00
serg@serg.mylan
99886df867 correct support for a mix of UNION/UNION ALL in the same query.
Bug#1428
2004-03-23 14:43:24 +01:00
hf@deer.(none)
ea2c160919 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3188
2004-03-23 13:09:50 +04:00
hf@deer.(none)
a90f34ab6b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3067
2004-03-23 11:58:04 +04:00
hf@deer.(none)
1b78e7dd41 Fix for #3067 (REPAIR TABLE reenables disabled keys) 2004-03-22 21:34:36 +04:00
Sinisa@sinisa.nasamreza.org
6c389aff75 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-22 16:36:27 +02:00
Sinisa@sinisa.nasamreza.org
2eaa07f199 union.result:
A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
union.test:
  A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
sql_union.cc:
  A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064)
2004-03-22 16:35:15 +02:00
hf@deer.(none)
182aa5bec9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-03-22 17:48:29 +04:00
bell@sanja.is.com.ua
bbb6642a66 aliases should be compared with my_strcasecmp (BUG#3251)
some db comparison code cleupup
removed compiler warnings
2004-03-22 15:43:13 +02:00
serg@serg.mylan
61a365e696 more sys_var_str fixes 2004-03-20 17:08:01 +01:00
serg@serg.mylan
10a4ed0e00 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-20 14:36:49 +01:00
serg@serg.mylan
581996393a select @@smth=@@sys_str_var crash fixed 2004-03-20 14:36:00 +01:00
monty@mysql.com
b6e5c23c26 Ensure that we use unix file format (no \r\n) for all new files
Portability fixes
2004-03-20 12:48:14 +02:00
monty@mysql.com
82c79134b0 merge with 4.0 to get portability fixes 2004-03-19 18:35:49 +02:00
monty@mysql.com
b49b24d94a Added test to show bug in current union implementation
After merge fixes
Portability fixes
2004-03-19 18:33:38 +02:00
monty@mysql.com
9a1baf7d62 Portability fixes
Fixed some wrong column specifications in mysql_fix_privilege_tables
2004-03-19 18:26:02 +02:00
monty@mysql.com
933278a52b merge with 4.0 (to get compiler error fixes for innodb) 2004-03-19 15:17:56 +02:00
monty@mysql.com
b7fc7188d0 Portability fixes
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
2004-03-19 14:52:48 +02:00
bar@bar.intranet.mysql.r18.ru
66631a3c1e Bug #3087 CONCAT_WS makes the server die in case of illegal mix of collations 2004-03-19 12:09:14 +04:00
bar@bar.intranet.mysql.r18.ru
f897144c4e Bug #2821 Table default character set affects LONGBLOB fields 2004-03-19 11:37:49 +04:00
guilhem@mysql.com
32feac3093 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-03-18 19:31:06 +02:00
guilhem@mysql.com
244304fdbb Fix for BUG#3204 ""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs":
we now detect that the server is sending us a log which we did not request
by testing the info in the fake Rotate event.
I also changed code to not print the fake Rotate which describes the
log we asked for (it's always the first received event but old masters
may not send it).
2004-03-18 19:29:07 +02:00
hf@deer.(none)
e93b933ade Fix for #3188 2004-03-18 16:49:48 +04:00
serg@serg.mylan
47747685a3 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-18 11:04:36 +01:00
serg@serg.mylan
1c658417b1 make DROP DATABASE to behave as documented in the manual - to report number of files deleted 2004-03-18 11:03:24 +01:00
monty@mysql.com
53c810cda4 merge fixes (use old code) 2004-03-18 00:16:04 +02:00
monty@mysql.com
f34a642d6e after merge fixes 2004-03-18 00:09:13 +02:00
vva@eagle.mysql.r18.ru
b28a13c028 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
2004-03-17 21:04:49 +04:00