evgen@moonbone.local
508824f7c4
Fix bug #13622 Wrong view .frm created if some field's alias contain \n
...
View .frm parser assumes that query string will take only 1 line, with \n in
aliases query stringmay take several lines thus produces bad .frm file.
'query' parameter type changed from 'string' to 'escaped string'
2005-11-11 20:03:32 +03:00
hf@deer.(none)
f3502cd983
Additional fix for bug #14445 (analyse.test fails)
2005-11-01 16:14:26 +04:00
hf@deer.(none)
b98c93e0a8
Fix for bug #14445 (analyse.test fails)
2005-11-01 13:08:14 +04:00
hf@deer.(none)
69cd4c1ebf
gis.test fixed
2005-11-01 11:43:34 +04:00
kent@mysql.com
2c6902a093
mysql-test-run.pl:
...
Make IM ports change with MTR_BUILD_THREAD
2005-11-01 02:19:06 +01:00
jani@ua141d10.elisa.omakaista.fi
da64397b69
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 11:54:36 +02:00
hf@deer.(none)
5150bd8f9f
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.12839
2005-10-31 12:24:43 +04:00
msvensson@neptunus.(none)
531b847f23
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-31 09:14:58 +01:00
sergefp@mysql.com
4ad3313cd7
BUG#14139 - Merge to 5.0
2005-10-31 09:22:33 +03:00
jimw@mysql.com
b919b29da6
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:52:10 -07:00
patg@krsna.patg.net
22fe31e4d4
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-28 18:23:23 -07:00
jimw@mysql.com
0e572ff475
Merge mysql.com:/home/jimw/my/mysql-4.1-13796
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:19:19 -07:00
sergefp@mysql.com
09a4d0c7a7
4.1->5.0 merge
2005-10-29 02:36:57 +04:00
sergefp@mysql.com
3e76aa38fa
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct25-test
2005-10-29 02:19:38 +04:00
evgen@moonbone.local
ddea0b44e3
Manually merged
2005-10-28 23:17:51 +04:00
sergefp@mysql.com
7be7912135
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct25-test
2005-10-28 22:55:02 +04:00
sergefp@mysql.com
eb57f520ba
Merge
2005-10-28 22:31:41 +04:00
sergefp@mysql.com
f220d87476
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug14139
2005-10-28 21:42:01 +04:00
jimw@mysql.com
f6995841b3
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-28 10:17:37 -07:00
jimw@mysql.com
552c208bfe
Update test with changed result after merge
2005-10-28 10:16:44 -07:00
msvensson@neptunus.(none)
06c17bac2a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 19:10:05 +02:00
pem@mysql.com
1eaf95d5ca
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14256/mysql-5.0
2005-10-28 14:55:01 +02:00
msvensson@neptunus.(none)
1be4e65794
Use replace_result to mask portnumber printed from failing connect
2005-10-28 14:03:24 +02:00
bell@sanja.is.com.ua
186017b468
disabling archive_gis
2005-10-28 14:56:55 +03:00
evgen@moonbone.local
cc5d7c0715
Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server
...
Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
that fields_list is a part of all_fields_list. Because select have only
3 columns and analyse() redefines it to have 10 columns, int overrun in
setup_copy_fields() occurs and server goes to almost infinite loop.
Because fields_list used not only to send data ad fields types, it's wrong
to allow procedure redefine it. This patch separates select's fileds_list
and procedure's one. Now if procedure is present, copy of fields_list is
created in procedure_fields_list and it is used for sending data and fields.
2005-10-28 15:24:46 +04:00
pem@mysql.com
d201f2443d
Fixed BUG#14256: definer in view definition is not fully qualified
...
Changed the parser test for wildcards in hostname to checking for empty
strings instead (analogous with the test in default_view_definer()),
since wildcards do appear in the definer's host-part sometimes.
2005-10-28 12:11:32 +02:00
msvensson@neptunus.(none)
be6f7a3f82
Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:00:54 +02:00
bell@sanja.is.com.ua
b5d2e34572
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
2005-10-28 10:12:36 +03:00
jimw@mysql.com
009bcc7442
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-27 18:46:00 -07:00
jani@ua141d10.elisa.omakaista.fi
ada29913ac
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-28 03:16:28 +03:00
jani@ua141d10.elisa.omakaista.fi
af50eff0d2
Merge 4.1 - 5.0
2005-10-28 02:36:19 +03:00
bell@sanja.is.com.ua
6143c6543e
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
2005-10-28 00:24:13 +03:00
bell@sanja.is.com.ua
1b164c7b83
support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787)
2005-10-28 00:18:23 +03:00
jani@ua141d10.elisa.omakaista.fi
cbe21a8eb6
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-27 23:43:20 +03:00
monty@mysql.com
a9b1ff4095
Add DROP TABLE before trying to create view (in mysqldump)
...
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
2005-10-27 22:45:18 +03:00
jimw@mysql.com
7a8bd252d2
Merge mysql.com:/home/jimw/my/mysql-4.1-14009
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-27 10:20:38 -07:00
evgen@moonbone.local
ec009d6963
select.result:
...
After merge fix
2005-10-27 18:36:11 +04:00
evgen@moonbone.local
71b731e92e
Manually merged
2005-10-27 17:44:28 +04:00
monty@mysql.com
7ea49858b4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-27 15:16:12 +03:00
monty@mysql.com
1b3ed12017
Fixes during review of pushed code
...
Added back missing return in mysql_delete()
2005-10-27 15:15:01 +03:00
bar@mysql.com
dfe9480497
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13347
2005-10-27 13:41:09 +05:00
ramil@mysql.com
8ccf0f3791
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b14290
2005-10-27 10:09:41 +05:00
jimw@mysql.com
305b58b8a2
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-26 15:47:56 -07:00
jimw@mysql.com
607c129737
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-26 14:11:08 -07:00
brian@zim.(none)
ff6cfe6d66
Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.
2005-10-26 13:55:08 -07:00
patg@krsna.patg.net
bd0497ce3b
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-26 09:22:47 -07:00
brian@zim.(none)
22644b5f1c
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-10-26 09:08:44 -07:00
kent@mysql.com
cd0592136a
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-26 11:45:41 +02:00
kent@mysql.com
a2d7a9da90
mysql-test-run.pl:
...
Added MTR_BUILD_THREAD to control the port range
2005-10-26 01:24:03 +02:00