Commit 16a130a2 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
parents 07ed8294 32fa7e0f

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -1890,7 +1890,7 @@ static int init_dumping(char *database) 
        MYSQL_ROW row;

        MYSQL_RES *dbinfo;



        sprintf(qbuf,"SHOW CREATE DATABASE WITH IF NOT EXISTS %s",

        sprintf(qbuf,"SHOW CREATE DATABASE IF NOT EXISTS %s",

		qdatabase);



        if (mysql_query_with_error_report(sock, &dbinfo, qbuf))

mysql-test/r/mysqldump.result

+42 −0
Original line number Diff line number Diff line
@@ -332,3 +332,45 @@ CREATE TABLE `t1` ( 
2

3

drop table t1;



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="NO_AUTO_VALUE_ON_ZERO" */;



CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;



USE `test`;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



create database mysqldump_test_db character set latin2 collate latin2_bin;



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="NO_AUTO_VALUE_ON_ZERO" */;



CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CHARACTER SET latin2 COLLATE latin2_bin */;



USE `mysqldump_test_db`;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



drop database mysqldump_test_db;

mysql-test/t/mysqldump.test

+10 −0
Original line number Diff line number Diff line
@@ -127,3 +127,13 @@ insert into t1 values (1),(2),(3); 
--exec rm $MYSQL_TEST_DIR/var/tmp/t1.sql

--exec rm $MYSQL_TEST_DIR/var/tmp/t1.txt

drop table t1;



#

# Bug #6101: create database problem

#



--exec $MYSQL_DUMP --skip-comments --databases test



create database mysqldump_test_db character set latin2 collate latin2_bin;

--exec $MYSQL_DUMP --skip-comments --databases mysqldump_test_db;

drop database mysqldump_test_db;

sql/field.cc

+2 −2
Original line number Diff line number Diff line
@@ -1860,9 +1860,9 @@ int Field_long::store(double nr) 
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);

      error= 1;

    }

    else if (nr > (double) (ulong) ~0L)

    else if (nr > (double) UINT_MAX32)

    {

      res=(int32) (uint32) ~0L;

      res= UINT_MAX32;

      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);

      error= 1;

    }