pem@mysql.com
12187684ca
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
konstantin@oak.local
d37da004f6
THD::lex now points to THD::main_lex like in 5.0
...
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
monty@mysql.com
8aeb63dd3b
Update VC++ files
...
Portability fixes
After merge fixes
2003-11-21 01:53:01 +02:00
monty@mysql.com
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
monty@mashka.mysql.fi
cab1dc628c
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
...
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
2003-11-18 13:47:27 +02:00
serg@serg.mylan
13b5f71844
post-merge fixes
2003-10-31 15:49:59 +01:00
serg@serg.mylan
74551a72ec
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-31 10:34:34 +01:00
igor@rurik.mysql.com
f29ed57531
Merge
2003-10-30 10:45:28 -08:00
serg@serg.mylan
6e17f4f20d
fixes to Bitmap class
2003-10-24 22:44:48 +02:00
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
serg@serg.mylan
50d9b95b77
merged
2003-10-15 12:25:44 +02:00
serg@serg.mylan
8cc3951c8f
key_map with more that 64 bits width
2003-10-11 13:06:55 +02:00
igor@rurik.mysql.com
17aecac32c
Manual merge after improving concurrency for key cache reassignment
2003-10-01 20:16:36 -07:00
igor@rurik.mysql.com
8e5c62190f
Many files:
...
Improved concurrency for key cache reassignment
2003-10-01 18:20:07 -07:00
monty@narttu.mysql.fi
6905d7963e
Don't print warnings about 'setrlimit' if --warnings is not given
...
Code review/cleanup of sub subselect_uniquesubquery_engine
2003-09-29 12:39:38 +03:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03:00
serg@serg.mylan
755455e15c
merged
2003-09-03 12:07:18 +02:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
igor@rurik.mysql.com
40193a7fa5
Manual merge
2003-08-26 00:13:22 -07:00
monty@narttu.mysql.fi
2c1f1206c3
Better fix for myisamchk --sort-index on windows
...
Fixed deadlock bug when doing resize of key buffer while key buffer was in active use
2003-08-25 17:19:44 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
serg@serg.mylan
835e00661d
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-09 23:48:57 +02:00
igor@rurik.mysql.com
994a1ea337
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-09 12:57:39 -07:00
serg@serg.mylan
79922d946a
table checksum background:
...
my_checksum() mysys function
NISAM checksum code moved from mysys to isam/ - it's obsolete
MyISAM checksum code moved to mysys
table's checksum accessible from sql layer
SHOW TABLE STATUS shows checksum (WL#646)
code cleanup
2003-08-05 21:14:15 +02:00
igor@rurik.mysql.com
9306f55d8e
Many files:
...
Added key cache assignment
mi_locking.c:
Added key cache assignment: correction
my_sys.h:
Added key cache variable structure
2003-08-02 02:43:18 -07:00
Sinisa@sinisa.nasamreza.org
1167e170d2
Merge
2003-07-19 18:49:04 +03:00
hf@deer.(none)
cb310f763a
Fix for #712 with Serg's suggestions
2003-07-19 18:17:29 +05:00
igor@rurik.mysql.com
42e1296e9d
mi_keycache.c:
...
new file
Many files:
Added CACHE INDEX command
2003-07-16 12:30:49 -07:00
hf@deer.(none)
9b4ebf3d29
Proposed bugfix for #712
...
Monty revoked any locks for temporary tables in
ha_myisam::external_lock()
But further code bans using write cache on nonlocked tables
this makes operations much slower
2003-07-14 12:40:58 +05:00
monty@mashka.mysql.fi
b2cbd83913
Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS
...
Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup
2003-07-08 23:58:04 +03:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
Sinisa@sinisa.nasamreza.org
862506b6af
Derived tables bug fix .......
2003-06-12 16:52:36 +03:00
igor@rurik.mysql.com
a0f3dcc3c8
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
f547f2769f
Many files:
...
New feature: preload indexes into key cache.
mi_preload.c:
new file
Many files:
Added preload statement.
2003-06-12 04:29:02 -07:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
vva@eagle.mysql.r18.ru
afd581edd3
made lex a pointer in THD
2003-05-05 14:54:37 -04:00
serg@serg.mylan
12e53eb9e1
parallel-repair available in mysqld
2003-05-04 18:43:37 +02:00
hf@deer.mysql.r18.ru
f331568042
Fix for #126
2003-04-16 21:37:22 +05:00
hf@deer.mysql.r18.ru
5d4e9f95f2
Merging
2003-04-08 19:43:24 +05:00
hf@deer.mysql.r18.ru
0428d08606
SCRUM
...
two KILL versions
code trimming with headquarter's suggestions
2003-04-08 19:18:33 +05:00
monty@narttu.mysql.fi
a7708c7904
Merge with 4.0
2003-04-03 21:19:12 +03:00
monty@narttu.mysql.fi
8f957e6ab5
Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 13:08:28 +03:00
monty@narttu.mysql.fi
e96c75fec0
Fixed bug in memory allocation that could affect 64 bit systems (affected hammer)
2003-04-03 13:07:42 +03: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
hf@genie.(none)
f8f0b70380
SCRUM
...
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05: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