summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* sql/Makefile.am: better mysqld dependenciesserg@sergbook.mysql.com2006-05-304-86/+178
| | | | | | sql/discover.cc: close(-1) bug sql/slave.cc: DBUG_ENTER/RETURN tags ha_archive.cc: double-close bug
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newserg@sergbook.mysql.com2006-05-2835-852/+461
|\ | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
| * handlerton cleanup:serg@sergbook.mysql.com2006-05-2835-852/+461
| | | | | | | | | | | | | | | | | | | | | | | | duplicate fields removed, st_mysql_storage_engine added to support run-time handlerton initialization (no compiler warnings), handler API is now tied to MySQL version, handlerton->plugin mapping added (slot-based), dummy default_hton removed, plugin-type-specific initialization generalized, built-in plugins are now initialized too, --default-storage-engine no longer needs a list of storage engines in handle_options(). mysql-test-run.pl bugfixes
* | Merge vtkachenko@bk-internal.mysql.com:/home/bk/mysql-5.1-newvtkachenko@vadima.volia.com2006-05-272-0/+6
|\ \ | | | | | | | | | into vadima.volia.com:/root/mysql-5.1-new1
| * | sql_class.cc, mysql_priv.h:vtkachenko@vadima.volia.com2006-05-272-0/+6
| | | | | | | | | | | | Added accessor to handler data.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newelliot@mysql.com2006-05-260-0/+0
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
| * | | Set the Windows README file to EOLN_NATIVE so that it doesn't lookelliot@mysql.com2006-05-260-0/+0
| |/ / | | | | | | | | | horrible when checked out on Windows.
* | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-267-1073/+26
|\ \ \ | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
| * \ \ Merge mysql.com:/data0/mysqldev/my/mysql-5.1-releasekent@mysql.com2006-05-264-36/+22
| |\ \ \ | | |/ / | |/| | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.1-new
| | * | Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-releaseserg@mysql.com2006-05-244-36/+22
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.1-release
| | | * \ Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-releaseserg@mysql.com2006-05-244-36/+22
| | | |\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
| | | | * \ Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-releaseserg@mysql.com2006-05-245-37/+23
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
| | | | | * | configure.in:kent@mysql.com2006-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated release number 4.1.16a
| | | | | * | don't let bugfix for bug#8303 break the bugfix for bug#8378kent@mysql.com2006-05-244-35/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert the fix for bug#8303 correct the test for bug#8378
| | | | * | | configure.in:kent@mysql.com2006-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed version to 5.0.17c
| | | | * | | sql_parse.cc:kent@mysql.com2006-05-022-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer overflow and information exposure bugs fixed (reported by Stefano Di Paola) configure.in: Changed version to 5.0.17b
| | | | * | | NDB tools do not accept letters in "NDB_VERSION_BUILD", reduce it to plain "17".joerg@mysql.com2006-01-031-1/+1
| | | | | | |
| | | | * | | Copyright string fixes (bug#15974), version fix for 5.0.17a "certified".joerg@mysql.com2006-01-033-8/+6
| | | | | | |
| | | * | | | configure.in:kent@mysql.com2006-05-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed version to 5.0.22
| * | | | | | Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-newjmiller@mysql.com2006-05-252-1036/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
| | * | | | | | Removing ./r/rpl_ndb_dd_partitions.result & ./t/rpl_ndb_dd_partitions.test ↵jmiller@mysql.com2006-05-252-1036/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since NDB only will support key partitions and moving them to the test-extra tree for safe keeping
| * | | | | | | ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ] v5.1pekka@mysql.com2006-05-251-1/+4
| | | | | | | |
* | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-2532-238/+648
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
| * | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-newpekka@mysql.com2006-05-2516-214/+408
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51
| | * \ \ \ \ \ \ Merge mysql.com:/space/pekka/ndb/version/my51pekka@mysql.com2006-05-2516-214/+408
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509
| | | * | | | | | ndb - bug#14509 v5.1 part 2/2 : handler levelpekka@mysql.com2006-05-254-45/+62
| | | | | | | | |
| | | * | | | | | ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2]pekka@mysql.com2006-05-257-62/+133
| | | | | | | | |
| | | * | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509pekka@mysql.com2006-05-175-104/+144
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509
| | | | * | | | | | ndb - bug#14509 [related] re-do auto-incr error handlingpekka@mysql.com2006-05-176-105/+145
| | | | | | | | | |
| | | * | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509pekka@mysql.com2006-05-161-2/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509
| | | | * | | | | | ndb - bug#14509 [related] fix a return valuepekka@mysql.com2006-05-161-2/+2
| | | | | | | | | |
| | | * | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509pekka@mysql.com2006-05-164-32/+31
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509
| | | | * | | | | | ndb - bug#14509 [related] setAutoIncrement: add error handlingpekka@mysql.com2006-05-165-40/+36
| | | | | | | | | |
| | | * | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509pekka@mysql.com2006-05-168-99/+166
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509
| | | | * | | | | | ndb - bug#14509 (5.0) part 2: create SYSTAB_0 row on first usepekka@mysql.com2006-05-112-13/+30
| | | | | | | | | |
| | | | * | | | | | ndb - bug#14509, part 1: move autoincr pre-fetch from Ndb to local dict cachepekka@mysql.com2006-05-088-91/+136
| | | | | | | | | |
| * | | | | | | | | test fixgluh@eagle.intranet.mysql.r18.ru2006-05-252-5/+4
| | | | | | | | | |
| * | | | | | | | | after merge fixgluh@mysql.com2006-05-257-5/+79
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL modegluh@eagle.intranet.mysql.r18.ru2006-05-234-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transfer NO_DEFAULT_VALUE_FLAG flag to new field
| | * | | | | | | | Bug#16681 information_schema shows forbidden VIEW detailsgluh@eagle.intranet.mysql.r18.ru2006-05-233-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show view definition to users that have the needed privilleges
| * | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newmikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-255-11/+49
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
| | * | | | | | | | | review fixmikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-241-1/+1
| | | | | | | | | | |
| | * | | | | | | | | manual mergemikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-241-0/+14
| | | | | | | | | | |
| | * | | | | | | | | Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17455mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-242-4/+12
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
| | | * | | | | | | | | BUG#17455: Wrong results from Repair/Optimize .. table for partitioned tablesmikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-233-4/+25
| | | | | | | | | | | |
| | * | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newmikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-244-7/+23
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
| | | * | | | | | | | | | BUG#19304: Merge handler not part of partitioned tablesmikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review fix
| | | * | | | | | | | | | BUG#19304: Merge handler allowed in partitioned tablesmikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-234-7/+23
| | | | | | | | | | | | |
| * | | | | | | | | | | | sql_select.cc:evgen@moonbone.local2006-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fix
| * | | | | | | | | | | | Manually mergedevgen@moonbone.local2006-05-245-8/+113
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | / / / / / / / / | | | |_|/ / / / / / / / | | |/| | | | | | | | |