Commit graph

11827 commits

Author SHA1 Message Date
ram@gw.mysql.r18.ru
fffe1e8424 An improvement of
ChangeSet
  1.1707 04/03/19 12:36:55 ram@gw.mysql.r18.ru +4 -0
  Fix for the bug #2976: NATURAL JOIN produces duplicate columns.
2004-03-30 15:54:26 +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
585d97b741 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-30 01:43:45 +03:00
konstantin@oak.local
19d09a2a9c Better comment. 2004-03-30 02:03:42 +04: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
3cbab63af1 Fixed wrong assert (Got failure in ctype_tis620) 2004-03-29 18:59:51 +03:00
monty@mysql.com
505970b4a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-29 17:57:59 +03:00
monty@mysql.com
e6882bbfd8 Disable INSERT DELAYED for embedded library 2004-03-29 17:57:07 +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
bar@bar.intranet.mysql.r18.ru
699dafefa2 sql_db.cc:
More clear error message.
2004-03-29 11:05:27 +05:00
konstantin@mysql.com
889790a15c Simplification: MYSQL_RES *result replaced with MYSQL_DATA result;
No need to check for result existence any more, store_result functions
now are shorter.
cli_read_binary_rows rewritten to handle MYSQL_DATA directly.
2004-03-28 17:22:04 +04:00
dlenev@brandersnatch.localdomain
9e28b7698d "Fix" for BUG #2050 "10 to 1 performance drop with server 4.1.1".
Actually it is not a bug but right behavior observed as pefomance 
degradation after we have forced Item_field::fix_fields() to 
re-execute each time when we are executing prep stmt.

This patch implements small optimization which heals this bad 
behavior. We are caching field position in TABLE::field array in
Item's member and are using this position for speeding up field
lookups in fix_fields() in case of its re-execution.
2004-03-28 04:11:54 +04:00
hf@deer.(none)
6406285849 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-03-27 15:28:15 +04:00
hf@deer.(none)
2fc0fa6670 Small fix to embedded library
we should call check_user in NO_EMBEDDED_ACCESS_CHECKS case
to do necessary initializations
2004-03-27 15:27:36 +04: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
guilhem@mysql.com
90a5e244be To save 32KB memory per thread when --log-bin is not used, we do not
init the binlog_cache (THD::transaction.trans_log).
I have checked all places where trans_log is used, because as now
it may not be inited in some cases, we have to be cautious
(will forward this commit mail to Heikki).
2004-03-26 19:11:37 +01:00
Sinisa@sinisa.nasamreza.org
ff5cbb795c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-26 17:56:24 +02:00
heikki@hundin.mysql.fi
87a279b424 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-03-26 17:49:46 +02:00
heikki@hundin.mysql.fi
86569695f7 mem0dbg.c:
Backport from 4.1: make mem_current_allocated_memory global variable
2004-03-26 17:49:02 +02:00
heikki@hundin.mysql.fi
d1622a941d mem0dbg.c:
Let mem_current_allocated_memory be a global variable, because it is used in an .ic file if UNIV_MEM_DEBUG is defined
2004-03-26 17:46:27 +02: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
bell@sanja.is.com.ua
a0f629385f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-03-26 16:19:45 +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
bell@sanja.is.com.ua
0f0239fde1 typo in comment fixed 2004-03-26 15:08:06 +02: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
b11ee0d8bb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-03-26 16:21:49 +04:00
serg@serg.mylan
072ddb0194 bad merge (?) fixed 2004-03-26 13:21:48 +01: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
serg@serg.mylan
9bf7e07b75 version updated after merge :) 2004-03-26 12:36:57 +01:00
bar@bar.intranet.mysql.r18.ru
745e130ae9 charset2html.c:
Don't print control characters
2004-03-26 14:46:42 +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