brian@brian-akers-computer.local
054e0e1712
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into brian-akers-computer.local:/Users/brian/mysql/optimize-5.0
2005-07-10 22:27:36 -07:00
brian@brian-akers-computer.local
2ff7ce856b
Fixed 32bit issue, reworked error logic for open tables, and redid the repair table code so that it uses the extended optimize table code.
2005-07-10 21:17:03 -07:00
brian@brian-akers-computer.local
85e2b662bf
Refactoring of write_row() into two parts to allow future additions. Also rewrote the OPTIMIZE TABLE code, to add new extended optimize. This form of optimize rebuilds not only the file, but each individual row.
2005-07-10 18:19:37 -07:00
brian@zim.(none)
5b65be7b14
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/foo-5.0
2005-07-10 10:04:13 -07:00
dlenev@mysql.com
4e8c22f296
Manual fixes after merging patch for bug #8406 "Triggers crash if referencing
...
a table" with main tree.
2005-07-09 23:11:17 +04:00
dlenev@mysql.com
75b8d4fa08
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg8406
2005-07-09 22:04:18 +04:00
dlenev@mysql.com
923fe817e0
Enable support of access to tables from triggers. Thus fix bug #8406 "Triggers
...
crash if referencing a table" and several other related bugs.
Fix for bug #11834 "Re-execution of prepared statement with dropped function
crashes server." which was spotted during work on previous bugs.
Also couple of nice cleanups:
- Replaced two separate hashes for stored routines used by statement with one.
- Now instead of doing one pass through all routines used in statement for
caching them and then doing another pass for adding their tables to table
list, we do only one pass during which do both things.
2005-07-09 21:51:59 +04:00
brian@zim.(none)
9bd74f7e81
Fixed indention issue, made scan_rows an ha_rows type, and fixed show table status so archive rows are displayed as being compressed.
2005-07-09 08:57:08 -07:00
pem@mysql.com
5ce9198f20
Fixed BUG#11365: Stored Procedure: Crash on Procedure operation
...
Two separate problems. A key buffer was too small in sp.cc for multi-byte
fields, and the creation and fixing of mysql.proc in the scripts hadn't been
updated with the correct character sets and collations (like the other
system tables had).
Note: No special test case, as the use of utf8 for mysql.proc will make
any existing crash (if the buffer overrrun wasn't fixed).
2005-07-08 16:33:15 +02:00
kent@mysql.com
8295cec7bc
sql_insert.cc:
...
Use the test() macro instead of assigning a pointer to a bool
2005-07-08 14:59:02 +02:00
pem@mysql.com
ce93689940
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-07-08 11:32:13 +02:00
jimw@mysql.com
de9909faec
Fix crash caused by calling DES_ENCRYPT() without the --des-key-file
...
option having been passed to the server. (Bug #11643 )
2005-07-07 11:49:44 -07:00
hf@deer.(none)
c7940aeb86
Fix for bug #8449(Silent column changes)
2005-07-07 21:47:18 +05:00
msvensson@neptunus.(none)
a8efd33aec
Merge neptunus.(none):/home/msvensson/mysql/bug11635/my41-bug11635
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-07 18:21:20 +02:00
hf@deer.(none)
3ddd2771d6
Fix for bug #11708 (real function returns wrongly rounded decimal)
2005-07-07 20:28:47 +05:00
msvensson@neptunus.(none)
50133499b5
BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes
...
- Change output from SHOW CREATE TABLE to use USING instead of TYPE
2005-07-07 14:44:28 +02:00
pem@mysql.com
312ea035ba
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-07-07 09:13:49 +02:00
bell@sanja.is.com.ua
bb9a634e5c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-07 09:25:16 +03:00
jimw@mysql.com
8e731bbede
Fix typos that crept into ChangeSet for fix for Bug #11045 .
2005-07-06 18:56:10 -07:00
jimw@mysql.com
f1ac600a7e
Merge jwinstead@production.mysql.com:my/mysql-5.0-11045
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-06 16:49:04 -07:00
bell@sanja.is.com.ua
9f30fa2ce5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-06 23:24:51 +03:00
igor@igor-inspiron.creware.com
07db9dc85a
Merge igor-inspiron.creware.com:/home/igor/mysql-5.0
...
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
2005-07-06 09:14:44 -07:00
igor@igor-inspiron.creware.com
e5bd22ff06
view.result, view.test:
...
Added a test case for bug #6120 .
sql_view.cc:
Fixed bug #6120 .
The SP cache must be invalidated when a view is altered.
2005-07-06 09:00:17 -07:00
pem@mysql.com
18d6dd56ef
Fixed BUG#7088: Stored procedures: labels won't work if character set is utf8.
...
We used 'IDENT' for labels as a temporary fix for the parser conflicts
introduced if the proper rule 'ident' was used. Now a specially tailored
'label_ident' rule is used for labels instead.
2005-07-06 16:37:57 +02:00
bell@sanja.is.com.ua
8b71793766
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-06 16:59:56 +03:00
bell@sanja.is.com.ua
94ec658d6f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 15:20:51 +03:00
mskold@mysql.com
9ef31a2825
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-06 13:10:12 +02:00
mskold@mysql.com
58703a4380
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-07-06 11:50:05 +02:00
mskold@mysql.com
458618d102
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-06 11:47:48 +02:00
mskold@mysql.com
fe73e69b4e
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-06 11:39:48 +02:00
marko@hundin.mysql.fi
e27338ac23
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-07-06 12:29:20 +03:00
mskold@mysql.com
7063d85bf9
Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPDATE ..
2005-07-06 11:23:36 +02:00
bell@sanja.is.com.ua
c41c8accd7
Merge
2005-07-06 11:36:27 +03:00
kent@mysql.com
f07ac780f8
init_db.sql:
...
add new table privileges
Makefile.am:
Include path to regex dir was accidently removed
2005-07-06 10:16:36 +02:00
kent@mysql.com
512d130110
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-07-06 10:03:07 +02:00
marko@hundin.mysql.fi
006bb7bbc9
InnoDB: Make the srv_thread_concurrency checks more consistent.
2005-07-06 09:38:31 +03:00
dlenev@mysql.com
8a924ac456
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg11394
2005-07-06 10:21:27 +04:00
jimw@mysql.com
af5f5ab3ed
Merge mysql.com:/home/jimw/my/mysql-5.0-6903
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 17:05:31 -07:00
jimw@mysql.com
2669b86612
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 15:23:13 -07:00
kent@mysql.com
ca420edc21
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-07-06 00:15:55 +02:00
kent@mysql.com
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
jimw@mysql.com
9f654b806a
Merge mysql.com:/home/jimw/my/mysql-4.1-11440
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:54:12 -07:00
jimw@mysql.com
81e50844b3
Merge mysql.com:/home/jimw/my/mysql-4.1-11330
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:51:16 -07:00
jimw@mysql.com
485f2c93c2
Merge mysql.com:/home/jimw/my/mysql-5.0-10214
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 09:47:20 -07:00
mats@mysql.com
0449ee1ca8
Merging 4.1 into 5.0
2005-07-05 16:02:03 +02:00
mats@mysql.com
3c42734174
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b11401-mysql-4.1
2005-07-05 14:08:22 +02:00
mats@mysql.com
6d924c8286
Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes
...
this as a LOAD DATA ... REPLACE INTO .. statement.
2005-07-05 13:55:54 +02:00
bell@sanja.is.com.ua
4bc6bd38ec
Merge
2005-07-05 13:42:19 +03:00
bell@sanja.is.com.ua
5eb8404c57
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-05 13:39:20 +03:00