Commit graph

35966 commits

Author SHA1 Message Date
mtaylor@blade09.mysql.com
007d2edc1c Makefile.am:
Renamed libmysqlclient package entires
2007-04-20 02:17:15 +02:00
mtaylor@blade09.mysql.com
d847f76f49 libmysqlclientSLIBoff.README.Debian.in:
Rename: debian/libmysqlclientSLIB.README.Debian.in -> debian/libmysqlclientSLIBoff.README.Debian.in
libmysqlclientSLIBoff.docs.in:
  Rename: debian/libmysqlclientSLIB.docs.in -> debian/libmysqlclientSLIBoff.docs.in
control.in:
  Renamed packages back to libmysqlclientSLIBoff to match current packages. 
  We can rename this in a sensible way later on. 
libmysqlclientSLIBoff.files.in:
  Rename: debian/libmysqlclientSLIB.files.in -> debian/libmysqlclientSLIBoff.files.in
libmysqlclientSLIBoff.dirs.in:
  Rename: debian/libmysqlclientSLIB.dirs.in -> debian/libmysqlclientSLIBoff.dirs.in
libmysqlclientSLIBoff.postinst.in:
  Rename: debian/libmysqlclientSLIB.postinst.in -> debian/libmysqlclientSLIBoff.postinst.in
2007-04-20 02:06:16 +02:00
mtaylor@blade09.mysql.com
4cc0c69e47 rules:
Protect the control file from running ./configure again
2007-04-19 23:43:57 +02:00
mtaylor@blade09.mysql.com
e3b33f856a control.in:
Fixed branding problem.
Many files:
  Fixed branding problem
changelog:
  Upgraded to 5.0.42
defs.mk.in:
  Fixed branding and variable persiting problem.
2007-04-19 23:07:09 +02:00
mtaylor@qualinost.(none)
62b976d38d Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
2007-04-18 14:35:15 -07:00
mtaylor@qualinost.(none)
f9d8b39bc5 Fixed make distcheck problem. 2007-04-18 14:34:38 -07:00
mtaylor@qualinost.(none)
587cc24f71 Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
2007-04-17 19:08:24 -07:00
mtaylor@qualinost.(none)
357a694d48 Changed a comment to be more clear. 2007-04-17 18:20:34 -07:00
mtaylor@qualinost.(none)
e208ce21de BUG#27769 - MySQL should include debian packaging dir
Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
BUG#27769 
Cleaned up some things to make building the packages go a little smoother. 
---
debian/rules really does need to be called from the source root.
---
Fixed two problems with the build caused by adding debian to the source tree
---
Left off the debian/ prefix to the Makefile filter.
---
BUG#27769 - MySQL should include debian packaging dir
Changed substitution variables to match already existing autoconf vars.
Generate debian/control and debian/defs.mk from autoconf now, since we run that
to make a source package. 
---
Corrected incorrect variable name
---
Renamed template files to have shorter names. 
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
A few final changes to make debs build from a source tarball dist.
2007-04-17 18:12:43 -07:00
tsmith@siva.hindu.god
334dbc6d8c Merge siva.hindu.god:/home/tsmith/m/bk/maint/41
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-04-17 15:43:35 -06:00
tsmith@siva.hindu.god
5e75e31268 Merge siva.hindu.god:/home/tsmith/m/bk/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-04-17 15:40:13 -06:00
tsmith@siva.hindu.god
024aed165d Merge siva.hindu.god:/home/tsmith/m/bk/41
into  siva.hindu.god:/home/tsmith/m/bk/maint/41
2007-04-17 15:38:59 -06:00
kent/mysqldev@mysql.com/production.mysql.com
c43a7b9bf7 Raise version number after cloning 5.0.40 2007-04-17 15:22:48 +02:00
dkatz@damien-katzs-computer.local
138f003738 Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/50b
2007-04-16 13:49:17 -04:00
tomas@whalegate.ndb.mysql.com
a30755427a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
2007-04-16 14:51:08 +02:00
tomas@whalegate.ndb.mysql.com
1bf8aad558 Bug #27710 Creating unique index fails during single user mode
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
2007-04-16 14:07:31 +02:00
evgen@moonbone.local
7d71d58076 item.cc:
Fix warning after fix for bug#27321.
2007-04-15 09:54:16 +04:00
evgen@moonbone.local
51badaddbc subselect.test, subselect.result:
After merge fix.
2007-04-15 09:22:45 +04:00
evgen@moonbone.local
922a5a969c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql
2007-04-15 08:41:35 +04:00
evgen@moonbone.local
3113ce6383 Bug#27321: Wrong subquery result in a grouping select.
The Item_outer_ref class based on the Item_direct_ref class was always used
to represent an outer field. But if the outer select is a grouping one and the 
outer field isn't under an aggregate function which is aggregated in that
outer select an Item_ref object should be used to represent such a field.
If the outer select in which the outer field is resolved isn't grouping then
the Item_field class should be used to represent such a field.
This logic also should be used for an outer field resolved through its alias
name.

Now the Item_field::fix_outer_field() uses Item_outer_field objects to
represent aliased and non-aliased outer fields for grouping outer selects
only.
Now the fix_inner_refs() function chooses which class to use to access outer
field - the Item_ref or the Item_direct_ref. An object of the chosen class
substitutes the original field in the Item_outer_ref object.
The direct_ref and the found_in_select_list fields were added to the
Item_outer_ref class.
2007-04-15 08:31:34 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
db7e62e7fb Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-14 14:55:33 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8b49f27530 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-14 14:54:59 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
cf18d38c83 Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-04-14 14:54:28 +05:00
msvensson@pilot.blaudden
8fdf9c5f64 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-13 16:14:43 +02:00
msvensson@pilot.blaudden
9abaacca9c Merge pilot.blaudden:/home/msvensson/mysql/bug27783/my50-bug27783
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-13 15:06:52 +02:00
msvensson@pilot.blaudden
86a364319d Add option manual-ddd
Change syntax for starting manual ddd or gdb to avoid having to
change working dir
2007-04-13 15:06:05 +02:00
msvensson@pilot.blaudden
197a2677ad Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-13 15:02:10 +02:00
msvensson@pilot.blaudden
7df5e05b4d Add missing option --manual-ddd
Change syntax to start manual gdb/ddd to avoid having to
cd to the mysql-test directory before calling the command
2007-04-13 14:40:52 +02:00
tomas@whalegate.ndb.mysql.com
2a917850d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
2007-04-13 08:15:49 +02:00
tomas@whalegate.ndb.mysql.com
e315f9f765 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
2007-04-13 08:14:05 +02:00
tomas@whalegate.ndb.mysql.com
5d89ca3a89 Bug#27775 mediumint auto_increment with ndb_restore
- autoincrement column of size medium int not handled in ndb_restore
- added testcase also for other types, tiny, small... etc
2007-04-13 01:37:24 +02:00
dkatz@damien-katzs-computer.local
dac9f99327 Bug #27322 failure to allocate transaction_prealloc_size causes crash
Fix for when memory pre-allocation fails.
2007-04-12 18:03:26 -04:00
gshchepa/uchum@gshchepa.localdomain
342a6c5866 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  gshchepa.localdomain:/home/uchum/work/bk-trees/5507-ci
2007-04-13 00:38:45 +05:00
tomas@whalegate.ndb.mysql.com
7fd59a08af Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
2007-04-12 21:38:44 +02:00
tomas@whalegate.ndb.mysql.com
3ff7444ac7 remove inline NdbRecAttr functions for medium int as not to depend in my_global 2007-04-12 21:34:25 +02:00
gshchepa/uchum@gshchepa.localdomain
4b2aab14ba Bug#5507: TRUNCATE does not work with views.
Support of views wasn't implemented for the TRUNCATE statement.
Now TRUNCATE on views has the same semantics as DELETE FROM view:
mysql_truncate() checks whether the table is a view and falls back
to delete if so.
In order to initialize properly the LEX::updatable for a view
st_lex::can_use_merged() now allows usage of merged views for the
TRUNCATE statement.
2007-04-12 23:21:37 +05:00
mtaylor@qualinost.(none)
99c5f418af BUG#27367 mysql.server should be LSB init script compliant
Moved cd $basedir to live in the start section, as it only applies to the start
functionality and breaks the restart task
2007-04-12 11:16:07 -07:00
mtaylor@qualinost.(none)
7caf1843ee Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
2007-04-12 11:01:32 -07:00
mtaylor@qualinost.(none)
0af87ed83a Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
2007-04-12 11:00:54 -07:00
tomas@whalegate.ndb.mysql.com
0ddf40b025 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
2007-04-12 19:49:46 +02:00
tomas@whalegate.ndb.mysql.com
8a98276ba7 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
2007-04-12 19:49:21 +02:00
joerg@trift2.
3050edc0b9 Merge trift2.:/MySQL/M41/push-4.1
into  trift2.:/MySQL/M50/push-5.0
2007-04-12 18:41:55 +02:00
tomas@whalegate.ndb.mysql.com
6015317269 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
2007-04-12 18:29:24 +02:00
msvensson@pilot.blaudden
74dfba96e7 Bug#27783 mysql_install_db should be able to install again, preserving existing files.
- Allow mysql_install_db to be run a second time in the same
   datadir to create and fill any missing system tables
2007-04-12 17:48:28 +02:00
msvensson@pilot.blaudden
3a7821014a Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-12 14:56:52 +02:00
tomas@whalegate.ndb.mysql.com
f9a900f80e Bug #27758 Restoring NDB backups makes table usable in SQL nodes
- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout
2007-04-12 11:07:30 +02:00
mtaylor@qualinost.(none)
6547960e28 Adding files to support building for debian.
---
Removed reference to debian svn location of debian dir. 
Changed verbage of comment to appease Timothy. 
---
Removed added manpages that aren't appropriate for our build. 
---
Added debian dir to list of dist targets. 
Added list of files needed to be distributed in debian dir.
---
Added semi-colons to fix syntax error.
---
BUG#27769 MySQL should include debian packaing dir
Added debian/Makefile to configure.in to support make dist.
2007-04-11 16:13:09 -07:00
msvensson@pilot.blaudden
cd2f78fdd8 Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect
- Add testcase for SSL connection from mysqldump to mysqld
2007-04-11 23:42:53 +02:00
igor@olga.mysql.com
4bf11f99eb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-11 13:48:02 -07:00
msvensson@pilot.blaudden
05c0e928a9 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-11 22:08:19 +02:00