cmiller@zippy.cornsilk.net
522d6fb0cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:24:28 -05:00
gluh@eagle.(none)
7b291e36cf
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-24 19:54:40 +04:00
tsmith@siva.hindu.god
bcc8452782
Applied innodb-5.1-ss1186
...
Fixes bugs:
- Bug #20877 : InnoDB data dictionary memory footprint is too big
- Bug #24741 : existing cascade clauses disappear when adding foreign keys
2007-01-21 18:18:11 -07:00
gluh@mysql.com/eagle.(none)
a5a43da10e
Bug#21713 incorrect value for the REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_NAME column
...
added new field 'REFERENCED_TABLE_NAME' to 'referential_constraints' table
field 'UNIQUE_CONSTRAINT_NAME' contains the name of the referenced index
2007-01-15 13:39:28 +04:00
kent@kent-amd64.(none)
f9ac031dd0
Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
2007-01-15 10:37:27 +01:00
gluh@eagle.(none)
cf41e1ec63
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-12 14:47:11 +04:00
gluh@mysql.com/eagle.(none)
91d75da75e
Fix for bug#25026 information_schema.KEY_COLUMN_USAGE
.REFERENCED_TABLE_NAME
returns garbage
...
Unencode internal db & table name
2007-01-09 18:14:04 +04:00
tsmith@siva.hindu.god
eb8cf09388
Merge siva.hindu.god:/home/tsmith/m/inno/jan04/51
...
into siva.hindu.god:/home/tsmith/m/bk/51-build
2007-01-05 16:05:48 -07:00
tsmith@siva.hindu.god
7a2d8c14dd
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
...
Fixes:
- Bug #24712 : SHOW TABLE STATUS for file-per-table showing incorrect time fields
- Bug #24386 : Performance degradation caused by instrumentation in mutex_struct
- Bug #24190 : many exportable definitions of field_in_record_is_null
- Bug #21468 : InnoDB crash during recovery with corrupted data pages: XA bug?
2007-01-04 19:51:34 -07:00
kent@kent-amd64.(none)
c92b3b9b6a
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-01-01 10:54:14 +01:00
kent@mysql.com/kent-amd64.(none)
67868597bb
Many files:
...
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
Changed copyright header formatting some
plugin_example.c, daemon_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa
Many files:
...
Changed header to GPL version 2 only
2006-12-27 02:23:51 +01:00
kent@kent-amd64.(none)
be15e3bc15
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
patg@radha.patg.net
2e538b4192
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
2006-12-22 08:57:32 -05:00
tsmith/tim@siva.hindu.god
ab4c0f3b81
Merge siva.hindu.god:/usr/home/tim/m/bk/50-build
...
into siva.hindu.god:/usr/home/tim/m/bk/51-build
2006-12-20 15:46:36 -07:00
brian@zim.(none)
31d67280f7
This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h
2006-12-01 17:26:52 -08:00
monty@mysql.com/nosik.monty.fi
0e149b7170
Removed compiler warnings
...
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
2006-11-27 18:16:08 +02:00
monty@nosik.monty.fi
89570bf966
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
monty@nosik.monty.fi
38a92caeb7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743
Added --debug-info to most clients to detect memory leaks in mysql-test-run
...
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
lars@black.(none)
63c906f749
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 12:45:31 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
eb28e03189
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug24190_many_field_in_rec_is_0
2006-11-12 18:04:19 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
d3976edabe
Bug #24190 many exportable definitions of field_in_record_is_null
...
mysql had several(2) exportable definitions of field_in_record_is_null function.
Fixed with adding static.
2006-11-10 17:22:43 +02:00
tsmith@quadxeon.mysql.com
18080530d7
Applied innodb-5.1-ss1004
...
Fixes:
- Bug #15815 : Very poor performance with multiple queries running concurrently
- Bug #22868 : 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #24089 : Race condition in fil_flush_file_spaces()
2006-11-09 05:01:19 +01:00
cmiller@zippy.cornsilk.net
b074e13483
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -05:00
joerg@trift2.
0d27df6f1a
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2006-11-01 13:26:03 +01:00
iggy/Administrator@amd64.
c5960a9818
Post Merge Cleanup
2006-10-26 15:41:47 -04:00
tsmith/tim@siva.hindu.god
09e094850b
Applied InnoDB snapshot 5.1-ss927
...
Fixes:
- Bug #23368 : crash during insert, table has foreign key pointing into other schema,permission
2006-10-20 13:44:49 -06:00
tsmith/tim@siva.hindu.god
032f356f7c
Apply InnoDB snapshot ss923
...
Fixes:
- Bug #18077 : InnoDB uses full explicit table locks in stored FUNCTION
2006-10-20 12:36:15 -06:00
holyfoot/hf@mysql.com/deer.(none)
b8e31d05f1
bug #23369 (Embedded library can't be linked)
...
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
2006-10-18 17:03:37 +05:00
stewart@willster.(none)
71636edc16
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 18:51:39 +10:00
brian@zim.(none)
faff46eefe
Added license information display to output of plugins schema, and tagged all plugins with GPL flag.
2006-10-05 00:41:29 -07:00
msvensson@neptunus.(none)
ca21b57992
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 09:28:44 +02:00
brian@zim.(none)
4117860ec6
Merge zim.(none):/home/brian/mysql/merge-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-09-30 18:44:42 -07:00
brian@zim.(none)
46ae2113ba
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
...
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
2006-09-30 12:49:46 -07:00
brian@zim.(none)
a756fd36ef
This removes the passing of global hton to engine instance.
2006-09-29 17:19:02 -07:00
tsmith/tim@siva.hindu.god
ca1f99bdb8
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-29 17:01:16 -06:00
gbichot@dl145h.mysql.com
7493331fa4
Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch
...
into dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
2006-09-28 13:22:56 +02:00
gbichot@dl145h.mysql.com
041dedfcfb
In the handlerton, cursor creation function don't have an argument
...
and so the engine calls current_thd to derive transaction information;
instead we now pass THD to those functions, it looks more logical
(it makes the implicit current_thd parameter more visible).
Approved by Brian and Monty.
2006-09-28 13:19:43 +02:00
elliot/emurphy@lost.local
d5c98585da
Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca
...
into mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1-new-maint
2006-09-27 17:20:45 -04:00
brian@zim.(none)
f9a02811da
Removed Field (this came in as an idea from a previous patch by Serg)
2006-09-26 21:26:04 -07:00
msvensson@neptunus.(none)
015d8409a7
Fix windows and aix compile problem
...
- Variables must be declared first in each block
2006-09-22 09:00:23 +02:00
msvensson@shellback.(none)
0dbbe51384
Fix Solaris 10 compile failure
...
- Void function can't return a value
2006-09-21 20:37:35 +02:00
msvensson@shellback.(none)
fe0cfacf35
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-21 20:31:35 +02:00
tsmith/tim@siva.hindu.god
f269d9b6c3
Applied innodb-5.1 snapshots ss799 and ss854
...
Bugs fixed:
- Bug #20877 : InnoDB data dictionary memory footprint is too big
- Bug #13544 : Second delete of same row in transaction illustrates non-optimal locking
- Bug #20791 : valgrind errors in InnoDB
2006-09-21 01:39:09 -06:00
istruewing@chilla.local
0aaf483734
Merge chilla.local:/home/mydev/mysql-5.1--main
...
into chilla.local:/home/mydev/mysql-5.1-tomain
2006-09-21 09:37:31 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
98a8537adf
Bug#22417
...
"plug.in not included in dist source"
2006-09-18 19:31:08 -07:00
acurtis/antony@ltamd64.xiphis.org
424857e0e4
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/engines-merge
2006-09-18 12:16:03 -07:00
brian@zim.(none)
7194b6d75a
This changes the order of the universe, black is now the new white.
...
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
2006-09-15 10:28:00 -07:00