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

3761 commits

Author SHA1 Message Date
pem@per-erik-martins-dator.local
64552a658d Implemented DEFAULT for DECLARE variables. 2003-03-30 13:25:43 +02:00
Sinisa@sinisa.nasamreza.org
c027af6459 Fix for a crashing bug in union. 
Parameters for temporary tables were created locally in the function
and it's address passed to a field in select_result, which produced
random errors when MyISAM table was created based on this bogus
address.
 2003-03-29 16:41:01 +02:00
pem@mysql.com
017ba13005 Check for thd->killed in execution loop. (Makes more graceful behaviour in 
certain interrupt cases.)
 2003-03-28 17:02:31 +01:00
Sinisa@sinisa.nasamreza.org
65b9f4a306 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-28 16:58:52 +02:00
Sinisa@sinisa.nasamreza.org
165b3960be Fixing crashing bugs as reported in bugs database 
#195
 2003-03-28 16:57:03 +02:00
bell@sanja.is.com.ua
05982c8501 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2003-03-28 16:18:27 +02:00
bell@sanja.is.com.ua
e4bc744d9b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qcvar-4.1
 2003-03-28 16:18:26 +02:00
bar@bar.mysql.r18.ru
e805e8c8c7 sql_yacc.yy: 
Fix for possible failure reason on big-endian machines
  ,
 2003-03-28 18:18:26 +04:00
hf@deer.mysql.r18.ru
17176c8330 small addition to fix of truncating in replace 2003-03-28 18:18:22 +04:00
hf@deer.mysql.r18.ru
1dd380fb06 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.rpc
 2003-03-28 05:50:58 +04:00
hf@deer.mysql.r18.ru
1c931b97e6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.rpc
 2003-03-28 00:07:13 +04:00
pem@mysql.com
9b6d015a85 ...and got rid of the strncasecmps too. 2003-03-27 17:47:25 +01:00
pem@mysql.com
ac44a5f66e Replaced a couple of strcasecmps. 2003-03-27 17:35:27 +01:00
Sinisa@sinisa.nasamreza.org
85fb265c3c Fixing a bug #195 
Fixing UNION's popping up in slow query log
 2003-03-27 16:11:01 +02:00
monty@mashka.mysql.fi
ef4db1377f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-03-27 14:17:51 +02:00
monty@mashka.mysql.fi
7d09120105 After merge fixes 2003-03-27 14:15:42 +02:00
monty@mashka.mysql.fi
7f2fb977a2 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-03-27 13:54:22 +02:00
pem@mysql.com
c77699ca93 Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
heikki@hundin.mysql.fi
034d02f55b mysqld.cc: 
Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction
 2003-03-27 12:17:27 +02:00
bar@bar.mysql.r18.ru
f9f99378c4 lex.h: 
GeometryCollectionFromText is now alias for GeomCollFromText
 2003-03-27 13:46:56 +04:00
bar@bar.mysql.r18.ru
0989db3e90 More OpenGIS compatibility: 
Point, MultiLine, Poligom, etc, are now not aliases
for Geometry, but separate field types.
 2003-03-27 13:09:09 +04:00
bell@sanja.is.com.ua
a5222e1c69 fixed problem of port without host in SHOW PROCESSLIST (bug 189) 2003-03-26 22:04:20 +02:00
hf@deer.mysql.r18.ru
5b65745584 Fix of the #173 bug 
(Truncating of Replace result)
 2003-03-26 23:31:42 +04:00
monty@mashka.mysql.fi
3bed7a6131 Merge with 4.0.13 2003-03-26 18:37:38 +02:00
Sinisa@sinisa.nasamreza.org
5754decd5b Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-26 16:32:14 +02:00
pem@mysql.com
483efba239 Fixed save/restore of current database when calling a procedure. 2003-03-26 15:02:48 +01:00
monty@mashka.mysql.fi
ff12a11829 Fix for stack size checking on Solaris. 2003-03-26 14:51:22 +02:00
monty@mashka.mysql.fi
a34bc8eef7 Fix for glibc with small stack size (fixes bug when running crash-me) 2003-03-26 14:11:17 +02:00
pem@mysql.com
2578564725 Added IF EXISTS to DROP PROCEDURE|FUNCTION. 
Changed another unecessary use of Item_string into LEX_STRING (in sp_pcontext).
 2003-03-26 12:29:58 +01:00
bar@bar.mysql.r18.ru
3f777ceff3 greek.xml: 
Comments why "greek" is ISO greek
 2003-03-26 14:11:04 +04:00
bar@bar.mysql.r18.ru
4e06f1f5bd German Phone book collation is always compiled 
Some collation names have been renamed
 2003-03-26 13:27:19 +04:00
vva@eagle.mysql.r18.ru
af61a4c7fa Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
 2003-03-25 19:58:40 -04:00
vva@eagle.mysql.r18.ru
e1173e70a5 fix bug with parameters of LOAD DATA INFILE in exec_event 2003-03-25 19:57:38 -04:00
guilhem@mysql.com
cc899529dc Fix for small bug #186 (If a connection has temporary tables and does 
RESET MASTER, this breaks replication).
In the slave SQL thread, any DROP TEMPORARY TABLE is silently
converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant
"table does not exist". See comments in code or bug #186 for an example
of how irrelevant errors like this can arise.
 2003-03-25 16:52:48 +01:00
lenz@mysql.com
3872d04717 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/suse80/my/mysql-4.1
 2003-03-25 14:29:50 +01:00
lenz@mysql.com
1c3047360c - fixed comments so mysql_copyright does not eat the whole files 2003-03-25 13:46:10 +01:00
bar@bar.mysql.r18.ru
0f7c02f5fa SHOW CHARACTER SET now can display comments 
Low case letters are used in charset names
 2003-03-25 16:12:49 +04:00
Sinisa@sinisa.nasamreza.org
43542b24cf Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-25 14:04:22 +02:00
monty@narttu.mysql.fi
a71abe822d Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-03-25 13:07:02 +02:00
monty@narttu.mysql.fi
9a7b0ef83d Fixed bug with GROUP BY and alias 2003-03-25 13:06:20 +02:00
bar@bar.mysql.r18.ru
a55138fd94 sql_string.cc: 
NATIONAL CHARACTER() has latin1 charset now.
  Reasons are (by Monty):
  I think we should keepy having latin1 (default configure option)
  as the national character set.  The reason for this is simple that:

- This is ok for a large part of the world.
- It's faster and takes less space than utf8.
 2003-03-25 14:54:07 +04:00
bar@bar.mysql.r18.ru
43a04aa9fc sql_show.cc: 
LIKE was used against wrong name
 2003-03-25 13:42:01 +04:00
bar@bar.mysql.r18.ru
3a453df6c2 Two separate commands: SHOW COLLATION and SHOW CHARACTER SET 2003-03-25 13:38:05 +04:00
bar@bar.mysql.r18.ru
1c5dd1f533 Collation names have been renamed to common style 2003-03-25 12:07:46 +04:00
monty@narttu.mysql.fi
028c35847f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-03-25 02:38:03 +02:00
monty@narttu.mysql.fi
5f5c367361 Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's) 
Changed keycache variables to start with my_ instead of _my_
 2003-03-25 02:37:41 +02:00
monty@narttu.mysql.fi
8b5ce819db Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME; 2003-03-24 23:24:45 +02:00
bar@bar.mysql.r18.ru
d277db7f40 item_strfunc.cc: 
Fixed that concat() didn't set character set in val_str
  concat_ws() now honors coercibility
 2003-03-24 20:01:05 +04:00
Sinisa@sinisa.nasamreza.org
8e83aad485 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-24 17:50:24 +02:00
bar@bar.mysql.r18.ru
9755e44f2e item_strfunc.cc: 
The result didn't return proper collation
 2003-03-24 19:33:44 +04:00
bar@bar.mysql.r18.ru
d37ebc34c2 item_strfunc.cc: 
A bug has been fixed. ELT() didn't honor the second argument.
  Coercibility support has been added.
 2003-03-24 19:23:43 +04:00
Sinisa@sinisa.nasamreza.org
ad426b8962 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-24 15:04:01 +02:00
jani@rhols221.adsl.netsonic.fi
c7f224ca51 Reverted fix away from 4.0, because it may in rare circumstanses 
cause compatibility problems. Fix will be enabled in 4.1.
 2003-03-23 11:30:45 +02:00
jani@hynda.(none)
6112e67d64 Added error in case auto_increment and default where defined 
at the same time.
 2003-03-22 19:55:09 +02:00
guilhem@mysql.com
17537ba797 Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slave 
Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.
 2003-03-22 15:22:59 +01:00
guilhem@mysql.com
03fbbb7aef Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-03-21 21:10:20 +01:00
guilhem@mysql.com
b90c91a710 Fix for bug #174 (charset 0 caused segfault) 2003-03-21 21:08:56 +01:00
monty@narttu.mysql.fi
99549a93d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-03-21 18:54:53 +02:00
monty@narttu.mysql.fi
112dfa5900 Fixes for fill_help_tables.sql 2003-03-21 18:53:55 +02:00
bar@bar.mysql.r18.ru
6b18a618eb item_cmpfunc.cc: 
IFNULL() now honors collations
 2003-03-21 19:02:07 +04:00
bar@bar.mysql.r18.ru
b3e89e3b21 IF() and LEAST() now honors coercibility 2003-03-21 18:31:41 +04:00
bar@bar.mysql.r18.ru
c87303d4a2 All charset related actions have been moved from fix_fields() to fix_length_and_dec() 2003-03-21 17:21:45 +04:00
bar@bar.mysql.r18.ru
8f86a0d3f6 sql_yacc.yy: 
Reduce/reduce conflict
  fix.
 2003-03-21 15:44:15 +04:00
bar@bar.mysql.r18.ru
4532985221 New variable to turn off automatic charset conversion of query results 
Some speed improvements
 2003-03-21 15:18:52 +04:00
bar@bar.mysql.r18.ru
e6f30b3588 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-03-21 12:05:04 +04:00
bar@bar.mysql.r18.ru
c8954520ba COLLATE precedence bug has been fixed: 
"a LIKE b COLLATE c"  worked as "(a LIKE b) COLLATE c" which is not right
 2003-03-21 12:04:08 +04:00
bell@sanja.is.com.ua
2a410e95db Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/work-qcfile-4.0
 2003-03-21 10:03:43 +02:00
hf@genie.(none)
23a5413bbf Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into genie.(none):/home/hf/work/mysql-4.1.lck
 2003-03-21 11:54:13 +04:00
bar@bar.mysql.r18.ru
682435db72 A separate variable national_charset_info 
Fixes according coercibility tables, p162, SQL Complete
 2003-03-21 11:21:01 +04:00
hf@genie.(none)
43d3472642 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into genie.(none):/home/hf/work/mysql-4.1.lck
 2003-03-21 11:06:15 +04:00
hf@genie.(none)
d00b3ba511 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into genie.(none):/home/hf/work/mysql-5.0.kil
 2003-03-21 10:06:04 +04:00
hf@genie.(none)
dd49c33f20 SCRUM 
two versions of KILL implementation
 2003-03-21 09:37:01 +04:00
monty@narttu.mysql.fi
e5a949b441 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-03-20 21:35:17 +02:00
monty@narttu.mysql.fi
f8cd1e7906 After merge fixes 
Fixed bug in Item::set_name()
Fix for memory leak with geometry type
 2003-03-20 21:35:03 +02:00
Sinisa@sinisa.nasamreza.org
d027e4c035 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-20 21:10:04 +02:00
bar@bar.mysql.r18.ru
93cfdcdf92 item_cmpfunc.cc: 
cmp_charset was not initialized
  valgrind fix
  LIKE now works according to coercibility rules
 2003-03-20 22:43:40 +04:00
bar@bar.mysql.r18.ru
6814c8d36a SELECT N'string' 2003-03-20 22:01:03 +04:00
ram@mysql.r18.ru
982c49dc19 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
 2003-03-20 20:57:07 +04:00
ram@mysql.r18.ru
396438a83b R-tree bug fixes. 2003-03-20 20:55:53 +04:00
bar@bar.mysql.r18.ru
818ddf850b NATIONAL CHARACTER VARYING(n) 
NATIONAL CHAR VARYING(n)
NCHAR VARYING(n)

are now aliases for

VARCHAR(n) CHARACTER SET utf8
 2003-03-20 20:04:21 +04:00
bar@bar.mysql.r18.ru
f187ed9efb NCHAR(n) and NATIONAL CHARACTER(n) 
is now synonim for
CHARACTER(n) CHARACTER SET utf8
 2003-03-20 19:31:01 +04:00
bar@bar.mysql.r18.ru
77fb60e9fc New syntax for character strings: 
SELECT _latin1 0x345678;
SELECT _latin x'345678';
 2003-03-20 19:11:15 +04:00
serg@serg.mysql.com
ce016df883 another bad merge fixed 2003-03-20 12:09:20 +01:00
pem@mysql.com
0d95f36a12 Post post merge fix. Made the broken ip test work again. 2003-03-20 11:57:05 +01:00
serg@serg.mysql.com
67fff29100 fixed bad merge (s/rnd/my_rnd/) 2003-03-20 11:48:02 +01:00
pem@mysql.com
30517cef9f Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/pem/work/mysql-4.1
 2003-03-20 10:13:23 +01:00
pem@mysql.com
0694d567f0 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/pem/work/mysql-4.0
 2003-03-20 10:04:37 +01:00
monty@narttu.mysql.fi
9f200ede0d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-03-20 02:06:08 +02:00
monty@narttu.mysql.fi
b883a9c01c Merge with 4.0.12 2003-03-19 22:25:44 +02:00
monty@narttu.mysql.fi
584729430a Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-03-19 21:56:14 +02:00
monty@narttu.mysql.fi
68ca84dbd1 Print right hostname or IP in SHOW PROCESSLIST 
Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists
 2003-03-19 21:43:41 +02:00
monty@narttu.mysql.fi
48a9c1239c Added support for ULONG division with DIV 
Fixed non fatal memory leak in slave code.
 2003-03-19 21:23:13 +02:00
Sinisa@sinisa.nasamreza.org
75f8e28e18 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-19 20:27:11 +02:00
bar@bar.mysql.r18.ru
22cb247c74 Strings comparison is now done according to "Collating sequences used for 
comparison" table, "SQL Complete, Really", page 162
 2003-03-19 19:13:28 +04:00
bar@bar.mysql.r18.ru
3c455e314b Produce an error when arguments are not compatible for CONCAT() 2003-03-19 17:24:46 +04:00
pem@mysql.com
e7814e398e Fixed a few typos, and translated new messages. 2003-03-19 14:13:37 +01:00
pem@mysql.com
9bdeb7782a Fixed lots of typos, and translated a few messages. 2003-03-19 14:04:30 +01:00
lenz@mysql.com
ad32b455bc Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.0-build
 2003-03-19 13:40:24 +01:00
bar@bar.mysql.r18.ru
f63218b39a Getting closer to be more SQL99 in dyadic operations 2003-03-19 15:55:17 +04:00
pem@mysql.com
6822eb5ec0 Post-merge fixes. 2003-03-19 11:36:32 +01:00
monty@narttu.mysql.fi
056e88fe24 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-03-19 00:47:38 +02:00
monty@narttu.mysql.fi
386411b5ba Allow optimzation of multi-table-update also for InnoDB tables 
MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times
 2003-03-19 00:45:44 +02:00
lenz@mysql.com
04071da35a - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported 
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)
 2003-03-18 22:14:02 +01:00
pem@mysql.com
4a171efd6f Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
Sinisa@sinisa.nasamreza.org
33f6afb106 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-18 16:09:40 +02:00
bar@bar.mysql.r18.ru
8103c4c537 CONVERT class was removed 2003-03-18 17:01:32 +04:00
ram@mysql.r18.ru
031ac2a7b2 SRID support. 
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
 2003-03-18 15:30:32 +04:00
bar@bar.mysql.r18.ru
0137c812dc SHOW CREATE TABLE didn't display field names in the proper charset 2003-03-18 13:42:45 +04:00
monty@narttu.mysql.fi
a916a03916 Fixes to avoid errors from valgrind 
Fixed problem with 'wrong packet number' in union
 2003-03-18 11:17:48 +02:00
bar@bar.mysql.r18.ru
7549a76c7c Replication were broken because of automatic charset conversion. 
As a fix, my_charset_bin is now used in master-slave packets instead
of system_charset_info.
 2003-03-18 11:34:19 +04:00
bar@bar.mysql.r18.ru
9ed0bb2156 sql_yacc.yy: 
SET NAMES BINARY now works
 2003-03-18 10:02:57 +04:00
monty@narttu.mysql.fi
c2fa342d53 Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables 2003-03-18 03:19:20 +02:00
monty@narttu.mysql.fi
052edd98d4 Test of range optimizer in InnoDB 2003-03-18 03:16:12 +02:00
monty@narttu.mysql.fi
85de222334 Fix of 'halloween bug' with UPDATE of InnoDB tables. 2003-03-18 02:51:16 +02:00
wax@kishkin.ru
12f1cb55b5 This is full commit of group_concat with support subselects 2003-03-18 04:07:40 +05:00
guilhem@mysql.com
87e1c552ed New variable rli->ignore_log_space_limit to resolve 
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small. This fixes bug #79.
 2003-03-17 22:51:56 +01:00
Sinisa@sinisa.nasamreza.org
766673c8c1 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-17 21:29:38 +02:00
bar@bar.mysql.r18.ru
04db86f22a 2003-03-17 21:56:34 +04:00
monty@narttu.mysql.fi
3ec97824b7 Change dbug.h -> my_dbug.h (Portability fix) 
Ensure that \ is not allowed in filenames, even on Unix
 2003-03-17 19:06:14 +02:00
Sinisa@sinisa.nasamreza.org
c2cde48001 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-03-17 15:53:43 +02:00
bar@bar.mysql.r18.ru
c7b3eeb178 sql_show.cc: 
Bug fix
  0 stayed for length here, now it is charset.
 2003-03-17 17:30:34 +04:00
Sinisa@sinisa.nasamreza.org
2ebfb836ab A fix for a bug reported by Per Erik Martin, partaining to 
usage of expressions whose result are to be saved into user vars.
 2003-03-17 15:16:26 +02:00
monty@narttu.mysql.fi
5dd970c335 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-03-17 15:06:06 +02:00
monty@narttu.mysql.fi
e7288f279e After merge fixes 
Don't create temporary objects with no table name
 2003-03-17 15:05:04 +02:00
bar@bar.mysql.r18.ru
63a307bb38 sql_string.cc: 
Copy as is if src or dst are binary
 2003-03-17 13:40:40 +04:00
bar@bar.mysql.r18.ru
caf31a0790 Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
bar@bar.mysql.r18.ru
e00c9fa7d5 sql_select.cc: 
binary comparing alway must be used, because sort_string() is executed for textual data.
 2003-03-17 10:47:08 +04:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
monty@mashka.mysql.fi
ce7db2827e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-03-16 16:34:55 +02:00
monty@mashka.mysql.fi
b879a40120 Write binlog before commit when doing INSERT ... SELECT 2003-03-16 16:28:30 +02:00
mysql@home.(none)
c6efa7a8b7 New function my_charset_same() 2003-03-16 17:19:24 +04:00
root@home.(none)
5c6c54c09a system_charset_info has been moved to /sql directory 
and isn't used in libraries any longer
 2003-03-16 12:30:10 +04:00
root@home.(none)
f71a7e4b05 set_default_charset() is not used anymore 
Some system_charset_info were removed
 2003-03-16 10:56:14 +04:00
bar@bar.mysql.r18.ru
dfe65d3281 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-03-15 17:25:41 +04:00
bar@bar.mysql.r18.ru
59f6e35cf6 sql_parse.cc, sql_db.cc: 
less system_charset_info
 2003-03-15 17:24:21 +04:00
bell@sanja.is.com.ua
1a8227d1c1 Merge 2003-03-15 14:16:57 +02:00
bell@sanja.is.com.ua
1e733bb8ab Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
 2003-03-15 13:35:40 +02:00
bar@bar.mysql.r18.ru
d09f865d4f sql_lex.cc: 
Use LEX charset instead of system one
 2003-03-15 15:19:06 +04:00
bell@sanja.is.com.ua
65fe679d91 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
 2003-03-15 13:04:34 +02:00
serg@serg.mysql.com
15dbe91a6e fixed typo (double ++ in assert) 
removed all side effects from asserts for not to confuse casual reader
 2003-03-15 11:56:03 +01:00
bell@sanja.is.com.ua
587196984d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
 2003-03-15 11:24:44 +02:00
monty@mashka.mysql.fi
968e9a73d4 merge with 3.23 to get: 
- Fix for empty table/column names
 2003-03-15 04:41:57 +02:00
monty@mashka.mysql.fi
a6482b1304 Code cleanup 2003-03-15 04:34:06 +02:00
monty@mashka.mysql.fi
369da47836 Code cleanup 2003-03-14 23:06:55 +02:00
serg@serg.mysql.com
15ff383e20 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2003-03-14 20:25:50 +01:00
serg@serg.mysql.com
9749ece292 cleanup 2003-03-14 20:22:06 +01:00
venu@myvenu.com
88df7b695b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-03-14 10:44:08 -08:00
venu@myvenu.com
3f7e4239a2 Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format 
(normal protocol only, prepared protocol already handles it)
 2003-03-14 10:35:13 -08:00
monty@mashka.mysql.fi
2cb3a5d264 Merge bk-internal.mysql.com:/home/bk/mysql-3.23 
into mashka.mysql.fi:/home/my/mysql-3.23
 2003-03-14 17:11:38 +02:00
monty@mashka.mysql.fi
5ee1dbbe58 Check for empty table/column names 2003-03-14 17:08:42 +02:00
monty@mashka.mysql.fi
8887929a66 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-03-14 17:03:42 +02:00
bar@bar.mysql.r18.ru
26e6fb0e24 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-03-14 18:11:20 +04:00
bar@bar.mysql.r18.ru
b009386fa4 Every charset now have its own parser state arrays 2003-03-14 18:08:12 +04:00
bell@sanja.is.com.ua
50d3fc7d43 fixed uncachable union (bug #150) 2003-03-14 14:16:09 +02:00
hf@genie.(none)
dbfaa445e0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into genie.(none):/home/hf/work/mysql-4.1.lck
 2003-03-14 13:12:04 +04:00
hf@genie.(none)
410782fd5f SCRUM 
IS_USED_LOCK('lock') implementation
 2003-03-14 13:10:33 +04:00
heikki@hundin.mysql.fi
613daa0d21 ha_innobase.cc: 
Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
 2003-03-13 23:10:50 +02:00
heikki@hundin.mysql.fi
bd14136331 ha_innodb.cc: 
Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
 2003-03-13 23:09:25 +02:00
serg@serg.mysql.com
860e8099ab Merge 2003-03-13 18:51:50 +01:00
serg@serg.mysql.com
ff86765a4d fix for crash with small sort_buffer 2003-03-13 18:46:40 +01:00
serg@serg.mysql.com
f590fa7ce2 merged 2003-03-13 17:57:24 +01:00
monty@mashka.mysql.fi
6c81552dd3 Better fix for GRANT bug 2003-03-13 16:43:43 +02:00
serg@serg.mysql.com
1608ce3c52 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2003-03-13 14:47:58 +01:00
lenz@mysql.com
ced5770aba - fixed newly added DBUG_RETURN to DBUG_VOID_RETURN (compile failed with 
"DBUG_RETURN undeclared" on Mac OS X)
 2003-03-13 13:52:15 +01:00
serg@serg.mysql.com
026ec1d37c merged 2003-03-13 13:44:03 +01:00
bar@bar.mysql.r18.ru
b5bc52c7ae Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-03-13 16:23:48 +04:00
bar@bar.mysql.r18.ru
3d5286d7bc sql_lex.cc: 
Move all charset recoding to the same place
 2003-03-13 16:23:18 +04:00
bar@bar.mysql.r18.ru
b4c8ecd8bc filesort.cc, sql_analyse.cc, item_func.cc, item_strfunc.cc, field.cc: 
Unnesessary binary() calls have been removed
 2003-03-13 15:34:46 +04:00
serg@serg.mysql.com
a4241f92cc Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2003-03-13 11:23:34 +01:00
gluh@gluh.mysql.r18.ru
7fa51a2320 Fix for embeded library compile 2003-03-13 14:12:28 +04:00
serg@serg.mysql.com
e10fd44489 Merge bk-internal:/home/bk/mysql-3.23/ 
into serg.mysql.com:/usr/home/serg/Abk/mysql
 2003-03-13 10:53:58 +01:00
serg@serg.mysql.com
9b604c88d0 better help message 2003-03-13 01:23:43 +01:00
bell@sanja.is.com.ua
91fc15fc6d added comment 2003-03-12 22:50:22 +02:00
serg@serg.mysql.com
b3c600cdbc ha_myisam.cc: 
typo fixed
 2003-03-12 18:32:27 +01:00
Sinisa@sinisa.nasamreza.org
32a636c078 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23 
into sinisa.nasamreza.org:/mnt/work/mysql
 2003-03-12 17:23:23 +02:00
Sinisa@sinisa.nasamreza.org
77eb6e5063 Better fix for "Halloween" effect ... 2003-03-12 17:11:48 +02:00
Sinisa@sinisa.nasamreza.org
d87036511b Fix for a bug with column privileges ... 2003-03-12 17:08:48 +02:00
monty@mashka.mysql.fi
a4616a92d8 Merge bk-internal.mysql.com:/home/bk/mysql-3.23 
into mashka.mysql.fi:/home/my/mysql-3.23
 2003-03-12 16:43:37 +02:00
monty@mashka.mysql.fi
88f811c8a5 NEWDATE -> DATE in anylyse() output 
Changed that analyse(#) also affects strings
 2003-03-12 16:43:01 +02:00
Sinisa@sinisa.nasamreza.org
51e5344dfe Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-03-12 14:48:00 +02:00
monty@mashka.mysql.fi
fef194fcb8 Fix for --new option (Timestamp in YYYY-MM-DD HH:MM:SS format) 2003-03-12 14:34:54 +02:00
monty@mashka.mysql.fi
d57c2019d1 Proper fix for INSERT DELAYED and --max-delayed-threads 2003-03-12 08:08:07 +02:00
monty@mashka.mysql.fi
47ec22d83f Fix for replication of INSERT | REPLACE | CREATE ... SELECT 2003-03-12 07:51:08 +02:00
monty@mashka.mysql.fi
061e673c9b Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-03-12 05:21:31 +02:00
guilhem@mysql.com
209e526af7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-03-12 01:06:21 +01:00
guilhem@mysql.com
1434bc5db1 Fix for bug #136. We must write the 
INSERT into u SELECT * from t
to the binlog
BEFORE unlocking t (which was read-locked at least in MyISAM),
and not the contrary.
 2003-03-12 01:05:04 +01:00
monty@mashka.mysql.fi
8edc752573 Simple fixes (nothing notable) 2003-03-12 01:40:06 +02:00
bell@sanja.is.com.ua
bc040b5552 Merge sanja.is.com.ua:/home/bell/mysql/mysql-3.23 
into sanja.is.com.ua:/home/bell/mysql/work-rand-3.23
 2003-03-11 22:38:32 +02:00
serg@serg.mysql.com
5585d1b6fd Merge bk-internal:/home/bk/mysql-3.23/ 
into serg.mysql.com:/usr/home/serg/Abk/mysql
 2003-03-11 21:21:11 +01:00
serg@serg.mysql.com
77dd897ead fixed an obscure bug in group by + having + Item_ref::get_date 2003-03-11 21:20:53 +01:00
monty@mashka.mysql.fi
7fdf7a4101 merge with 3.23 to get: 
- Better detection of crashed .MYI file
- Ignore writeable config files
 2003-03-11 21:45:39 +02:00
Sinisa@sinisa.nasamreza.org
4cdc097aaa Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23 
into sinisa.nasamreza.org:/mnt/work/mysql
 2003-03-11 20:09:49 +02:00
Sinisa@sinisa.nasamreza.org
40c744a3ac A bug fix for multi-table updates with InnoDB storage engine 2003-03-11 19:40:49 +02:00
bell@sanja.is.com.ua
b283e08cf3 fixed bug of unchecked random part of WHERE clause (bug #142) 2003-03-11 18:34:00 +02:00
lenz@mysql.com
a355f74bf7 - fixed C++-style comments in .c files to make IBM compiler happy 
(it barfs on these with a syntax error)
 2003-03-11 15:37:31 +01:00
Sinisa@sinisa.nasamreza.org
31248b1a77 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-03-11 15:40:09 +02:00
Sinisa@sinisa.nasamreza.org
873bc4976b Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23 
into sinisa.nasamreza.org:/mnt/work/mysql
 2003-03-11 14:42:07 +02:00
gluh@gluh.mysql.r18.ru
3d61d2d973 Conflicts relsolving 2003-03-11 16:32:17 +04:00
bell@sanja.is.com.ua
113dc05655 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
 2003-03-11 13:26:26 +02:00
bell@sanja.is.com.ua
1cbf8f7408 fixed cached constsnt determination (bug #142 related) 2003-03-11 12:43:30 +02:00