Commit 5f6b100e authored by unknown's avatar unknown
Browse files

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


client/mysqlimport.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merged from 4.1.
mysql-test/r/mysqldump.result:
  Merged from 4.1.
mysql-test/t/gis.test:
  Merged from 4.1.
parents 6de8b295 a006453f

client/mysqlimport.c

+7 −0
Original line number Diff line number Diff line
@@ -518,6 +518,13 @@ int main(int argc, char **argv) 
    free_defaults(argv_to_free);

    return(1); /* purecov: deadcode */

  }



  if (mysql_query(sock, "set @@character_set_database=binary;"))

  {

    db_error(sock); /* We shall countinue here, if --force was given */

    return(1);

  }



  if (lock_tables)

    lock_table(sock, argc, argv);

  for (; *argv != NULL; argv++)

mysql-test/mysql-test-run.pl

+11 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ our $exe_mysql_client_test; 
our $exe_mysqld;

our $exe_mysqlcheck;             # Called from test case

our $exe_mysqldump;              # Called from test case

our $exe_mysqlimport;              # Called from test case

our $exe_mysqlshow;              # Called from test case

our $exe_mysql_fix_system_tables;

our $exe_mysqltest;
@@ -923,6 +924,7 @@ sub executable_setup () { 
    }

    $exe_mysqlcheck=     mtr_exe_exists("$path_client_bindir/mysqlcheck");

    $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");

    $exe_mysqlimport=      mtr_exe_exists("$path_client_bindir/mysqlimport");

    $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");

    $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");

    $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
@@ -2399,6 +2401,14 @@ sub run_mysqltest ($) { 
    $cmdline_mysqldump .=

      " --debug=d:t:A,$opt_vardir/log/mysqldump.trace";

  }

  my $cmdline_mysqlimport= "$exe_mysqlimport -uroot " .

                         "--port=$master->[0]->{'path_myport'} " .

                         "--socket=$master->[0]->{'path_mysock'} --password=";

  if ( $opt_debug )

  {

    $cmdline_mysqlimport .=

      " --debug=d:t:A,$opt_vardir/log/mysqlimport.trace";

  }



  my $cmdline_mysqlshow= "$exe_mysqlshow -uroot " .

                         "--port=$master->[0]->{'path_myport'} " .
@@ -2452,6 +2462,7 @@ sub run_mysqltest ($) { 
  $ENV{'MYSQL'}=                    $cmdline_mysql;

  $ENV{'MYSQL_CHECK'}=              $cmdline_mysqlcheck;

  $ENV{'MYSQL_DUMP'}=               $cmdline_mysqldump;

  $ENV{'MYSQL_IMPORT'}=             $cmdline_mysqlimport;

  $ENV{'MYSQL_SHOW'}=               $cmdline_mysqlshow;

  $ENV{'MYSQL_BINLOG'}=             $cmdline_mysqlbinlog;

  $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;

mysql-test/mysql-test-run.sh

+8 −1
Original line number Diff line number Diff line
@@ -629,6 +629,11 @@ if [ x$SOURCE_DIST = x1 ] ; then 
 else

   MYSQL_DUMP="$BASEDIR/client/mysqldump"

 fi

 if [ -f "$BASEDIR/client/.libs/mysqlimport" ] ; then

   MYSQL_IMPORT="$BASEDIR/client/.libs/mysqlimport"

 else

   MYSQL_IMPORT="$BASEDIR/client/mysqlimport"

 fi

 if [ -f "$BASEDIR/client/.libs/mysqlshow" ] ; then

   MYSQL_SHOW="$BASEDIR/client/.libs/mysqlshow"

 else
@@ -705,6 +710,7 @@ else 
 MYSQL_CHECK="$CLIENT_BINDIR/mysqlcheck"

 MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"

 MYSQL_SHOW="$CLIENT_BINDIR/mysqlshow"

 MYSQL_IMPORT="$CLIENT_BINDIR/mysqlimport"

 MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"

 MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"

 WAIT_PID="$CLIENT_BINDIR/mysql_waitpid"
@@ -792,9 +798,10 @@ MYSQL_CHECK="$MYSQL_CHECK --no-defaults -uroot --socket=$MASTER_MYSOCK --passwor 
MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"

MYSQL_SHOW="$MYSQL_SHOW -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSHOW_OPT"

MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR  --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"

MYSQL_IMPORT="$MYSQL_IMPORT -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"

MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"

MYSQL="$MYSQL --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"

export MYSQL MYSQL_CHECK MYSQL_DUMP MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES

export MYSQL MYSQL_CHECK MYSQL_DUMP MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES MYSQL_IMPORT

export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR MYSQL_MY_PRINT_DEFAULTS

export NDB_TOOLS_DIR

export NDB_MGM

mysql-test/r/gis.result

+6 −0
Original line number Diff line number Diff line
@@ -688,3 +688,9 @@ alter table t1 add primary key pti(pt); 
ERROR 42000: BLOB/TEXT column 'pt' used in key specification without a key length

alter table t1 add primary key pti(pt(20));

drop table t1;

select (asWKT(geomfromwkb((0x000000000140240000000000004024000000000000))));

(asWKT(geomfromwkb((0x000000000140240000000000004024000000000000))))

POINT(10 10)

select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))));

(asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))))

POINT(10 10)

mysql-test/r/mysqldump.result

+10 −0
Original line number Diff line number Diff line
@@ -1677,6 +1677,16 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir 
</database>

</mysqldump>

drop table t1, t2;

create table t1 (a text character set utf8, b text character set latin1);

insert t1 values (0x4F736E616272C3BC636B, 0x4BF66C6E);

select * from t1;

a	b

Osnabrck	Kln

test.t1: Records: 1  Deleted: 0  Skipped: 0  Warnings: 0

select * from t1;

a	b

Osnabrck	Kln

drop table t1;

create table t1(a int);

create view v1 as select * from t1;