mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
11729 commits 2784 branches 343 tags 1.6 GiB
Commit graph

3041 commits

Author SHA1 Message Date
bar@bar.intranet.mysql.r18.ru
b92dd45da4 ALTER TABLE t1 CONVERT TO should also change the default character set. 
Forgot to do it in the previous commit.
 2004-03-30 22:18:49 +05:00
bar@bar.intranet.mysql.r18.ru
dba73e1c86 More different syntaxes for (1) modifying the default charaset/collation 
and for (2) converting the columns:

1.  ALTER TABLE t1 [DEFAULT] CHARACTER SET xxx [COLLATE yyy]
2.  ALTER TABLE t1 CONVERT TO CHARACTER SET xxx [COLLATE yyy]
 2004-03-30 21:33:45 +05:00
ram@gw.mysql.r18.ru
3bfbe6e0dd resolving conflicts 2004-03-30 16:04:08 +05:00
monty@mysql.com
4bc6b551f8 false/true -> FALSE/TRUE 
Fixes after last merge
 2004-03-30 02:32:41 +03:00
monty@mysql.com
38ab8ddb22 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-03-30 01:02:21 +03:00
monty@mysql.com
8ab16104e8 Fix test results when you are in daylight saving time 2004-03-30 01:01:31 +03:00
monty@mysql.com
dc2f606fb8 Merge with 4.0 to get lastest bug fixes 2004-03-29 19:21:53 +03:00
monty@mysql.com
7e161ae070 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-03-29 17:27:25 +03:00
bar@bar.intranet.mysql.r18.ru
928e796e67 Better error messages for not nullable 
SET character_set_xxx=NULL
and
SET collation_xxx=NULL
 2004-03-29 18:33:24 +05:00
bar@bar.intranet.mysql.r18.ru
11f14e0050 Better tests for BINARY 2004-03-29 17:27:30 +05:00
bar@bar.intranet.mysql.r18.ru
f84f6d5cdb Checking Thai sort order and trailing spaces handling 2004-03-29 16:38:38 +05:00
guilhem@mysql.com
19f0843f3f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-03-27 01:08:29 +01:00
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
vva@eagle.mysql.r18.ru
c81bf339c2 some cleanup of last patch for BUG #2342 2004-03-27 02:37:05 +04:00
vva@eagle.mysql.r18.ru
8a66c13b34 fixed bug #2342 
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"
 2004-03-27 02:29:31 +04:00
vva@eagle.mysql.r18.ru
1eff4744f1 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2342/mysql-4.0
 2004-03-27 00:41:48 +04:00
vva@eagle.mysql.r18.ru
23d30c397d fixed bug #2342 
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"

1. added new status HA_ADMIN_REJECT and processing of it in mysql_admin_table
2. got ha_berkley::analyze to return HA_ADMIN_REJECT if there are any 
 transactions with the table..
 2004-03-27 00:35:45 +04: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
Sinisa@sinisa.nasamreza.org
e2b48a2232 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-03-26 17:01:55 +02:00
Sinisa@sinisa.nasamreza.org
09d26f0ff6 order_by.result: 
result of the test case for FORCE INDEX on ORDER BY
order_by.test:
  test case for FORCE INDEX on ORDER BY
sql_select.cc:
  Changing behaviour that MySQL server takes FORCE INDEX clause into account when optimising ORDER BY clause
 2004-03-26 17:01:13 +02:00
bar@bar.intranet.mysql.r18.ru
36e7f41d63 UTF8 now process space as PAD character correctly. 2004-03-26 18:14:39 +04:00
monty@mysql.com
baa45774d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-03-26 14:45:13 +02:00
monty@mysql.com
48680ee3a0 Allow keys with 0 segements in MyISAM 
This fixed a bug in SELECT DISTINCT when all selected parts where constants. (Bug #3203)
 2004-03-26 14:44:52 +02: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
447baa9011 After merge fixes + simple optimizations 2004-03-26 11:06:53 +02:00
bell@sanja.is.com.ua
9ed179ee8e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
 2004-03-26 10:53:13 +02: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
3b34a6a2dd Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-03-25 22:18:31 +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
pem@mysql.com
e5f9e18d2f Merge fix. 2004-03-25 17:48:00 +01:00
pem@mysql.comhem.se
6395822932 Fixed BUG#3117: LAST_INSERT_ID() works incorrectly inside stored procedure. 
This turned out to be a problem for prepared statements as well; the id was
evaluated once, at parse time.
 2004-03-25 17:42:13 +01: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