Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | sql/Makefile.am: better mysqld dependencies | serg@sergbook.mysql.com | 2006-05-30 | 4 | -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-new | serg@sergbook.mysql.com | 2006-05-28 | 35 | -852/+461 |
|\ | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1 | ||||
| * | handlerton cleanup: | serg@sergbook.mysql.com | 2006-05-28 | 35 | -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-new | vtkachenko@vadima.volia.com | 2006-05-27 | 2 | -0/+6 |
|\ \ | | | | | | | | | | into vadima.volia.com:/root/mysql-5.1-new1 | ||||
| * | | sql_class.cc, mysql_priv.h: | vtkachenko@vadima.volia.com | 2006-05-27 | 2 | -0/+6 |
| | | | | | | | | | | | | Added accessor to handler data. | ||||
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new | elliot@mysql.com | 2006-05-26 | 0 | -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 look | elliot@mysql.com | 2006-05-26 | 0 | -0/+0 |
| |/ / | | | | | | | | | | horrible when checked out on Windows. | ||||
* | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new | rburnett@bk-internal.mysql.com | 2006-05-26 | 7 | -1073/+26 |
|\ \ \ | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt | ||||
| * \ \ | Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release | kent@mysql.com | 2006-05-26 | 4 | -36/+22 |
| |\ \ \ | | |/ / | |/| | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.1-new | ||||
| | * | | Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release | serg@mysql.com | 2006-05-24 | 4 | -36/+22 |
| | |\ \ | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.1-release | ||||
| | | * \ | Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release | serg@mysql.com | 2006-05-24 | 4 | -36/+22 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.0.22-release | ||||
| | | | * \ | Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release | serg@mysql.com | 2006-05-24 | 5 | -37/+23 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release | ||||
| | | | | * | | configure.in: | kent@mysql.com | 2006-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated release number 4.1.16a | ||||
| | | | | * | | don't let bugfix for bug#8303 break the bugfix for bug#8378 | kent@mysql.com | 2006-05-24 | 4 | -35/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert the fix for bug#8303 correct the test for bug#8378 | ||||
| | | | * | | | configure.in: | kent@mysql.com | 2006-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed version to 5.0.17c | ||||
| | | | * | | | sql_parse.cc: | kent@mysql.com | 2006-05-02 | 2 | -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.com | 2006-01-03 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | * | | | Copyright string fixes (bug#15974), version fix for 5.0.17a "certified". | joerg@mysql.com | 2006-01-03 | 3 | -8/+6 |
| | | | | | | | |||||
| | | * | | | | configure.in: | kent@mysql.com | 2006-05-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed version to 5.0.22 | ||||
| * | | | | | | Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new | jmiller@mysql.com | 2006-05-25 | 2 | -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.com | 2006-05-25 | 2 | -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.1 | pekka@mysql.com | 2006-05-25 | 1 | -1/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new | rburnett@bk-internal.mysql.com | 2006-05-25 | 32 | -238/+648 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt | ||||
| * | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new | pekka@mysql.com | 2006-05-25 | 16 | -214/+408 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51 | ||||
| | * \ \ \ \ \ \ | Merge mysql.com:/space/pekka/ndb/version/my51 | pekka@mysql.com | 2006-05-25 | 16 | -214/+408 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509 | ||||
| | | * | | | | | | ndb - bug#14509 v5.1 part 2/2 : handler level | pekka@mysql.com | 2006-05-25 | 4 | -45/+62 |
| | | | | | | | | | |||||
| | | * | | | | | | ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2] | pekka@mysql.com | 2006-05-25 | 7 | -62/+133 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 | pekka@mysql.com | 2006-05-17 | 5 | -104/+144 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509 | ||||
| | | | * | | | | | | ndb - bug#14509 [related] re-do auto-incr error handling | pekka@mysql.com | 2006-05-17 | 6 | -105/+145 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 | pekka@mysql.com | 2006-05-16 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509 | ||||
| | | | * | | | | | | ndb - bug#14509 [related] fix a return value | pekka@mysql.com | 2006-05-16 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 | pekka@mysql.com | 2006-05-16 | 4 | -32/+31 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509 | ||||
| | | | * | | | | | | ndb - bug#14509 [related] setAutoIncrement: add error handling | pekka@mysql.com | 2006-05-16 | 5 | -40/+36 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 | pekka@mysql.com | 2006-05-16 | 8 | -99/+166 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51-bug14509 | ||||
| | | | * | | | | | | ndb - bug#14509 (5.0) part 2: create SYSTAB_0 row on first use | pekka@mysql.com | 2006-05-11 | 2 | -13/+30 |
| | | | | | | | | | | |||||
| | | | * | | | | | | ndb - bug#14509, part 1: move autoincr pre-fetch from Ndb to local dict cache | pekka@mysql.com | 2006-05-08 | 8 | -91/+136 |
| | | | | | | | | | | |||||
| * | | | | | | | | | test fix | gluh@eagle.intranet.mysql.r18.ru | 2006-05-25 | 2 | -5/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | after merge fix | gluh@mysql.com | 2006-05-25 | 7 | -5/+79 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode | gluh@eagle.intranet.mysql.r18.ru | 2006-05-23 | 4 | -2/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transfer NO_DEFAULT_VALUE_FLAG flag to new field | ||||
| | * | | | | | | | | Bug#16681 information_schema shows forbidden VIEW details | gluh@eagle.intranet.mysql.r18.ru | 2006-05-23 | 3 | -3/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show view definition to users that have the needed privilleges | ||||
| * | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se | 2006-05-25 | 5 | -11/+49 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304 | ||||
| | * | | | | | | | | | review fix | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se | 2006-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | manual merge | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se | 2006-05-24 | 1 | -0/+14 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17455 | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se | 2006-05-24 | 2 | -4/+12 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304 | ||||
| | | * | | | | | | | | | BUG#17455: Wrong results from Repair/Optimize .. table for partitioned tables | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se | 2006-05-23 | 3 | -4/+25 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se | 2006-05-24 | 4 | -7/+23 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304 | ||||
| | | * | | | | | | | | | | BUG#19304: Merge handler not part of partitioned tables | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se | 2006-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review fix | ||||
| | | * | | | | | | | | | | BUG#19304: Merge handler allowed in partitioned tables | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se | 2006-05-23 | 4 | -7/+23 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | sql_select.cc: | evgen@moonbone.local | 2006-05-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fix | ||||
| * | | | | | | | | | | | | Manually merged | evgen@moonbone.local | 2006-05-24 | 5 | -8/+113 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | / / / / / / / / | | | |_|/ / / / / / / / | | |/| | | | | | | | | |