diff options
| author | unknown <konstantin@mysql.com> | 2004-02-06 15:23:41 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-02-06 15:23:41 +0300 |
| commit | b1145e62e170ce391785dcc5a376054b6ba02216 (patch) | |
| tree | 7230fe81c62fa6a2bc488216ab3775d11795f3a5 /mysql-test/r/insert_select.result | |
| parent | f9a02ec1fc4c957d397103b586141543435392f7 (diff) | |
| parent | 726254d56490bc26e6f492d7824e9fba93c65606 (diff) | |
| download | mariadb-git-b1145e62e170ce391785dcc5a376054b6ba02216.tar.gz | |
merge 3.23 -> 4.0, 2003/02/06
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/func_math.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/insert_select.result')
| -rw-r--r-- | mysql-test/r/insert_select.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 23cb7244f48..c5b98976fd6 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -592,3 +592,15 @@ CREATE TABLE t2 ( USID INTEGER UNSIGNED AUTO_INCREMENT, ServerID TINYINT UNSIGNE INSERT INTO t1 VALUES (39,42,'Access-Granted','46','491721000045',2130706433,17690,NULL,NULL,'Localnet','491721000045','49172200000',754974766,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2003-07-18 00:11:21',NULL,NULL,20030718001121); INSERT INTO t2 SELECT USID, ServerID, State, SessionID, User, NASAddr, NASPort, NASPortType, ConnectSpeed, CarrierType, CallingStationID, CalledStationID, AssignedAddr, SessionTime, PacketsIn, OctetsIn, PacketsOut, OctetsOut, TerminateCause, UnauthTime, AccessRequestTime, AcctStartTime, AcctLastTime, LastModification from t1 LIMIT 1; drop table t1,t2; +Month Type Field Count +2003-09-01 1 1 100 +2003-09-01 1 2 100 +2003-09-01 2 1 100 +2003-09-01 2 2 100 +2003-09-01 3 1 100 +NULL Field Count +NULL 1 100 +NULL 2 100 +No Field Count +0 1 100 +0 2 100 |