Commit graph

327 commits

Author SHA1 Message Date
vva@eagle.mysql.r18.ru
afd581edd3 made lex a pointer in THD 2003-05-05 14:54:37 -04:00
pem@mysql.com
35c82164f6 Merged 4.1 to 5.0. 2003-04-29 12:06:04 +02:00
guilhem@mysql.com
b03ec0d7db Replication: new code to not modify in-memory log positions until the COMMIT
is executed, even if the transaction spans on >=2 relay logs (bug #53).
New variable relay_log_purge =0|1
New test to verify bug #53
2003-04-24 15:29:25 +02:00
pem@mysql.com
64da2fff67 Post post-merge fix. 2003-04-17 00:34:15 +02:00
pem@mysql.com
386b0b91b2 Merged 4.1 into 5.0. 2003-04-16 23:23:23 +02:00
vva@eagle.mysql.r18.ru
02ad1b95e3 Merge 2003-04-10 10:25:21 -04:00
vva@eagle.mysql.r18.ru
950fa7aa8a added compress/uncompress function 2003-04-09 20:50:30 -04:00
hf@deer.mysql.r18.ru
5d4e9f95f2 Merging 2003-04-08 19:43:24 +05:00
pem@mysql.com
736e78251e Merging 4.1 to 5.0. 2003-04-04 13:45:35 +02:00
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
hf@genie.(none)
0ee0589e93 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into genie.(none):/home/hf/work/mysql-5.0.kil
2003-03-31 13:42:37 +05: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
pem@mysql.com
c77699ca93 Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01: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
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
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)
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
pem@mysql.com
4a171efd6f Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
wax@kishkin.ru
12f1cb55b5 This is full commit of group_concat with support subselects 2003-03-18 04:07:40 +05:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
gluh@gluh.mysql.r18.ru
3d61d2d973 Conflicts relsolving 2003-03-11 16:32:17 +04:00
Sinisa@sinisa.nasamreza.org
3ee8d6e37e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-07 21:48:22 +02:00
bar@bar.mysql.r18.ru
4b5bfe990f sql_acl.cc, item.h:
use of new argument
sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
mysql_priv.h:
  _default_charset_info has been removed
item_cmpfunc.h:
  Use cmp_charset
hostname.cc, hash_filo.h:
  Move charset to constructor argument
2003-03-07 12:21:32 +04:00
monty@mashka.mysql.fi
d56e2acf50 Merge to get fix for LOCK TABLES + DROP TABLE in another thread 2003-03-07 01:20:56 +02:00
Sinisa@sinisa.nasamreza.org
ffa8a47b6d three bug fixes and major code cleanup 2003-03-06 17:02:10 +02:00
Sinisa@sinisa.nasamreza.org
c643298984 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-05 15:45:11 +02:00
Sinisa@sinisa.nasamreza.org
9034ed296b A better, but larger fix for server_id bug .. 2003-03-05 15:34:58 +02:00
monty@narttu.mysql.fi
2a7dfa172c Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped 2003-03-04 12:22:35 +02:00
monty@narttu.mysql.fi
8c51eb2c12 Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another 2003-03-03 20:42:49 +02:00
bell@sanja.is.com.ua
b2f27a155c made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE (SCRUM) 2003-03-02 21:39:03 +02:00
pem@mysql.com
97dc6a528e Merging 4.1 into 5.0 2003-02-18 15:05:35 +01:00
monty@mashka.mysql.fi
90bf074438 Merge with 4.0.11 tree to get latest bug fixes 2003-02-17 05:43:37 +02:00
monty@mashka.mysql.fi
6051b2f998 Fixed multi-table-delete for InnoDB tables
Novell patches
2003-02-17 02:14:37 +02:00
gluh@gluh.mysql.r18.ru
2022b7b68f SCRUM: 'Replication: PURGE LOGS with date' task
Added:

PURGE [MASTER] LOGS BEFORE date/date_expression
expire-logs-days option
  With this option old files are deleted when
      - mysqld is started
      - log is rotated
      - someone does FLUSH LOGS
2003-02-16 20:39:12 +04:00
monty@mashka.mysql.fi
acf8993439 Fixed problem when connecting to user without a password.
Fixed problem with LIKE and BINARY
2003-02-14 11:47:41 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
25de9c19b2 After merge fixes & remove compiler warnings
Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files
2003-02-07 15:47:24 +02:00
monty@mashka.mysql.fi
cf9668fd37 Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)
2003-02-06 16:55:59 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
aee15a4407 merge 2003-02-04 03:27:47 +02:00
monty@mashka.mysql.fi
303c3e30ab Added charset number to result header 2003-02-04 03:19:19 +02:00
bell@sanja.is.com.ua
62902a3b4b after-review changes (577 SCRUM) 2003-02-02 23:30:01 +02:00
bell@sanja.is.com.ua
214036a7f6 improving of fields list creation in derived tables and unions
fixed length of fields created in fubselect
fixed resolving fields of reduced in derived table subselect
2003-01-29 19:42:39 +02:00
monty@mashka.mysql.fi
9e3fd09305 merge with 3.23.56 to get patches for --lower-case-table-names and
proper handling of SUM() in some functions.
2003-01-29 19:22:22 +02:00
monty@mashka.mysql.fi
d88eb71f34 Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump().
This fixes some Errcode 13 errors on Windows when deleting tables.
2003-01-29 18:56:34 +02:00
monty@mashka.mysql.fi
7811a61b5d merge 2003-01-28 20:59:41 +02:00
monty@mashka.mysql.fi
3d28913740 Only write to the error log if --log-error is specified and --console is not specified
(On Windows --log-error is enabled by default)
2003-01-28 20:56:35 +02:00
serg@serg.mysql.com
9199252c22 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-28 14:37:12 +01:00
serg@serg.mysql.com
4fb3244014 fixed "DROP table_open_in_handler" hang 2003-01-28 14:36:22 +01:00