serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
konstantin@mysql.com
e9225b2588
Fix -ansi -pedantic compilation failure.
2005-02-10 17:46:27 +03:00
pem@mysql.comhem.se
51296b5399
Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc.
2005-02-10 11:40:54 +01:00
hf@deer.(none)
96558f6ad3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 02:54:08 +04:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
pem@mysql.comhem.se
2c26ebe359
WL#2130: Table locking for stored FUNCTIONs
...
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
2005-02-08 20:52:50 +01:00
gluh@gluh.mysql.r18.ru
15273035ce
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-07 11:57:14 +03:00
monty@mysql.com
80b3e02462
Fixed bug detected by sp-tests
...
Cleanup during reviews of new pushed code
2005-02-05 16:05:46 +02:00
gluh@gluh.mysql.r18.ru
be5532d36a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-03 20:46:53 +03:00
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
gluh@gluh.mysql.r18.ru
cacb8d74b4
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-03 11:12:01 +03:00
jimw@mysql.com
5f0c4ff140
Merge fixes for #8248 , #5569 .
2005-02-02 08:21:11 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a90d28eb6e
Fix compile problem - line missing.
2005-02-01 23:43:09 +00:00
jimw@mysql.com
76ff72d73f
Merge mysql.com:/home/jimw/my/mysql-4.0-5569
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-01 15:38:27 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc
WL#1967
...
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
gluh@gluh.mysql.r18.ru
92f04aedf3
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-01 12:20:03 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
941b959cb4
Bug#7011
...
Fix for merge from 4.1
2005-01-31 20:49:37 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
adb91423ac
Bug#7011
...
Merge from 4.1
2005-01-31 15:57:32 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04
Bug#7011
...
Merge from 4.0
2005-01-31 12:48:00 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
500fbf5c0f
Bug#7011
...
Fix replication for multi-update
new test - rpl_multi_update2
2005-01-30 10:24:03 +00:00
serg@serg.mylan
3c5060981f
query_id and my_xid -> ulonglong
...
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
gluh@gluh.mysql.r18.ru
6afbb3d627
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-27 20:01:37 +03:00
gluh@gluh.mysql.r18.ru
ac14d40dde
A fix: information_schema test fails on Mac OSX
2005-01-27 13:16:51 +03:00
gluh@gluh.mysql.r18.ru
a6315a8ad9
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-26 20:58:47 +03:00
jimw@mysql.com
94da57dc65
Always call vio_in_addr() so that thd->remote is
...
always initialized. (Bug #5569 )
2005-01-25 12:06:55 -08:00
konstantin@mysql.com
6c3a4aee18
Fix two typos in comments.
2005-01-25 17:25:46 +03:00
gluh@gluh.mysql.r18.ru
849ef34156
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-25 11:42:50 +03:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
gluh@gluh.mysql.r18.ru
e492c1b44e
Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG)
...
- Do not allow a column list as part of SHOW WITH WHERE task.
- The WHERE clause must accept field names which are
valid in SHOW, not INFORMATION_SCHEMA names.
2005-01-24 18:44:54 +03:00
serg@serg.mylan
79240013b2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
timour@mysql.com
36f1e91b69
Merge of fix for BUG#4258 from 4.1.
...
Needs additional manual merge.
2005-01-21 17:38:36 +02:00
timour@mysql.com
7fb0de20f3
Final patch for BUG#4285.
...
This patch collects all previous patches into one.
The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
2005-01-19 12:55:54 +02:00
serg@serg.mylan
1034677f94
XA (not completely polished out yet)
2005-01-16 13:16:23 +01:00
monty@mysql.com
7c457a1bd7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-13 20:09:41 +02:00
konstantin@mysql.com
019ff4c577
Manual merge.
2005-01-13 02:19:35 +03:00
konstantin@mysql.com
30c4d10e1a
Add logging of COM_EXECUTE in the general query log.
2005-01-13 02:13:19 +03:00
konstantin@mysql.com
f01f721672
manual merge
2005-01-12 21:51:04 +03:00
konstantin@mysql.com
2cc2844bbb
Merge mysql.com:/home/kostja/work/mysql-4.0-6761
...
into mysql.com:/home/kostja/work/mysql-4.1-root
2005-01-12 19:00:04 +03:00
konstantin@mysql.com
6058edbe18
A fix for Bug#6761 "mysql_list_fields() does not work": test
...
case will be added to client_test in 4.1
2005-01-12 17:04:45 +03:00
monty@mysql.com
314cf993c6
Fixed memory reference errors found by valgrind
2005-01-12 03:38:53 +02:00
monty@mysql.com
56fb6f31ba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-10 15:28:17 +02:00
brian@zim.(none)
75f282df27
Fix for compiling error in sql_parse
2005-01-06 16:31:18 -08:00
serg@sergbook.mysql.com
f472cec178
merged
2005-01-06 19:32:16 +02:00
bell@sanja.is.com.ua
421738e8ce
removed unused label
2005-01-06 17:08:38 +02:00
monty@mysql.com
bda0a78184
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-06 13:31:31 +02:00
monty@mysql.com
d35140a851
First stage of table definition cache
...
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
2005-01-06 13:00:13 +02:00
jimw@mysql.com
652fc10467
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-04 19:00:22 +01:00
bell@sanja.is.com.ua
a8a5f3590c
fixed bugs in view code with prepared statemnts
2005-01-04 18:04:16 +02:00
jimw@mysql.com
050e229162
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-04 02:47:48 +01:00