← Back to branch summary

~ubuntu-branches/ubuntu/karmic/mysql-dfsg-5.1/karmic

« back to all changes in this revision

Viewing changes to mysql-test/suite/funcs_1/r/is_columns.result

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug
  • Date: 2009-02-10 16:42:05 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090210164205-ej41ocvm4z1s14nq
Tags: 5.1.31-1ubuntu1
https://launchpad.net/bugs/319843
https://launchpad.net/bugs/316280
https://launchpad.net/bugs/323755
* Merge from debian experimental, remaining changes: 
  - debian/mysql-server-5.1.config: ask for MySQL root password at priority
    high instead of medium so that the password prompt is seen on a default
    install. (LP: #319843)
  - debian/control: 
    + Don't build mysql-server, mysql-client, mysql-common and 
      libmysqlclient15-dev binary packages since they're still provided 
      by mysql-dfsg-5.0.
    + Rename libmysqlclient-dev package to libmysqlclient16-dev (LP: #316280).
      Make it conflict with libmysqlclient15-dev.
    + Make mysql-{client,server}-5.1 packages conflict and
      replace mysql-{client,server}-5.0, but not provide 
      mysql-{client,server}.
    + Depend on a specific version of mysql-common rather than the src 
      version of mysql-dfsg-5.1 since mysql-common is currently part of
      mysql-dfsg-5.0.
  - debian/rules: added -fno-strict-aliasing to CFLAGS to get
    around mysql testsuite build failures.
* debian/patches/92_ssl_test_cert.dpatch: certificate expiration in 
  test suite (LP: #323755).
* Dropped changes:
  - all of the changes made to support both 5.0 and 5.1 installed at the
    same time have been dropped now that amarok doesn't depend on
    mysql-server-5.1 anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/suite/funcs_1/r/is_columns.result
40
40
CHARACTER_OCTET_LENGTH  bigint(21) unsigned     YES             NULL    
41
41
NUMERIC_PRECISION       bigint(21) unsigned     YES             NULL    
42
42
NUMERIC_SCALE   bigint(21) unsigned     YES             NULL    
43
 
CHARACTER_SET_NAME      varchar(64)     YES             NULL    
44
 
COLLATION_NAME  varchar(64)     YES             NULL    
 
43
CHARACTER_SET_NAME      varchar(32)     YES             NULL    
 
44
COLLATION_NAME  varchar(32)     YES             NULL    
45
45
COLUMN_TYPE     longtext        NO              NULL    
46
46
COLUMN_KEY      varchar(3)      NO                      
47
47
EXTRA   varchar(27)     NO                      
62
62
  `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
63
63
  `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
64
64
  `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
65
 
  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
66
 
  `COLLATION_NAME` varchar(64) DEFAULT NULL,
 
65
  `CHARACTER_SET_NAME` varchar(32) DEFAULT NULL,
 
66
  `COLLATION_NAME` varchar(32) DEFAULT NULL,
67
67
  `COLUMN_TYPE` longtext NOT NULL,
68
68
  `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
69
69
  `EXTRA` varchar(27) NOT NULL DEFAULT '',
84
84
CHARACTER_OCTET_LENGTH  bigint(21) unsigned     YES             NULL    
85
85
NUMERIC_PRECISION       bigint(21) unsigned     YES             NULL    
86
86
NUMERIC_SCALE   bigint(21) unsigned     YES             NULL    
87
 
CHARACTER_SET_NAME      varchar(64)     YES             NULL    
88
 
COLLATION_NAME  varchar(64)     YES             NULL    
 
87
CHARACTER_SET_NAME      varchar(32)     YES             NULL    
 
88
COLLATION_NAME  varchar(32)     YES             NULL    
89
89
COLUMN_TYPE     longtext        NO              NULL    
90
90
COLUMN_KEY      varchar(3)      NO                      
91
91
EXTRA   varchar(27)     NO