Skip to content

M
mariadb
Commit eb314af4 authored by unknown's avatar unknown
Browse files
Options

Merge mysql.com:/usr/local/bk/mysql-5.0 

into  mysql.com:/home/pem/work/mysql-5.0


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents a50621e8 83772bc5
Hide whitespace changes
Inline Side-by-side
Showing with 2048 additions and 402 deletions
mysql-test/Makefile.am
View file @ eb314af4
......@@ -48,7 +48,7 @@ mysql_test_run_new_SOURCES= mysql_test_run_new.c my_manage.c my_create_tables.c
dist-hook:
mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
$(distdir)/std_data $(distdir)/lib
$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t
-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t
......@@ -71,7 +71,7 @@ install-data-local:
$(DESTDIR)$(testdir)/std_data \
$(DESTDIR)$(testdir)/lib
$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t
-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t
......
mysql-test/r/archive.result
View file @ eb314af4
......@@ -2617,6 +2617,1220 @@ auto fld1 companynr fld3 fld4 fld5 fld6
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
OPTIMIZE TABLE t2 EXTENDED;
Table Op Msg_type Msg_text
test.t2 optimize status OK
SELECT * FROM t2;
auto fld1 companynr fld3 fld4 fld5 fld6
1 000001 00 Omaha teethe neat
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
5 011501 37 bewilderingly wallet balled
6 011701 37 astound parters persist W
7 011702 37 admonishing eschew attainments
8 011703 37 sumac quitter fanatic
9 012001 37 flanking neat measures FAS
10 012003 37 combed Steinberg rightfulness
11 012004 37 subjective jarring capably
12 012005 37 scatterbrain tinily impulsive
13 012301 37 Eulerian balled starlet
14 012302 36 dubbed persist terminators
15 012303 37 Kane attainments untying
16 012304 37 overlay fanatic announces FAS
17 012305 37 perturb measures featherweight FAS
18 012306 37 goblins rightfulness pessimist FAS
19 012501 37 annihilates capably daughter
20 012602 37 Wotan impulsive decliner FAS
21 012603 37 snatching starlet lawgiver
22 012604 37 concludes terminators stated
23 012605 37 laterally untying readable
24 012606 37 yelped announces attrition
25 012701 37 grazing featherweight cascade FAS
26 012702 37 Baird pessimist motors FAS
27 012703 37 celery daughter interrogate
28 012704 37 misunderstander decliner pests W
29 013601 37 handgun lawgiver stairway
30 013602 37 foldout stated dopers FAS
31 013603 37 mystic readable testicle W
32 013604 37 succumbed attrition Parsifal W
33 013605 37 Nabisco cascade leavings
34 013606 37 fingerings motors postulation W
35 013607 37 aging interrogate squeaking
36 013608 37 afield pests contrasted
37 013609 37 ammonium stairway leftover
38 013610 37 boat dopers whiteners
39 013801 37 intelligibility testicle erases W
40 013802 37 Augustine Parsifal Punjab W
41 013803 37 teethe leavings Merritt
42 013804 37 dreaded postulation Quixotism
43 013901 37 scholastics squeaking sweetish FAS
44 016001 37 audiology contrasted dogging FAS
45 016201 37 wallet leftover scornfully FAS
46 016202 37 parters whiteners bellow
47 016301 37 eschew erases bills
48 016302 37 quitter Punjab cupboard FAS
49 016303 37 neat Merritt sureties FAS
50 016304 37 Steinberg Quixotism puddings
51 018001 37 jarring sweetish tapestry
52 018002 37 tinily dogging fetters
53 018003 37 balled scornfully bivalves
54 018004 37 persist bellow incurring
55 018005 37 attainments bills Adolph
56 018007 37 fanatic cupboard pithed
57 018008 37 measures sureties emergency
58 018009 37 rightfulness puddings Miles
59 018010 37 capably tapestry trimmings
60 018012 37 impulsive fetters tragedies W
61 018013 37 starlet bivalves skulking W
62 018014 37 terminators incurring flint
63 018015 37 untying Adolph flopping W
64 018016 37 announces pithed relaxing FAS
65 018017 37 featherweight emergency offload FAS
66 018018 37 pessimist Miles suites W
67 018019 37 daughter trimmings lists FAS
68 018020 37 decliner tragedies animized FAS
69 018021 37 lawgiver skulking multilayer W
70 018022 37 stated flint standardizes FAS
71 018023 37 readable flopping Judas
72 018024 37 attrition relaxing vacuuming W
73 018025 37 cascade offload dentally W
74 018026 37 motors suites humanness W
75 018027 37 interrogate lists inch W
76 018028 37 pests animized Weissmuller W
77 018029 37 stairway multilayer irresponsibly W
78 018030 37 dopers standardizes luckily FAS
79 018032 37 testicle Judas culled W
80 018033 37 Parsifal vacuuming medical FAS
81 018034 37 leavings dentally bloodbath FAS
82 018035 37 postulation humanness subschema W
83 018036 37 squeaking inch animals W
84 018037 37 contrasted Weissmuller Micronesia
85 018038 37 leftover irresponsibly repetitions
86 018039 37 whiteners luckily Antares
87 018040 37 erases culled ventilate W
88 018041 37 Punjab medical pityingly
89 018042 37 Merritt bloodbath interdependent
90 018043 37 Quixotism subschema Graves FAS
91 018044 37 sweetish animals neonatal
92 018045 37 dogging Micronesia scribbled FAS
93 018046 37 scornfully repetitions chafe W
94 018048 37 bellow Antares honoring
95 018049 37 bills ventilate realtor
96 018050 37 cupboard pityingly elite
97 018051 37 sureties interdependent funereal
98 018052 37 puddings Graves abrogating
99 018053 50 tapestry neonatal sorters
100 018054 37 fetters scribbled Conley
101 018055 37 bivalves chafe lectured
102 018056 37 incurring honoring Abraham
103 018057 37 Adolph realtor Hawaii W
104 018058 37 pithed elite cage
105 018059 36 emergency funereal hushes
106 018060 37 Miles abrogating Simla
107 018061 37 trimmings sorters reporters
108 018101 37 tragedies Conley Dutchman FAS
109 018102 37 skulking lectured descendants FAS
110 018103 37 flint Abraham groupings FAS
111 018104 37 flopping Hawaii dissociate
112 018201 37 relaxing cage coexist W
113 018202 37 offload hushes Beebe
114 018402 37 suites Simla Taoism
115 018403 37 lists reporters Connally
116 018404 37 animized Dutchman fetched FAS
117 018405 37 multilayer descendants checkpoints FAS
118 018406 37 standardizes groupings rusting
119 018409 37 Judas dissociate galling
120 018601 37 vacuuming coexist obliterates
121 018602 37 dentally Beebe traitor
122 018603 37 humanness Taoism resumes FAS
123 018801 37 inch Connally analyzable FAS
124 018802 37 Weissmuller fetched terminator FAS
125 018803 37 irresponsibly checkpoints gritty FAS
126 018804 37 luckily rusting firearm W
127 018805 37 culled galling minima
128 018806 37 medical obliterates Selfridge
129 018807 37 bloodbath traitor disable
130 018808 37 subschema resumes witchcraft W
131 018809 37 animals analyzable betroth W
132 018810 37 Micronesia terminator Manhattanize
133 018811 37 repetitions gritty imprint
134 018812 37 Antares firearm peeked
135 019101 37 ventilate minima swelling
136 019102 37 pityingly Selfridge interrelationships W
137 019103 37 interdependent disable riser
138 019201 37 Graves witchcraft Gandhian W
139 030501 37 neonatal betroth peacock A
140 030502 50 scribbled Manhattanize bee A
141 030503 37 chafe imprint kanji
142 030504 37 honoring peeked dental
143 031901 37 realtor swelling scarf FAS
144 036001 37 elite interrelationships chasm A
145 036002 37 funereal riser insolence A
146 036004 37 abrogating Gandhian syndicate
147 036005 37 sorters peacock alike
148 038001 37 Conley bee imperial A
149 038002 37 lectured kanji convulsion A
150 038003 37 Abraham dental railway A
151 038004 37 Hawaii scarf validate A
152 038005 37 cage chasm normalizes A
153 038006 37 hushes insolence comprehensive
154 038007 37 Simla syndicate chewing
155 038008 37 reporters alike denizen
156 038009 37 Dutchman imperial schemer
157 038010 37 descendants convulsion chronicle
158 038011 37 groupings railway Kline
159 038012 37 dissociate validate Anatole
160 038013 37 coexist normalizes partridges
161 038014 37 Beebe comprehensive brunch
162 038015 37 Taoism chewing recruited
163 038016 37 Connally denizen dimensions W
164 038017 37 fetched schemer Chicana W
165 038018 37 checkpoints chronicle announced
166 038101 37 rusting Kline praised FAS
167 038102 37 galling Anatole employing
168 038103 37 obliterates partridges linear
169 038104 37 traitor brunch quagmire
170 038201 37 resumes recruited western A
171 038202 37 analyzable dimensions relishing
172 038203 37 terminator Chicana serving A
173 038204 37 gritty announced scheduling
174 038205 37 firearm praised lore
175 038206 37 minima employing eventful
176 038208 37 Selfridge linear arteriole A
177 042801 37 disable quagmire disentangle
178 042802 37 witchcraft western cured A
179 046101 37 betroth relishing Fenton W
180 048001 37 Manhattanize serving avoidable A
181 048002 37 imprint scheduling drains A
182 048003 37 peeked lore detectably FAS
183 048004 37 swelling eventful husky
184 048005 37 interrelationships arteriole impelling
185 048006 37 riser disentangle undoes
186 048007 37 Gandhian cured evened
187 048008 37 peacock Fenton squeezes
188 048101 37 bee avoidable destroyer FAS
189 048102 37 kanji drains rudeness
190 048201 37 dental detectably beaner FAS
191 048202 37 scarf husky boorish
192 048203 37 chasm impelling Everhart
193 048204 37 insolence undoes encompass A
194 048205 37 syndicate evened mushrooms
195 048301 37 alike squeezes Alison A
196 048302 37 imperial destroyer externally FAS
197 048303 37 convulsion rudeness pellagra
198 048304 37 railway beaner cult
199 048305 37 validate boorish creek A
200 048401 37 normalizes Everhart Huffman
201 048402 37 comprehensive encompass Majorca FAS
202 048403 37 chewing mushrooms governing A
203 048404 37 denizen Alison gadfly FAS
204 048405 37 schemer externally reassigned FAS
205 048406 37 chronicle pellagra intentness W
206 048407 37 Kline cult craziness
207 048408 37 Anatole creek psychic
208 048409 37 partridges Huffman squabbled
209 048410 37 brunch Majorca burlesque
210 048411 37 recruited governing capped
211 048412 37 dimensions gadfly extracted A
212 048413 37 Chicana reassigned DiMaggio
213 048601 37 announced intentness exclamation FAS
214 048602 37 praised craziness subdirectory
215 048603 37 employing psychic fangs
216 048604 37 linear squabbled buyer A
217 048801 37 quagmire burlesque pithing A
218 050901 37 western capped transistorizing A
219 051201 37 relishing extracted nonbiodegradable
220 056002 37 serving DiMaggio dislocate
221 056003 37 scheduling exclamation monochromatic FAS
222 056004 37 lore subdirectory batting
223 056102 37 eventful fangs postcondition A
224 056203 37 arteriole buyer catalog FAS
225 056204 37 disentangle pithing Remus
226 058003 37 cured transistorizing devices A
227 058004 37 Fenton nonbiodegradable bike A
228 058005 37 avoidable dislocate qualify
229 058006 37 drains monochromatic detained
230 058007 37 detectably batting commended
231 058101 37 husky postcondition civilize
232 058102 37 impelling catalog Elmhurst
233 058103 37 undoes Remus anesthetizing
234 058105 37 evened devices deaf
235 058111 37 squeezes bike Brigham
236 058112 37 destroyer qualify title
237 058113 37 rudeness detained coarse
238 058114 37 beaner commended combinations
239 058115 37 boorish civilize grayness
240 058116 37 Everhart Elmhurst innumerable FAS
241 058117 37 encompass anesthetizing Caroline A
242 058118 37 mushrooms deaf fatty FAS
243 058119 37 Alison Brigham eastbound
244 058120 37 externally title inexperienced
245 058121 37 pellagra coarse hoarder A
246 058122 37 cult combinations scotch W
247 058123 37 creek grayness passport A
248 058124 37 Huffman innumerable strategic FAS
249 058125 37 Majorca Caroline gated
250 058126 37 governing fatty flog
251 058127 37 gadfly eastbound Pipestone
252 058128 37 reassigned inexperienced Dar
253 058201 37 intentness hoarder Corcoran
254 058202 37 craziness scotch flyers A
255 058303 37 psychic passport competitions W
256 058304 37 squabbled strategic suppliers FAS
257 058602 37 burlesque gated skips
258 058603 37 capped flog institutes
259 058604 37 extracted Pipestone troop A
260 058605 37 DiMaggio Dar connective W
261 058606 37 exclamation Corcoran denies
262 058607 37 subdirectory flyers polka
263 060401 36 fangs competitions observations FAS
264 061701 36 buyer suppliers askers
265 066201 36 pithing skips homeless FAS
266 066501 36 transistorizing institutes Anna
267 068001 36 nonbiodegradable troop subdirectories W
268 068002 36 dislocate connective decaying FAS
269 068005 36 monochromatic denies outwitting W
270 068006 36 batting polka Harpy W
271 068007 36 postcondition observations crazed
272 068008 36 catalog askers suffocate
273 068009 36 Remus homeless provers FAS
274 068010 36 devices Anna technically
275 068011 36 bike subdirectories Franklinizations
276 068202 36 qualify decaying considered
277 068302 36 detained outwitting tinnily
278 068303 36 commended Harpy uninterruptedly
279 068401 36 civilize crazed whistled A
280 068501 36 Elmhurst suffocate automate
281 068502 36 anesthetizing provers gutting W
282 068503 36 deaf technically surreptitious
283 068602 36 Brigham Franklinizations Choctaw
284 068603 36 title considered cooks
285 068701 36 coarse tinnily millivolt FAS
286 068702 36 combinations uninterruptedly counterpoise
287 068703 36 grayness whistled Gothicism
288 076001 36 innumerable automate feminine
289 076002 36 Caroline gutting metaphysically W
290 076101 36 fatty surreptitious sanding A
291 076102 36 eastbound Choctaw contributorily
292 076103 36 inexperienced cooks receivers FAS
293 076302 36 hoarder millivolt adjourn
294 076303 36 scotch counterpoise straggled A
295 076304 36 passport Gothicism druggists
296 076305 36 strategic feminine thanking FAS
297 076306 36 gated metaphysically ostrich
298 076307 36 flog sanding hopelessness FAS
299 076402 36 Pipestone contributorily Eurydice
300 076501 36 Dar receivers excitation W
301 076502 36 Corcoran adjourn presumes FAS
302 076701 36 flyers straggled imaginable FAS
303 078001 36 competitions druggists concoct W
304 078002 36 suppliers thanking peering W
305 078003 36 skips ostrich Phelps FAS
306 078004 36 institutes hopelessness ferociousness FAS
307 078005 36 troop Eurydice sentences
308 078006 36 connective excitation unlocks
309 078007 36 denies presumes engrossing W
310 078008 36 polka imaginable Ruth
311 078101 36 observations concoct tying
312 078103 36 askers peering exclaimers
313 078104 36 homeless Phelps synergy
314 078105 36 Anna ferociousness Huey W
315 082101 36 subdirectories sentences merging
316 083401 36 decaying unlocks judges A
317 084001 36 outwitting engrossing Shylock W
318 084002 36 Harpy Ruth Miltonism
319 086001 36 crazed tying hen W
320 086102 36 suffocate exclaimers honeybee FAS
321 086201 36 provers synergy towers
322 088001 36 technically Huey dilutes W
323 088002 36 Franklinizations merging numerals FAS
324 088003 36 considered judges democracy FAS
325 088004 36 tinnily Shylock Ibero-
326 088101 36 uninterruptedly Miltonism invalids
327 088102 36 whistled hen behavior
328 088103 36 automate honeybee accruing
329 088104 36 gutting towers relics A
330 088105 36 surreptitious dilutes rackets
331 088106 36 Choctaw numerals Fischbein W
332 088201 36 cooks democracy phony W
333 088203 36 millivolt Ibero- cross FAS
334 088204 36 counterpoise invalids cleanup
335 088302 37 Gothicism behavior conspirator
336 088303 37 feminine accruing label FAS
337 088305 37 metaphysically relics university
338 088402 37 sanding rackets cleansed FAS
339 088501 36 contributorily Fischbein ballgown
340 088502 36 receivers phony starlet
341 088503 36 adjourn cross aqueous
342 098001 58 straggled cleanup portrayal A
343 098002 58 druggists conspirator despising W
344 098003 58 thanking label distort W
345 098004 58 ostrich university palmed
346 098005 58 hopelessness cleansed faced
347 098006 58 Eurydice ballgown silverware
348 141903 29 excitation starlet assessor
349 098008 58 presumes aqueous spiders
350 098009 58 imaginable portrayal artificially
351 098010 58 concoct despising reminiscence
352 098011 58 peering distort Mexican
353 098012 58 Phelps palmed obnoxious
354 098013 58 ferociousness faced fragile
355 098014 58 sentences silverware apprehensible
356 098015 58 unlocks assessor births
357 098016 58 engrossing spiders garages
358 098017 58 Ruth artificially panty
359 098018 58 tying reminiscence anteater
360 098019 58 exclaimers Mexican displacement A
361 098020 58 synergy obnoxious drovers A
362 098021 58 Huey fragile patenting A
363 098022 58 merging apprehensible far A
364 098023 58 judges births shrieks
365 098024 58 Shylock garages aligning W
366 098025 37 Miltonism panty pragmatism
367 106001 36 hen anteater fevers W
368 108001 36 honeybee displacement reexamines A
369 108002 36 towers drovers occupancies
370 108003 36 dilutes patenting sweats FAS
371 108004 36 numerals far modulators
372 108005 36 democracy shrieks demand W
373 108007 36 Ibero- aligning Madeira
374 108008 36 invalids pragmatism Viennese W
375 108009 36 behavior fevers chillier W
376 108010 36 accruing reexamines wildcats FAS
377 108011 36 relics occupancies gentle
378 108012 36 rackets sweats Angles W
379 108101 36 Fischbein modulators accuracies
380 108102 36 phony demand toggle
381 108103 36 cross Madeira Mendelssohn W
382 108111 50 cleanup Viennese behaviorally
383 108105 36 conspirator chillier Rochford
384 108106 36 label wildcats mirror W
385 108107 36 university gentle Modula
386 108108 50 cleansed Angles clobbering
387 108109 36 ballgown accuracies chronography
388 108110 36 starlet toggle Eskimoizeds
389 108201 36 aqueous Mendelssohn British W
390 108202 36 portrayal behaviorally pitfalls
391 108203 36 despising Rochford verify W
392 108204 36 distort mirror scatter FAS
393 108205 36 palmed Modula Aztecan
394 108301 36 faced clobbering acuity W
395 108302 36 silverware chronography sinking W
396 112101 36 assessor Eskimoizeds beasts FAS
397 112102 36 spiders British Witt W
398 113701 36 artificially pitfalls physicists FAS
399 116001 36 reminiscence verify folksong A
400 116201 36 Mexican scatter strokes FAS
401 116301 36 obnoxious Aztecan crowder
402 116302 36 fragile acuity merry
403 116601 36 apprehensible sinking cadenced
404 116602 36 births beasts alimony A
405 116603 36 garages Witt principled A
406 116701 36 panty physicists golfing
407 116702 36 anteater folksong undiscovered
408 118001 36 displacement strokes irritates
409 118002 36 drovers crowder patriots A
410 118003 36 patenting merry rooms FAS
411 118004 36 far cadenced towering W
412 118005 36 shrieks alimony displease
413 118006 36 aligning principled photosensitive
414 118007 36 pragmatism golfing inking
415 118008 36 fevers undiscovered gainers
416 118101 36 reexamines irritates leaning A
417 118102 36 occupancies patriots hydrant A
418 118103 36 sweats rooms preserve
419 118202 36 modulators towering blinded A
420 118203 36 demand displease interactions A
421 118204 36 Madeira photosensitive Barry
422 118302 36 Viennese inking whiteness A
423 118304 36 chillier gainers pastimes W
424 118305 36 wildcats leaning Edenization
425 118306 36 gentle hydrant Muscat
426 118307 36 Angles preserve assassinated
427 123101 36 accuracies blinded labeled
428 123102 36 toggle interactions glacial A
429 123301 36 Mendelssohn Barry implied W
430 126001 36 behaviorally whiteness bibliographies W
431 126002 36 Rochford pastimes Buchanan
432 126003 36 mirror Edenization forgivably FAS
433 126101 36 Modula Muscat innuendo A
434 126301 36 clobbering assassinated den FAS
435 126302 36 chronography labeled submarines W
436 126402 36 Eskimoizeds glacial mouthful A
437 126601 36 British implied expiring
438 126602 36 pitfalls bibliographies unfulfilled FAS
439 126702 36 verify Buchanan precession
440 128001 36 scatter forgivably nullified
441 128002 36 Aztecan innuendo affects
442 128003 36 acuity den Cynthia
443 128004 36 sinking submarines Chablis A
444 128005 36 beasts mouthful betterments FAS
445 128007 36 Witt expiring advertising
446 128008 36 physicists unfulfilled rubies A
447 128009 36 folksong precession southwest FAS
448 128010 36 strokes nullified superstitious A
449 128011 36 crowder affects tabernacle W
450 128012 36 merry Cynthia silk A
451 128013 36 cadenced Chablis handsomest A
452 128014 36 alimony betterments Persian A
453 128015 36 principled advertising analog W
454 128016 36 golfing rubies complex W
455 128017 36 undiscovered southwest Taoist
456 128018 36 irritates superstitious suspend
457 128019 36 patriots tabernacle relegated
458 128020 36 rooms silk awesome W
459 128021 36 towering handsomest Bruxelles
460 128022 36 displease Persian imprecisely A
461 128023 36 photosensitive analog televise
462 128101 36 inking complex braking
463 128102 36 gainers Taoist true FAS
464 128103 36 leaning suspend disappointing FAS
465 128104 36 hydrant relegated navally W
466 128106 36 preserve awesome circus
467 128107 36 blinded Bruxelles beetles
468 128108 36 interactions imprecisely trumps
469 128202 36 Barry televise fourscore W
470 128203 36 whiteness braking Blackfoots
471 128301 36 pastimes true Grady
472 128302 36 Edenization disappointing quiets FAS
473 128303 36 Muscat navally floundered FAS
474 128304 36 assassinated circus profundity W
475 128305 36 labeled beetles Garrisonian W
476 128307 36 glacial trumps Strauss
477 128401 36 implied fourscore cemented FAS
478 128502 36 bibliographies Blackfoots contrition A
479 128503 36 Buchanan Grady mutations
480 128504 36 forgivably quiets exhibits W
481 128505 36 innuendo floundered tits
482 128601 36 den profundity mate A
483 128603 36 submarines Garrisonian arches
484 128604 36 mouthful Strauss Moll
485 128702 36 expiring cemented ropers
486 128703 36 unfulfilled contrition bombast
487 128704 36 precession mutations difficultly A
488 138001 36 nullified exhibits adsorption
489 138002 36 affects tits definiteness FAS
490 138003 36 Cynthia mate cultivation A
491 138004 36 Chablis arches heals A
492 138005 36 betterments Moll Heusen W
493 138006 36 advertising ropers target FAS
494 138007 36 rubies bombast cited A
495 138008 36 southwest difficultly congresswoman W
496 138009 36 superstitious adsorption Katherine
497 138102 36 tabernacle definiteness titter A
498 138103 36 silk cultivation aspire A
499 138104 36 handsomest heals Mardis
500 138105 36 Persian Heusen Nadia W
501 138201 36 analog target estimating FAS
502 138302 36 complex cited stuck A
503 138303 36 Taoist congresswoman fifteenth A
504 138304 36 suspend Katherine Colombo
505 138401 29 relegated titter survey A
506 140102 29 awesome aspire staffing
507 140103 29 Bruxelles Mardis obtain
508 140104 29 imprecisely Nadia loaded
509 140105 29 televise estimating slaughtered
510 140201 29 braking stuck lights A
511 140701 29 true fifteenth circumference
512 141501 29 disappointing Colombo dull A
513 141502 29 navally survey weekly A
514 141901 29 circus staffing wetness
515 141902 29 beetles obtain visualized
516 142101 29 trumps loaded Tannenbaum
517 142102 29 fourscore slaughtered moribund
518 142103 29 Blackfoots lights demultiplex
519 142701 29 Grady circumference lockings
520 143001 29 quiets dull thugs FAS
521 143501 29 floundered weekly unnerves
522 143502 29 profundity wetness abut
523 148001 29 Garrisonian visualized Chippewa A
524 148002 29 Strauss Tannenbaum stratifications A
525 148003 29 cemented moribund signaled
526 148004 29 contrition demultiplex Italianizes A
527 148005 29 mutations lockings algorithmic A
528 148006 29 exhibits thugs paranoid FAS
529 148007 29 tits unnerves camping A
530 148009 29 mate abut signifying A
531 148010 29 arches Chippewa Patrice W
532 148011 29 Moll stratifications search A
533 148012 29 ropers signaled Angeles A
534 148013 29 bombast Italianizes semblance
535 148023 36 difficultly algorithmic taxed
536 148015 29 adsorption paranoid Beatrice
537 148016 29 definiteness camping retrace
538 148017 29 cultivation signifying lockout
539 148018 29 heals Patrice grammatic
540 148019 29 Heusen search helmsman
541 148020 29 target Angeles uniform W
542 148021 29 cited semblance hamming
543 148022 29 congresswoman taxed disobedience
544 148101 29 Katherine Beatrice captivated A
545 148102 29 titter retrace transferals A
546 148201 29 aspire lockout cartographer A
547 148401 29 Mardis grammatic aims FAS
548 148402 29 Nadia helmsman Pakistani
549 148501 29 estimating uniform burglarized FAS
550 148502 29 stuck hamming saucepans A
551 148503 29 fifteenth disobedience lacerating A
552 148504 29 Colombo captivated corny
553 148601 29 survey transferals megabytes FAS
554 148602 29 staffing cartographer chancellor
555 150701 29 obtain aims bulk A
556 152101 29 loaded Pakistani commits A
557 152102 29 slaughtered burglarized meson W
558 155202 36 lights saucepans deputies
559 155203 29 circumference lacerating northeaster A
560 155204 29 dull corny dipole
561 155205 29 weekly megabytes machining 0
562 156001 29 wetness chancellor therefore
563 156002 29 visualized bulk Telefunken
564 156102 29 Tannenbaum commits salvaging
565 156301 29 moribund meson Corinthianizes A
566 156302 29 demultiplex deputies restlessly A
567 156303 29 lockings northeaster bromides
568 156304 29 thugs dipole generalized A
569 156305 29 unnerves machining mishaps
570 156306 29 abut therefore quelling
571 156501 29 Chippewa Telefunken spiritual A
572 158001 29 stratifications salvaging beguiles FAS
573 158002 29 signaled Corinthianizes Trobriand FAS
574 158101 29 Italianizes restlessly fleeing A
575 158102 29 algorithmic bromides Armour A
576 158103 29 paranoid generalized chin A
577 158201 29 camping mishaps provers A
578 158202 29 signifying quelling aeronautic A
579 158203 29 Patrice spiritual voltage W
580 158204 29 search beguiles sash
581 158301 29 Angeles Trobriand anaerobic A
582 158302 29 semblance fleeing simultaneous A
583 158303 29 taxed Armour accumulating A
584 158304 29 Beatrice chin Medusan A
585 158305 29 retrace provers shouted A
586 158306 29 lockout aeronautic freakish
587 158501 29 grammatic voltage index FAS
588 160301 29 helmsman sash commercially
589 166101 50 uniform anaerobic mistiness A
590 166102 50 hamming simultaneous endpoint
591 168001 29 disobedience accumulating straight A
592 168002 29 captivated Medusan flurried
593 168003 29 transferals shouted denotative A
594 168101 29 cartographer freakish coming FAS
595 168102 29 aims index commencements FAS
596 168103 29 Pakistani commercially gentleman
597 168104 29 burglarized mistiness gifted
598 168202 29 saucepans endpoint Shanghais
599 168301 29 lacerating straight sportswriting A
600 168502 29 corny flurried sloping A
601 168503 29 megabytes denotative navies
602 168601 29 chancellor coming leaflet A
603 173001 40 bulk commencements shooter
604 173701 40 commits gentleman Joplin FAS
605 173702 40 meson gifted babies
606 176001 40 deputies Shanghais subdivision FAS
607 176101 40 northeaster sportswriting burstiness W
608 176201 40 dipole sloping belted FAS
609 176401 40 machining navies assails FAS
610 176501 40 therefore leaflet admiring W
611 176601 40 Telefunken shooter swaying 0
612 176602 40 salvaging Joplin Goldstine FAS
613 176603 40 Corinthianizes babies fitting
614 178001 40 restlessly subdivision Norwalk W
615 178002 40 bromides burstiness weakening W
616 178003 40 generalized belted analogy FAS
617 178004 40 mishaps assails deludes
618 178005 40 quelling admiring cokes
619 178006 40 spiritual swaying Clayton
620 178007 40 beguiles Goldstine exhausts
621 178008 40 Trobriand fitting causality
622 178101 40 fleeing Norwalk sating FAS
623 178102 40 Armour weakening icon
624 178103 40 chin analogy throttles
625 178201 40 provers deludes communicants FAS
626 178202 40 aeronautic cokes dehydrate FAS
627 178301 40 voltage Clayton priceless FAS
628 178302 40 sash exhausts publicly
629 178401 40 anaerobic causality incidentals FAS
630 178402 40 simultaneous sating commonplace
631 178403 40 accumulating icon mumbles
632 178404 40 Medusan throttles furthermore W
633 178501 40 shouted communicants cautioned W
634 186002 37 freakish dehydrate parametrized A
635 186102 37 index priceless registration A
636 186201 40 commercially publicly sadly FAS
637 186202 40 mistiness incidentals positioning
638 186203 40 endpoint commonplace babysitting
639 186302 37 straight mumbles eternal A
640 188007 37 flurried furthermore hoarder
641 188008 37 denotative cautioned congregates
642 188009 37 coming parametrized rains
643 188010 37 commencements registration workers W
644 188011 37 gentleman sadly sags A
645 188012 37 gifted positioning unplug W
646 188013 37 Shanghais babysitting garage A
647 188014 37 sportswriting eternal boulder A
648 188015 37 sloping hoarder hollowly A
649 188016 37 navies congregates specifics
650 188017 37 leaflet rains Teresa
651 188102 37 shooter workers Winsett
652 188103 37 Joplin sags convenient A
653 188202 37 babies unplug buckboards FAS
654 188301 40 subdivision garage amenities
655 188302 40 burstiness boulder resplendent FAS
656 188303 40 belted hollowly priding FAS
657 188401 37 assails specifics configurations
658 188402 37 admiring Teresa untidiness A
659 188503 37 swaying Winsett Brice W
660 188504 37 Goldstine convenient sews FAS
661 188505 37 fitting buckboards participated
662 190701 37 Norwalk amenities Simon FAS
663 190703 50 weakening resplendent certificates
664 191701 37 analogy priding Fitzpatrick
665 191702 37 deludes configurations Evanston A
666 191703 37 cokes untidiness misted
667 196001 37 Clayton Brice textures A
668 196002 37 exhausts sews save
669 196003 37 causality participated count
670 196101 37 sating Simon rightful A
671 196103 37 icon certificates chaperone
672 196104 37 throttles Fitzpatrick Lizzy A
673 196201 37 communicants Evanston clenched A
674 196202 37 dehydrate misted effortlessly
675 196203 37 priceless textures accessed
676 198001 37 publicly save beaters A
677 198003 37 incidentals count Hornblower FAS
678 198004 37 commonplace rightful vests A
679 198005 37 mumbles chaperone indulgences FAS
680 198006 37 furthermore Lizzy infallibly A
681 198007 37 cautioned clenched unwilling FAS
682 198008 37 parametrized effortlessly excrete FAS
683 198009 37 registration accessed spools A
684 198010 37 sadly beaters crunches FAS
685 198011 37 positioning Hornblower overestimating FAS
686 198012 37 babysitting vests ineffective
687 198013 37 eternal indulgences humiliation A
688 198014 37 hoarder infallibly sophomore
689 198015 37 congregates unwilling star
690 198017 37 rains excrete rifles
691 198018 37 workers spools dialysis
692 198019 37 sags crunches arriving
693 198020 37 unplug overestimating indulge
694 198021 37 garage ineffective clockers
695 198022 37 boulder humiliation languages
696 198023 50 hollowly sophomore Antarctica A
697 198024 37 specifics star percentage
698 198101 37 Teresa rifles ceiling A
699 198103 37 Winsett dialysis specification
700 198105 37 convenient arriving regimented A
701 198106 37 buckboards indulge ciphers
702 198201 37 amenities clockers pictures A
703 198204 37 resplendent languages serpents A
704 198301 53 priding Antarctica allot A
705 198302 53 configurations percentage realized A
706 198303 53 untidiness ceiling mayoral A
707 198304 53 Brice specification opaquely A
708 198401 37 sews regimented hostess FAS
709 198402 37 participated ciphers fiftieth
710 198403 37 Simon pictures incorrectly
711 202101 37 certificates serpents decomposition FAS
712 202301 37 Fitzpatrick allot stranglings
713 202302 37 Evanston realized mixture FAS
714 202303 37 misted mayoral electroencephalography FAS
715 202304 37 textures opaquely similarities FAS
716 202305 37 save hostess charges W
717 202601 37 count fiftieth freest FAS
718 202602 37 rightful incorrectly Greenberg FAS
719 202605 37 chaperone decomposition tinting
720 202606 37 Lizzy stranglings expelled W
721 202607 37 clenched mixture warm
722 202901 37 effortlessly electroencephalography smoothed
723 202902 37 accessed similarities deductions FAS
724 202903 37 beaters charges Romano W
725 202904 37 Hornblower freest bitterroot
726 202907 37 vests Greenberg corset
727 202908 37 indulgences tinting securing
728 203101 37 infallibly expelled environing FAS
729 203103 37 unwilling warm cute
730 203104 37 excrete smoothed Crays
731 203105 37 spools deductions heiress FAS
732 203401 37 crunches Romano inform FAS
733 203402 37 overestimating bitterroot avenge
734 203404 37 ineffective corset universals
735 203901 37 humiliation securing Kinsey W
736 203902 37 sophomore environing ravines FAS
737 203903 37 star cute bestseller
738 203906 37 rifles Crays equilibrium
739 203907 37 dialysis heiress extents 0
740 203908 37 arriving inform relatively
741 203909 37 indulge avenge pressure FAS
742 206101 37 clockers universals critiques FAS
743 206201 37 languages Kinsey befouled
744 206202 37 Antarctica ravines rightfully FAS
745 206203 37 percentage bestseller mechanizing FAS
746 206206 37 ceiling equilibrium Latinizes
747 206207 37 specification extents timesharing
748 206208 37 regimented relatively Aden
749 208001 37 ciphers pressure embassies
750 208002 37 pictures critiques males FAS
751 208003 37 serpents befouled shapelessly FAS
752 208004 37 allot rightfully genres FAS
753 208008 37 realized mechanizing mastering
754 208009 37 mayoral Latinizes Newtonian
755 208010 37 opaquely timesharing finishers FAS
756 208011 37 hostess Aden abates
757 208101 37 fiftieth embassies teem
758 208102 37 incorrectly males kiting FAS
759 208103 37 decomposition shapelessly stodgy FAS
760 208104 37 stranglings genres scalps FAS
761 208105 37 mixture mastering feed FAS
762 208110 37 electroencephalography Newtonian guitars
763 208111 37 similarities finishers airships
764 208112 37 charges abates store
765 208113 37 freest teem denounces
766 208201 37 Greenberg kiting Pyle FAS
767 208203 37 tinting stodgy Saxony
768 208301 37 expelled scalps serializations FAS
769 208302 37 warm feed Peruvian FAS
770 208305 37 smoothed guitars taxonomically FAS
771 208401 37 deductions airships kingdom A
772 208402 37 Romano store stint A
773 208403 37 bitterroot denounces Sault A
774 208404 37 corset Pyle faithful
775 208501 37 securing Saxony Ganymede FAS
776 208502 37 environing serializations tidiness FAS
777 208503 37 cute Peruvian gainful FAS
778 208504 37 Crays taxonomically contrary FAS
779 208505 37 heiress kingdom Tipperary FAS
780 210101 37 inform stint tropics W
781 210102 37 avenge Sault theorizers
782 210103 37 universals faithful renew 0
783 210104 37 Kinsey Ganymede already
784 210105 37 ravines tidiness terminal
785 210106 37 bestseller gainful Hegelian
786 210107 37 equilibrium contrary hypothesizer
787 210401 37 extents Tipperary warningly FAS
788 213201 37 relatively tropics journalizing FAS
789 213203 37 pressure theorizers nested
790 213204 37 critiques renew Lars
791 213205 37 befouled already saplings
792 213206 37 rightfully terminal foothill
793 213207 37 mechanizing Hegelian labeled
794 216101 37 Latinizes hypothesizer imperiously FAS
795 216103 37 timesharing warningly reporters FAS
796 218001 37 Aden journalizing furnishings FAS
797 218002 37 embassies nested precipitable FAS
798 218003 37 males Lars discounts FAS
799 218004 37 shapelessly saplings excises FAS
800 143503 50 genres foothill Stalin
801 218006 37 mastering labeled despot FAS
802 218007 37 Newtonian imperiously ripeness FAS
803 218008 37 finishers reporters Arabia
804 218009 37 abates furnishings unruly
805 218010 37 teem precipitable mournfulness
806 218011 37 kiting discounts boom FAS
807 218020 37 stodgy excises slaughter A
808 218021 50 scalps Stalin Sabine
809 218022 37 feed despot handy FAS
810 218023 37 guitars ripeness rural
811 218024 37 airships Arabia organizer
812 218101 37 store unruly shipyard FAS
813 218102 37 denounces mournfulness civics FAS
814 218103 37 Pyle boom inaccuracy FAS
815 218201 37 Saxony slaughter rules FAS
816 218202 37 serializations Sabine juveniles FAS
817 218203 37 Peruvian handy comprised W
818 218204 37 taxonomically rural investigations
819 218205 37 kingdom organizer stabilizes A
820 218301 37 stint shipyard seminaries FAS
821 218302 37 Sault civics Hunter A
822 218401 37 faithful inaccuracy sporty FAS
823 218402 37 Ganymede rules test FAS
824 218403 37 tidiness juveniles weasels
825 218404 37 gainful comprised CERN
826 218407 37 contrary investigations tempering
827 218408 37 Tipperary stabilizes afore FAS
828 218409 37 tropics seminaries Galatean
829 218410 37 theorizers Hunter techniques W
830 226001 37 renew sporty error
831 226002 37 already test veranda
832 226003 37 terminal weasels severely
833 226004 37 Hegelian CERN Cassites FAS
834 226005 37 hypothesizer tempering forthcoming
835 226006 37 warningly afore guides
836 226007 37 journalizing Galatean vanish FAS
837 226008 37 nested techniques lied A
838 226203 37 Lars error sawtooth FAS
839 226204 37 saplings veranda fated FAS
840 226205 37 foothill severely gradually
841 226206 37 labeled Cassites widens
842 226207 37 imperiously forthcoming preclude
843 226208 37 reporters guides Jobrel
844 226209 37 furnishings vanish hooker
845 226210 37 precipitable lied rainstorm
846 226211 37 discounts sawtooth disconnects
847 228001 37 excises fated cruelty
848 228004 37 Stalin gradually exponentials A
849 228005 37 despot widens affective A
850 228006 37 ripeness preclude arteries
851 228007 37 Arabia Jobrel Crosby FAS
852 228008 37 unruly hooker acquaint
853 228009 37 mournfulness rainstorm evenhandedly
854 228101 37 boom disconnects percentage
855 228108 37 slaughter cruelty disobedience
856 228109 37 Sabine exponentials humility
857 228110 37 handy affective gleaning A
858 228111 37 rural arteries petted A
859 228112 37 organizer Crosby bloater A
860 228113 37 shipyard acquaint minion A
861 228114 37 civics evenhandedly marginal A
862 228115 37 inaccuracy percentage apiary A
863 228116 37 rules disobedience measures
864 228117 37 juveniles humility precaution
865 228118 37 comprised gleaning repelled
866 228119 37 investigations petted primary FAS
867 228120 37 stabilizes bloater coverings
868 228121 37 seminaries minion Artemia A
869 228122 37 Hunter marginal navigate
870 228201 37 sporty apiary spatial
871 228206 37 test measures Gurkha
872 228207 37 weasels precaution meanwhile A
873 228208 37 CERN repelled Melinda A
874 228209 37 tempering primary Butterfield
875 228210 37 afore coverings Aldrich A
876 228211 37 Galatean Artemia previewing A
877 228212 37 techniques navigate glut A
878 228213 37 error spatial unaffected
879 228214 37 veranda Gurkha inmate
880 228301 37 severely meanwhile mineral
881 228305 37 Cassites Melinda impending A
882 228306 37 forthcoming Butterfield meditation A
883 228307 37 guides Aldrich ideas
884 228308 37 vanish previewing miniaturizes W
885 228309 37 lied glut lewdly
886 228310 37 sawtooth unaffected title
887 228311 37 fated inmate youthfulness
888 228312 37 gradually mineral creak FAS
889 228313 37 widens impending Chippewa
890 228314 37 preclude meditation clamored
891 228401 65 Jobrel ideas freezes
892 228402 65 hooker miniaturizes forgivably FAS
893 228403 65 rainstorm lewdly reduce FAS
894 228404 65 disconnects title McGovern W
895 228405 65 cruelty youthfulness Nazis W
896 228406 65 exponentials creak epistle W
897 228407 65 affective Chippewa socializes W
898 228408 65 arteries clamored conceptions
899 228409 65 Crosby freezes Kevin
900 228410 65 acquaint forgivably uncovering
901 230301 37 evenhandedly reduce chews FAS
902 230302 37 percentage McGovern appendixes FAS
903 230303 37 disobedience Nazis raining
904 018062 37 humility epistle infest
905 230501 37 gleaning socializes compartment
906 230502 37 petted conceptions minting
907 230503 37 bloater Kevin ducks
908 230504 37 minion uncovering roped A
909 230505 37 marginal chews waltz
910 230506 37 apiary appendixes Lillian
911 230507 37 measures raining repressions A
912 230508 37 precaution infest chillingly
913 230509 37 repelled compartment noncritical
914 230901 37 primary minting lithograph
915 230902 37 coverings ducks spongers
916 230903 37 Artemia roped parenthood
917 230904 37 navigate waltz posed
918 230905 37 spatial Lillian instruments
919 230906 37 Gurkha repressions filial
920 230907 37 meanwhile chillingly fixedly
921 230908 37 Melinda noncritical relives
922 230909 37 Butterfield lithograph Pandora
923 230910 37 Aldrich spongers watering A
924 230911 37 previewing parenthood ungrateful
925 230912 37 glut posed secures
926 230913 37 unaffected instruments chastisers
927 230914 37 inmate filial icon
928 231304 37 mineral fixedly reuniting A
929 231305 37 impending relives imagining A
930 231306 37 meditation Pandora abiding A
931 231307 37 ideas watering omnisciently
932 231308 37 miniaturizes ungrateful Britannic
933 231309 37 lewdly secures scholastics A
934 231310 37 title chastisers mechanics A
935 231311 37 youthfulness icon humidly A
936 231312 37 creak reuniting masterpiece
937 231313 37 Chippewa imagining however
938 231314 37 clamored abiding Mendelian
939 231315 37 freezes omnisciently jarred
940 232102 37 forgivably Britannic scolds
941 232103 37 reduce scholastics infatuate
942 232104 37 McGovern mechanics willed A
943 232105 37 Nazis humidly joyfully
944 232106 37 epistle masterpiece Microsoft
945 232107 37 socializes however fibrosities
946 232108 37 conceptions Mendelian Baltimorean
947 232601 37 Kevin jarred equestrian
948 232602 37 uncovering scolds Goodrich
949 232603 37 chews infatuate apish A
950 232605 37 appendixes willed Adlerian
5950 1232605 37 appendixes willed Adlerian
5951 1232606 37 appendixes willed Adlerian
5952 1232607 37 appendixes willed Adlerian
5953 1232608 37 appendixes willed Adlerian
5954 1232609 37 appendixes willed Adlerian
951 232606 37 raining joyfully Tropez
952 232607 37 infest Microsoft nouns
953 232608 37 compartment fibrosities distracting
954 232609 37 minting Baltimorean mutton
955 236104 37 ducks equestrian bridgeable A
956 236105 37 roped Goodrich stickers A
957 236106 37 waltz apish transcontinental A
958 236107 37 Lillian Adlerian amateurish
959 236108 37 repressions Tropez Gandhian
960 236109 37 chillingly nouns stratified
961 236110 37 noncritical distracting chamberlains
962 236111 37 lithograph mutton creditably
963 236112 37 spongers bridgeable philosophic
964 236113 37 parenthood stickers ores
965 238005 37 posed transcontinental Carleton
966 238006 37 instruments amateurish tape A
967 238007 37 filial Gandhian afloat A
968 238008 37 fixedly stratified goodness A
969 238009 37 relives chamberlains welcoming
970 238010 37 Pandora creditably Pinsky FAS
971 238011 37 watering philosophic halting
972 238012 37 ungrateful ores bibliography
973 238013 37 secures Carleton decoding
974 240401 41 chastisers tape variance A
975 240402 41 icon afloat allowed A
976 240901 41 reuniting goodness dire A
977 240902 41 imagining welcoming dub A
978 241801 41 abiding Pinsky poisoning
979 242101 41 omnisciently halting Iraqis A
980 242102 41 Britannic bibliography heaving
981 242201 41 scholastics decoding population A
982 242202 41 mechanics variance bomb A
983 242501 41 humidly allowed Majorca A
984 242502 41 masterpiece dire Gershwins
985 246201 41 however dub explorers
986 246202 41 Mendelian poisoning libretto A
987 246203 41 jarred Iraqis occurred
988 246204 41 scolds heaving Lagos
989 246205 41 infatuate population rats
990 246301 41 willed bomb bankruptcies A
991 246302 41 joyfully Majorca crying
992 248001 41 Microsoft Gershwins unexpected
993 248002 41 fibrosities explorers accessed A
994 248003 41 Baltimorean libretto colorful A
995 248004 41 equestrian occurred versatility A
996 248005 41 Goodrich Lagos cosy
997 248006 41 apish rats Darius A
998 248007 41 Adlerian bankruptcies mastering A
999 248008 41 Tropez crying Asiaticizations A
1000 248009 41 nouns unexpected offerers A
1001 248010 41 distracting accessed uncles A
1002 248011 41 mutton colorful sleepwalk
1003 248012 41 bridgeable versatility Ernestine
1004 248013 41 stickers cosy checksumming
1005 248014 41 transcontinental Darius stopped
1006 248015 41 amateurish mastering sicker
1007 248016 41 Gandhian Asiaticizations Italianization
1008 248017 41 stratified offerers alphabetic
1009 248018 41 chamberlains uncles pharmaceutic
1010 248019 41 creditably sleepwalk creator
1011 248020 41 philosophic Ernestine chess
1012 248021 41 ores checksumming charcoal
1013 248101 41 Carleton stopped Epiphany A
1014 248102 41 tape sicker bulldozes A
1015 248201 41 afloat Italianization Pygmalion A
1016 248202 41 goodness alphabetic caressing A
1017 248203 41 welcoming pharmaceutic Palestine A
1018 248204 41 Pinsky creator regimented A
1019 248205 41 halting chess scars A
1020 248206 41 bibliography charcoal realest A
1021 248207 41 decoding Epiphany diffusing A
1022 248208 41 variance bulldozes clubroom A
1023 248209 41 allowed Pygmalion Blythe A
1024 248210 41 dire caressing ahead
1025 248211 50 dub Palestine reviver
1026 250501 34 poisoning regimented retransmitting A
1027 250502 34 Iraqis scars landslide
1028 250503 34 heaving realest Eiffel
1029 250504 34 population diffusing absentee
1030 250505 34 bomb clubroom aye
1031 250601 34 Majorca Blythe forked A
1032 250602 34 Gershwins ahead Peruvianizes
1033 250603 34 explorers reviver clerked
1034 250604 34 libretto retransmitting tutor
1035 250605 34 occurred landslide boulevard
1036 251001 34 Lagos Eiffel shuttered
1037 251002 34 rats absentee quotes A
1038 251003 34 bankruptcies aye Caltech
1039 251004 34 crying forked Mossberg
1040 251005 34 unexpected Peruvianizes kept
1041 251301 34 accessed clerked roundly
1042 251302 34 colorful tutor features A
1043 251303 34 versatility boulevard imaginable A
1044 251304 34 cosy shuttered controller
1045 251305 34 Darius quotes racial
1046 251401 34 mastering Caltech uprisings A
1047 251402 34 Asiaticizations Mossberg narrowed A
1048 251403 34 offerers kept cannot A
1049 251404 34 uncles roundly vest
1050 251405 34 sleepwalk features famine
1051 251406 34 Ernestine imaginable sugars
1052 251801 34 checksumming controller exterminated A
1053 251802 34 stopped racial belays
1054 252101 34 sicker uprisings Hodges A
1055 252102 34 Italianization narrowed translatable
1056 252301 34 alphabetic cannot duality A
1057 252302 34 pharmaceutic vest recording A
1058 252303 34 creator famine rouses A
1059 252304 34 chess sugars poison
1060 252305 34 charcoal exterminated attitude
1061 252306 34 Epiphany belays dusted
1062 252307 34 bulldozes Hodges encompasses
1063 252308 34 Pygmalion translatable presentation
1064 252309 34 caressing duality Kantian
1065 256001 34 Palestine recording imprecision A
1066 256002 34 regimented rouses saving
1067 256003 34 scars poison maternal
1068 256004 34 realest attitude hewed
1069 256005 34 diffusing dusted kerosene
1070 258001 34 clubroom encompasses Cubans
1071 258002 34 Blythe presentation photographers
1072 258003 34 ahead Kantian nymph A
1073 258004 34 reviver imprecision bedlam A
1074 258005 34 retransmitting saving north A
1075 258006 34 landslide maternal Schoenberg A
1076 258007 34 Eiffel hewed botany A
1077 258008 34 absentee kerosene curs
1078 258009 34 aye Cubans solidification
1079 258010 34 forked photographers inheritresses
1080 258011 34 Peruvianizes nymph stiller
1081 258101 68 clerked bedlam t1 A
1082 258102 68 tutor north suite A
1083 258103 34 boulevard Schoenberg ransomer
1084 258104 68 shuttered botany Willy
1085 258105 68 quotes curs Rena A
1086 258106 68 Caltech solidification Seattle A
1087 258107 68 Mossberg inheritresses relaxes A
1088 258108 68 kept stiller exclaim
1089 258109 68 roundly t1 implicated A
1090 258110 68 features suite distinguish
1091 258111 68 imaginable ransomer assayed
1092 258112 68 controller Willy homeowner
1093 258113 68 racial Rena and
1094 258201 34 uprisings Seattle stealth
1095 258202 34 narrowed relaxes coinciding A
1096 258203 34 cannot exclaim founder A
1097 258204 34 vest implicated environing
1098 258205 34 famine distinguish jewelry
1099 258301 34 sugars assayed lemons A
1100 258401 34 exterminated homeowner brokenness A
1101 258402 34 belays and bedpost A
1102 258403 34 Hodges stealth assurers A
1103 258404 34 translatable coinciding annoyers
1104 258405 34 duality founder affixed
1105 258406 34 recording environing warbling
1106 258407 34 rouses jewelry seriously
1107 228123 37 poison lemons boasted
1108 250606 34 attitude brokenness Chantilly
1109 208405 37 dusted bedpost Iranizes
1110 212101 37 encompasses assurers violinist
1111 218206 37 presentation annoyers extramarital
1112 150401 37 Kantian affixed spates
1113 248212 41 imprecision warbling cloakroom
1114 128026 00 saving seriously gazer
1115 128024 00 maternal boasted hand
1116 128027 00 hewed Chantilly tucked
1117 128025 00 kerosene Iranizes gems
1118 128109 00 Cubans violinist clinker
1119 128705 00 photographers extramarital refiner
1120 126303 00 nymph spates callus
1121 128308 00 bedlam cloakroom leopards
1122 128204 00 north gazer comfortingly
1123 128205 00 Schoenberg hand generically
1124 128206 00 botany tucked getters
1125 128207 00 curs gems sexually
1126 118205 00 solidification clinker spear
1127 116801 00 inheritresses refiner serums
1128 116803 00 stiller callus Italianization
1129 116804 00 t1 leopards attendants
1130 116802 00 suite comfortingly spies
1131 128605 00 ransomer generically Anthony
1132 118308 00 Willy getters planar
1133 113702 00 Rena sexually cupped
1134 113703 00 Seattle spear cleanser
1135 112103 00 relaxes serums commuters
1136 118009 00 exclaim Italianization honeysuckle
5136 1118009 00 exclaim Italianization honeysuckle
1137 138011 00 implicated attendants orphanage
1138 138010 00 distinguish spies skies
1139 138012 00 assayed Anthony crushers
1140 068304 00 homeowner planar Puritan
1141 078009 00 and cupped squeezer
1142 108013 00 stealth cleanser bruises
1143 084004 00 coinciding commuters bonfire
1144 083402 00 founder honeysuckle Colombo
1145 084003 00 environing orphanage nondecreasing
1146 088504 00 jewelry skies innocents
1147 088005 00 lemons crushers masked
1148 088007 00 brokenness Puritan file
1149 088006 00 bedpost squeezer brush
1150 148025 00 assurers bruises mutilate
1151 148024 00 annoyers bonfire mommy
1152 138305 00 affixed Colombo bulkheads
1153 138306 00 warbling nondecreasing undeclared
1154 152701 00 seriously innocents displacements
1155 148505 00 boasted masked nieces
1156 158003 00 Chantilly file coeducation
1157 156201 00 Iranizes brush brassy
1158 156202 00 violinist mutilate authenticator
1159 158307 00 extramarital mommy Washoe
1160 158402 00 spates bulkheads penny
1161 158401 00 cloakroom undeclared Flagler
1162 068013 00 gazer displacements stoned
1163 068012 00 hand nieces cranes
1164 068203 00 tucked coeducation masterful
1165 088205 00 gems brassy biracial
1166 068704 00 clinker authenticator steamships
1167 068604 00 refiner Washoe windmills
1168 158502 00 callus penny exploit
1169 123103 00 leopards Flagler riverfront
1170 148026 00 comfortingly stoned sisterly
1171 123302 00 generically cranes sharpshoot
1172 076503 00 getters masterful mittens
1173 126304 00 sexually biracial interdependency
1174 068306 00 spear steamships policy
1175 143504 00 serums windmills unleashing
1176 160201 00 Italianization exploit pretenders
1177 148028 00 attendants riverfront overstatements
1178 148027 00 spies sisterly birthed
1179 143505 00 Anthony sharpshoot opportunism
1180 108014 00 planar mittens showroom
1181 076104 00 cupped interdependency compromisingly
1182 078106 00 cleanser policy Medicare
1183 126102 00 commuters unleashing corresponds
1184 128029 00 honeysuckle pretenders hardware
1185 128028 00 orphanage overstatements implant
1186 018410 00 skies birthed Alicia
1187 128110 00 crushers opportunism requesting
1188 148506 00 Puritan showroom produced
1189 123303 00 squeezer compromisingly criticizes
1190 123304 00 bruises Medicare backer
1191 068504 00 bonfire corresponds positively
1192 068305 00 Colombo hardware colicky
1193 000000 00 nondecreasing implant thrillingly
1 000001 00 Omaha teethe neat
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
REPAIR TABLE t2;
Table Op Msg_type Msg_text
test.t2 repair status OK
......@@ -3825,6 +5039,9 @@ auto fld1 companynr fld3 fld4 fld5 fld6
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
INSERT INTO t2 VALUES (1,000001,00,'Omaha','teethe','neat','') , (2,011401,37,'breaking','dreaded','Steinberg','W') , (3,011402,37,'Romans','scholastics','jarring','') , (4,011403,37,'intercepted','audiology','tinily','');
SELECT * FROM t2;
auto fld1 companynr fld3 fld4 fld5 fld6
......@@ -5031,6 +6248,9 @@ auto fld1 companynr fld3 fld4 fld5 fld6
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
1 000001 00 Omaha teethe neat
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
......
mysql-test/r/sp-error.result
View file @ eb314af4
......@@ -705,3 +705,19 @@ end|
call bug11394(2, 1)|
ERROR HY000: Recursive stored routines are not allowed.
drop procedure bug11394|
drop function if exists bug11834_1;
drop function if exists bug11834_2;
create function bug11834_1() returns int return 10;
create function bug11834_2() returns int return bug11834_1();
prepare stmt from "select bug11834_2()";
execute stmt;
bug11834_2()
10
execute stmt;
bug11834_2()
10
drop function bug11834_1;
execute stmt;
ERROR 42000: FUNCTION test.bug11834_1 does not exist
deallocate prepare stmt;
drop function bug11834_2;
mysql-test/r/sp.result
View file @ eb314af4
......@@ -1088,7 +1088,7 @@ a
select * from v1|
a
3
select * from v1, v2|
select * from v1, t1|
ERROR HY000: Table 't1' was not locked with LOCK TABLES
select f4()|
ERROR HY000: Table 't2' was not locked with LOCK TABLES
......
mysql-test/r/trigger.result
View file @ eb314af4
drop table if exists t1, t2;
drop table if exists t1, t2, t3;
drop view if exists v1;
drop database if exists mysqltest;
drop function if exists f1;
create table t1 (i int);
create trigger trg before insert on t1 for each row set @a:=1;
set @a:=0;
......@@ -182,6 +183,96 @@ select @log;
@log
(BEFORE_INSERT: new=(id=1, data=5))(BEFORE_UPDATE: old=(id=1, data=4) new=(id=1, data=6))(AFTER_UPDATE: old=(id=1, data=4) new=(id=1, data=6))(BEFORE_INSERT: new=(id=3, data=3))(AFTER_INSERT: new=(id=3, data=3))
drop table t1;
create table t1 (id int primary key, data varchar(10), fk int);
create table t2 (event varchar(100));
create table t3 (id int primary key);
create trigger t1_ai after insert on t1 for each row
insert into t2 values (concat("INSERT INTO t1 id=", new.id, " data='", new.data, "'"));
insert into t1 (id, data) values (1, "one"), (2, "two");
select * from t1;
id data fk
1 one NULL
2 two NULL
select * from t2;
event
INSERT INTO t1 id=1 data='one'
INSERT INTO t1 id=2 data='two'
drop trigger t1.t1_ai;
create trigger t1_bi before insert on t1 for each row
begin
if exists (select id from t3 where id=new.fk) then
insert into t2 values (concat("INSERT INTO t1 id=", new.id, " data='", new.data, "' fk=", new.fk));
else
insert into t2 values (concat("INSERT INTO t1 FAILED id=", new.id, " data='", new.data, "' fk=", new.fk));
set new.id= NULL;
end if;
end|
insert into t3 values (1);
insert into t1 values (4, "four", 1), (5, "five", 2);
ERROR 23000: Column 'id' cannot be null
select * from t1;
id data fk
1 one NULL
2 two NULL
4 four 1
select * from t2;
event
INSERT INTO t1 id=1 data='one'
INSERT INTO t1 id=2 data='two'
INSERT INTO t1 id=4 data='four' fk=1
INSERT INTO t1 FAILED id=5 data='five' fk=2
drop table t1, t2, t3;
create table t1 (id int primary key, data varchar(10));
create table t2 (seq int);
insert into t2 values (10);
create function f1 () returns int return (select max(seq) from t2);
create trigger t1_bi before insert on t1 for each row
begin
if new.id > f1() then
set new.id:= f1();
end if;
end|
select f1();
f1()
10
insert into t1 values (1, "first");
insert into t1 values (f1(), "max");
select * from t1;
id data
1 first
10 max
drop table t1, t2;
drop function f1;
create table t1 (id int primary key, fk_t2 int);
create table t2 (id int primary key, fk_t3 int);
create table t3 (id int primary key);
insert into t1 values (1,1), (2,1), (3,2);
insert into t2 values (1,1), (2,2);
insert into t3 values (1), (2);
create trigger t3_ad after delete on t3 for each row
delete from t2 where fk_t3=old.id;
create trigger t2_ad after delete on t2 for each row
delete from t1 where fk_t2=old.id;
delete from t3 where id = 1;
select * from t1 left join (t2 left join t3 on t2.fk_t3 = t3.id) on t1.fk_t2 = t2.id;
id fk_t2 id fk_t3 id
3 2 2 2 2
drop table t1, t2, t3;
create table t1 (id int primary key, copy int);
create table t2 (id int primary key, data int);
insert into t2 values (1,1), (2,2);
create trigger t1_bi before insert on t1 for each row
set new.copy= (select data from t2 where id = new.id);
create trigger t1_bu before update on t1 for each row
set new.copy= (select data from t2 where id = new.id);
insert into t1 values (1,3), (2,4), (3,3);
update t1 set copy= 1 where id = 2;
select * from t1;
id copy
1 1
2 2
3 NULL
drop table t1, t2;
create table t1 (i int);
create trigger trg before insert on t1 for each row set @a:= old.i;
ERROR HY000: There is no OLD row in on INSERT trigger
......@@ -482,12 +573,3 @@ i k ts
1 1 0000-00-00 00:00:00
2 2 0000-00-00 00:00:00
drop table t1, t2;
drop function if exists bug5893;
create table t1 (col1 int, col2 int);
insert into t1 values (1, 2);
create function bug5893 () returns int return 5;
create trigger t1_bu before update on t1 for each row set new.col1= bug5893();
drop function bug5893;
update t1 set col2 = 4;
ERROR 42000: FUNCTION test.bug5893 does not exist
drop table t1;
mysql-test/t/archive.test
View file @ eb314af4
......@@ -1313,6 +1313,11 @@ INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
SELECT * FROM t2;
OPTIMIZE TABLE t2;
SELECT * FROM t2;
INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
OPTIMIZE TABLE t2 EXTENDED;
SELECT * FROM t2;
REPAIR TABLE t2;
SELECT * FROM t2;
......
mysql-test/t/sp-error.test
View file @ eb314af4
......@@ -1025,4 +1025,27 @@ end|
--error 1424
call bug11394(2, 1)|
drop procedure bug11394|
delimiter |;
delimiter ;|
#
# Bug#11834 "Re-execution of prepared statement with dropped function
# crashes server". Also tests handling of prepared stmts which use
# stored functions but does not require prelocking.
#
--disable_warnings
drop function if exists bug11834_1;
drop function if exists bug11834_2;
--enable_warnings
create function bug11834_1() returns int return 10;
create function bug11834_2() returns int return bug11834_1();
prepare stmt from "select bug11834_2()";
execute stmt;
# Re-execution of statement should not crash server.
execute stmt;
drop function bug11834_1;
# Attempt to execute statement should return proper error and
# should not crash server.
--error ER_SP_DOES_NOT_EXIST
execute stmt;
deallocate prepare stmt;
drop function bug11834_2;
mysql-test/t/sp.test
View file @ eb314af4
......@@ -1283,7 +1283,8 @@ select * from v1|
# views and functions ?
create function f1() returns int
return (select sum(data) from t1) + (select sum(data) from v1)|
# FIXME All these just exceed file limit for me :)
# This queries will crash server because we can't use LEX in
# reenterable fashion yet. Patch disabling recursion will heal this.
#select f1()|
#select * from v1|
#select * from v2|
......@@ -1328,15 +1329,12 @@ select * from v2|
select * from v1|
# These should not work as we have too little instances of tables locked
--error 1100
select * from v1, v2|
select * from v1, t1|
--error 1100
select f4()|
unlock tables|
# TODO We also should test integration with triggers
# Cleanup
drop function f0|
drop function f1|
......
mysql-test/t/trigger.test
View file @ eb314af4
......@@ -3,9 +3,10 @@
#
--disable_warnings
drop table if exists t1, t2;
drop table if exists t1, t2, t3;
drop view if exists v1;
drop database if exists mysqltest;
drop function if exists f1;
--enable_warnings
create table t1 (i int);
......@@ -199,6 +200,86 @@ select @log;
drop table t1;
#
# Let us test triggers which access other tables.
#
# Trivial trigger which inserts data into another table
create table t1 (id int primary key, data varchar(10), fk int);
create table t2 (event varchar(100));
create table t3 (id int primary key);
create trigger t1_ai after insert on t1 for each row
insert into t2 values (concat("INSERT INTO t1 id=", new.id, " data='", new.data, "'"));
insert into t1 (id, data) values (1, "one"), (2, "two");
select * from t1;
select * from t2;
drop trigger t1.t1_ai;
# Trigger which uses couple of tables (and partially emulates FK constraint)
delimiter |;
create trigger t1_bi before insert on t1 for each row
begin
if exists (select id from t3 where id=new.fk) then
insert into t2 values (concat("INSERT INTO t1 id=", new.id, " data='", new.data, "' fk=", new.fk));
else
insert into t2 values (concat("INSERT INTO t1 FAILED id=", new.id, " data='", new.data, "' fk=", new.fk));
set new.id= NULL;
end if;
end|
delimiter ;|
insert into t3 values (1);
--error 1048
insert into t1 values (4, "four", 1), (5, "five", 2);
select * from t1;
select * from t2;
drop table t1, t2, t3;
# Trigger which invokes function
create table t1 (id int primary key, data varchar(10));
create table t2 (seq int);
insert into t2 values (10);
create function f1 () returns int return (select max(seq) from t2);
delimiter |;
create trigger t1_bi before insert on t1 for each row
begin
if new.id > f1() then
set new.id:= f1();
end if;
end|
delimiter ;|
# Remove this once bug #11554 will be fixed.
select f1();
insert into t1 values (1, "first");
insert into t1 values (f1(), "max");
select * from t1;
drop table t1, t2;
drop function f1;
# Trigger which forces invocation of another trigger
# (emulation of FK on delete cascade policy)
create table t1 (id int primary key, fk_t2 int);
create table t2 (id int primary key, fk_t3 int);
create table t3 (id int primary key);
insert into t1 values (1,1), (2,1), (3,2);
insert into t2 values (1,1), (2,2);
insert into t3 values (1), (2);
create trigger t3_ad after delete on t3 for each row
delete from t2 where fk_t3=old.id;
create trigger t2_ad after delete on t2 for each row
delete from t1 where fk_t2=old.id;
delete from t3 where id = 1;
select * from t1 left join (t2 left join t3 on t2.fk_t3 = t3.id) on t1.fk_t2 = t2.id;
drop table t1, t2, t3;
# Trigger which assigns value selected from table to field of row
# being inserted/updated.
create table t1 (id int primary key, copy int);
create table t2 (id int primary key, data int);
insert into t2 values (1,1), (2,2);
create trigger t1_bi before insert on t1 for each row
set new.copy= (select data from t2 where id = new.id);
create trigger t1_bu before update on t1 for each row
set new.copy= (select data from t2 where id = new.id);
insert into t1 values (1,3), (2,4), (3,3);
update t1 set copy= 1 where id = 2;
select * from t1;
drop table t1, t2;
#
# Test of wrong column specifiers in triggers
#
......@@ -497,14 +578,15 @@ drop table t1, t2;
# Test for bug #5893 "Triggers with dropped functions cause crashes"
# Appropriate error should be reported instead of crash.
--disable_warnings
drop function if exists bug5893;
--enable_warnings
create table t1 (col1 int, col2 int);
insert into t1 values (1, 2);
create function bug5893 () returns int return 5;
create trigger t1_bu before update on t1 for each row set new.col1= bug5893();
drop function bug5893;
--error 1305
update t1 set col2 = 4;
drop table t1;
# Had to disable this test until bug #11554 will be fixed.
#--disable_warnings
#drop function if exists bug5893;
#--enable_warnings
#create table t1 (col1 int, col2 int);
#insert into t1 values (1, 2);
#create function bug5893 () returns int return 5;
#create trigger t1_bu before update on t1 for each row set new.col1= bug5893();
#drop function bug5893;
#--error 1305
#update t1 set col2 = 4;
#drop table t1;
sql/examples/ha_archive.cc
View file @ eb314af4
......@@ -305,12 +305,12 @@ int ha_archive::write_meta_file(File meta_file, ha_rows rows, bool dirty)
meta_buffer[0]= (uchar)ARCHIVE_CHECK_HEADER;
meta_buffer[1]= (uchar)ARCHIVE_VERSION;
int8store(meta_buffer + 2, rows);
int8store(meta_buffer + 2, (ulonglong)rows);
int8store(meta_buffer + 10, check_point);
*(meta_buffer + 18)= (uchar)dirty;
DBUG_PRINT("ha_archive::write_meta_file", ("Check %d", (uint)ARCHIVE_CHECK_HEADER));
DBUG_PRINT("ha_archive::write_meta_file", ("Version %d", (uint)ARCHIVE_VERSION));
DBUG_PRINT("ha_archive::write_meta_file", ("Rows %llu", rows));
DBUG_PRINT("ha_archive::write_meta_file", ("Rows %llu", (ulonglong)rows));
DBUG_PRINT("ha_archive::write_meta_file", ("Checkpoint %llu", check_point));
DBUG_PRINT("ha_archive::write_meta_file", ("Dirty %d", (uint)dirty));
......@@ -326,6 +326,9 @@ int ha_archive::write_meta_file(File meta_file, ha_rows rows, bool dirty)
/*
We create the shared memory space that we will use for the open table.
No matter what we try to get or create a share. This is so that a repair
table operation can occur.
See ha_example.cc for a longer description.
*/
ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, TABLE *table)
......@@ -363,7 +366,7 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, TABLE *table)
*/
VOID(pthread_mutex_init(&share->mutex,MY_MUTEX_INIT_FAST));
if ((share->meta_file= my_open(meta_file_name, O_RDWR, MYF(0))) == -1)
goto error;
share->crashed= TRUE;
/*
After we read, we set the file to dirty. When we close, we will do the
......@@ -381,27 +384,14 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, TABLE *table)
that is shared amoung all open tables.
*/
if ((share->archive_write= gzopen(share->data_file_name, "ab")) == NULL)
goto error2;
if (my_hash_insert(&archive_open_tables, (byte*) share))
goto error3;
share->crashed= TRUE;
VOID(my_hash_insert(&archive_open_tables, (byte*) share));
thr_lock_init(&share->lock);
}
share->use_count++;
pthread_mutex_unlock(&archive_mutex);
return share;
error3:
/* We close, but ignore errors since we already have errors */
(void)gzclose(share->archive_write);
error2:
my_close(share->meta_file,MYF(0));
error:
pthread_mutex_unlock(&archive_mutex);
VOID(pthread_mutex_destroy(&share->mutex));
my_free((gptr) share, MYF(0));
return NULL;
}
......@@ -458,13 +448,14 @@ int ha_archive::open(const char *name, int mode, uint test_if_locked)
DBUG_ENTER("ha_archive::open");
if (!(share= get_share(name, table)))
DBUG_RETURN(-1);
DBUG_RETURN(HA_ERR_OUT_OF_MEM); // Not handled well by calling code!
thr_lock_data_init(&share->lock,&lock,NULL);
if ((archive= gzopen(share->data_file_name, "rb")) == NULL)
{
(void)free_share(share); //We void since we already have an error
DBUG_RETURN(errno ? errno : -1);
if (errno == EROFS || errno == EACCES)
DBUG_RETURN(my_errno= errno);
DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
}
DBUG_RETURN(0);
......@@ -572,36 +563,22 @@ error:
DBUG_RETURN(error ? error : -1);
}
/*
Look at ha_archive::open() for an explanation of the row format.
Here we just write out the row.
Wondering about start_bulk_insert()? We don't implement it for
archive since it optimizes for lots of writes. The only save
for implementing start_bulk_insert() is that we could skip
setting dirty to true each time.
/*
This is where the actual row is written out.
*/
int ha_archive::write_row(byte * buf)
int ha_archive::real_write_row(byte *buf, gzFile writer)
{
z_off_t written;
uint *ptr, *end;
DBUG_ENTER("ha_archive::write_row");
DBUG_ENTER("ha_archive::real_write_row");
if (share->crashed)
DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
statistic_increment(table->in_use->status_var.ha_write_count, &LOCK_status);
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
table->timestamp_field->set_time();
pthread_mutex_lock(&share->mutex);
written= gzwrite(share->archive_write, buf, table->s->reclength);
DBUG_PRINT("ha_archive::write_row", ("Wrote %d bytes expected %d", written, table->s->reclength));
written= gzwrite(writer, buf, table->s->reclength);
DBUG_PRINT("ha_archive::real_write_row", ("Wrote %d bytes expected %d", written, table->s->reclength));
if (!delayed_insert || !bulk_insert)
share->dirty= TRUE;
if (written != (z_off_t)table->s->reclength)
goto error;
DBUG_RETURN(errno ? errno : -1);
/*
We should probably mark the table as damagaged if the record is written
but the blob fails.
......@@ -616,21 +593,43 @@ int ha_archive::write_row(byte * buf)
if (size)
{
((Field_blob*) table->field[*ptr])->get_ptr(&data_ptr);
written= gzwrite(share->archive_write, data_ptr, (unsigned)size);
written= gzwrite(writer, data_ptr, (unsigned)size);
if (written != (z_off_t)size)
goto error;
DBUG_RETURN(errno ? errno : -1);
}
}
DBUG_RETURN(0);
}
/*
Look at ha_archive::open() for an explanation of the row format.
Here we just write out the row.
Wondering about start_bulk_insert()? We don't implement it for
archive since it optimizes for lots of writes. The only save
for implementing start_bulk_insert() is that we could skip
setting dirty to true each time.
*/
int ha_archive::write_row(byte *buf)
{
int rc;
DBUG_ENTER("ha_archive::write_row");
if (share->crashed)
DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
statistic_increment(table->in_use->status_var.ha_write_count, &LOCK_status);
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
table->timestamp_field->set_time();
pthread_mutex_lock(&share->mutex);
share->rows_recorded++;
rc= real_write_row(buf, share->archive_write);
pthread_mutex_unlock(&share->mutex);
DBUG_RETURN(0);
error:
pthread_mutex_unlock(&share->mutex);
DBUG_RETURN(errno ? errno : -1);
DBUG_RETURN(rc);
}
/*
All calls that need to scan the table start with this method. If we are told
that it is a table scan we rewind the file to the beginning, otherwise
......@@ -795,68 +794,20 @@ int ha_archive::rnd_pos(byte * buf, byte *pos)
/*
This method repairs the meta file. It does this by walking the datafile and
rewriting the meta file.
rewriting the meta file. Currently it does this by calling optimize with
the extended flag.
*/
int ha_archive::repair(THD* thd, HA_CHECK_OPT* check_opt)
{
int rc;
byte *buf;
ha_rows rows_recorded= 0;
gzFile rebuild_file; // Archive file we are working with
File meta_file; // Meta file we use
char data_file_name[FN_REFLEN];
DBUG_ENTER("ha_archive::repair");
check_opt->flags= T_EXTEND;
int rc= optimize(thd, check_opt);
/*
Open up the meta file to recreate it.
*/
fn_format(data_file_name, share->table_name, "", ARZ,
MY_REPLACE_EXT|MY_UNPACK_FILENAME);
if ((rebuild_file= gzopen(data_file_name, "rb")) == NULL)
DBUG_RETURN(errno ? errno : -1);
if (rc)
DBUG_RETURN(HA_ERR_CRASHED_ON_REPAIR);
if ((rc= read_data_header(rebuild_file)))
goto error;
/*
We malloc up the buffer we will use for counting the rows.
I know, this malloc'ing memory but this should be a very
rare event.
*/
if (!(buf= (byte*) my_malloc(table->s->rec_buff_length > sizeof(ulonglong) +1 ?
table->s->rec_buff_length : sizeof(ulonglong) +1 ,
MYF(MY_WME))))
{
rc= HA_ERR_CRASHED_ON_USAGE;
goto error;
}
while (!(rc= get_row(rebuild_file, buf)))
rows_recorded++;
/*
Only if we reach the end of the file do we assume we can rewrite.
At this point we reset rc to a non-message state.
*/
if (rc == HA_ERR_END_OF_FILE)
{
fn_format(data_file_name,share->table_name,"",ARM,MY_REPLACE_EXT|MY_UNPACK_FILENAME);
if ((meta_file= my_open(data_file_name, O_RDWR, MYF(0))) == -1)
{
rc= HA_ERR_CRASHED_ON_USAGE;
goto error;
}
(void)write_meta_file(meta_file, rows_recorded, TRUE);
my_close(meta_file,MYF(0));
rc= 0;
}
my_free((gptr) buf, MYF(0));
share->crashed= FALSE;
error:
gzclose(rebuild_file);
DBUG_RETURN(rc);
DBUG_RETURN(0);
}
/*
......@@ -866,39 +817,100 @@ error:
int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
{
DBUG_ENTER("ha_archive::optimize");
int read; // Bytes read, gzread() returns int
gzFile reader, writer;
char block[IO_SIZE];
int rc;
gzFile writer;
char writer_filename[FN_REFLEN];
/* Closing will cause all data waiting to be flushed */
gzclose(share->archive_write);
share->archive_write= NULL;
/* Flush any waiting data */
gzflush(share->archive_write, Z_SYNC_FLUSH);
/* Lets create a file to contain the new data */
fn_format(writer_filename, share->table_name, "", ARN,
MY_REPLACE_EXT|MY_UNPACK_FILENAME);
if ((reader= gzopen(share->data_file_name, "rb")) == NULL)
DBUG_RETURN(-1);
if ((writer= gzopen(writer_filename, "wb")) == NULL)
DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
/*
An extended rebuild is a lot more effort. We open up each row and re-record it.
Any dead rows are removed (aka rows that may have been partially recorded).
*/
if (check_opt->flags == T_EXTEND)
{
gzclose(reader);
DBUG_RETURN(-1);
}
byte *buf;
while ((read= gzread(reader, block, IO_SIZE)))
gzwrite(writer, block, read);
/*
First we create a buffer that we can use for reading rows, and can pass
to get_row().
*/
if (!(buf= (byte*) my_malloc(table->s->reclength, MYF(MY_WME))))
{
rc= HA_ERR_OUT_OF_MEM;
goto error;
}
gzclose(reader);
gzclose(writer);
/*
Now we will rewind the archive file so that we are positioned at the
start of the file.
*/
rc= read_data_header(archive);
/*
Assuming now error from rewinding the archive file, we now write out the
new header for out data file.
*/
if (!rc)
rc= write_data_header(writer);
/*
On success of writing out the new header, we now fetch each row and
insert it into the new archive file.
*/
if (!rc)
{
share->rows_recorded= 0;
while (!(rc= get_row(archive, buf)))
{
real_write_row(buf, writer);
share->rows_recorded++;
}
}
my_free(buf, MYF(0));
if (rc && rc != HA_ERR_END_OF_FILE)
goto error;
}
else
{
/*
The quick method is to just read the data raw, and then compress it directly.
*/
int read; // Bytes read, gzread() returns int
char block[IO_SIZE];
if (gzrewind(archive) == -1)
{
rc= HA_ERR_CRASHED_ON_USAGE;
goto error;
}
while ((read= gzread(archive, block, IO_SIZE)))
gzwrite(writer, block, read);
}
gzflush(writer, Z_SYNC_FLUSH);
gzclose(share->archive_write);
share->archive_write= writer;
my_rename(writer_filename,share->data_file_name,MYF(0));
DBUG_RETURN(0);
}
error:
gzclose(writer);
DBUG_RETURN(rc);
}
/*
Below is an example of how to setup row level locking.
......
sql/examples/ha_archive.h
View file @ eb314af4
......@@ -36,7 +36,7 @@ typedef struct st_archive_share {
gzFile archive_write; /* Archive file we are working with */
bool dirty; /* Flag for if a flush should occur */
bool crashed; /* Meta file is crashed */
ha_rows rows_recorded; /* Number of rows in tables */
ha_rows rows_recorded; /* Number of rows in tables */
} ARCHIVE_SHARE;
/*
......@@ -53,7 +53,7 @@ class ha_archive: public handler
z_off_t current_position; /* The position of the row we just read */
byte byte_buffer[IO_SIZE]; /* Initial buffer for our string */
String buffer; /* Buffer used for blob storage */
ulonglong scan_rows; /* Number of rows left in scan */
ha_rows scan_rows; /* Number of rows left in scan */
bool delayed_insert; /* If the insert is delayed */
bool bulk_insert; /* If we are performing a bulk insert */
......@@ -84,6 +84,7 @@ public:
int open(const char *name, int mode, uint test_if_locked);
int close(void);
int write_row(byte * buf);
int real_write_row(byte *buf, gzFile writer);
int rnd_init(bool scan=1);
int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos);
......@@ -102,6 +103,10 @@ public:
int repair(THD* thd, HA_CHECK_OPT* check_opt);
void start_bulk_insert(ha_rows rows);
int end_bulk_insert();
enum row_type get_row_type() const
{
return ROW_TYPE_COMPRESSED;
}
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
enum thr_lock_type lock_type);
};
......
sql/item_func.cc
View file @ eb314af4
......@@ -4725,6 +4725,7 @@ Item_func_sp::cleanup()
delete result_field;
result_field= NULL;
}
m_sp= NULL;
Item_func::cleanup();
}
......
sql/sp.cc
View file @ eb314af4
......@@ -19,6 +19,7 @@
#include "sp.h"
#include "sp_head.h"
#include "sp_cache.h"
#include "sql_trigger.h"
static bool
create_string(THD *thd, String *buf,
......@@ -1077,145 +1078,317 @@ sp_function_exists(THD *thd, sp_name *name)
}
byte *
sp_lex_sp_key(const byte *ptr, uint *plen, my_bool first)
/*
Structure that represents element in the set of stored routines
used by statement or routine.
*/
struct Sroutine_hash_entry;
struct Sroutine_hash_entry
{
LEX_STRING *lsp= (LEX_STRING *)ptr;
*plen= lsp->length;
return (byte *)lsp->str;
/* Set key consisting of one-byte routine type and quoted routine name. */
LEX_STRING key;
/*
Next element in list linking all routines in set. See also comments
for LEX::sroutine/sroutine_list and sp_head::m_sroutines.
*/
Sroutine_hash_entry *next;
};
extern "C" byte* sp_sroutine_key(const byte *ptr, uint *plen, my_bool first)
{
Sroutine_hash_entry *rn= (Sroutine_hash_entry *)ptr;
*plen= rn->key.length;
return (byte *)rn->key.str;
}
void
sp_add_to_hash(HASH *h, sp_name *fun)
/*
Auxilary function that adds new element to the set of stored routines
used by statement.
SYNOPSIS
add_used_routine()
lex - LEX representing statement
arena - arena in which memory for new element will be allocated
key - key for the hash representing set
NOTES
Will also add element to end of 'LEX::sroutines_list' list.
In case when statement uses stored routines but does not need
prelocking (i.e. it does not use any tables) we will access the
elements of LEX::sroutines set on prepared statement re-execution.
Because of this we have to allocate memory for both hash element
and copy of its key in persistent arena.
TODO
When we will got rid of these accesses on re-executions we will be
able to allocate memory for hash elements in non-persitent arena
and directly use key values from sp_head::m_sroutines sets instead
of making their copies.
RETURN VALUE
TRUE - new element was added.
FALSE - element was not added (because it is already present in the set).
*/
static bool add_used_routine(LEX *lex, Query_arena *arena,
const LEX_STRING *key)
{
if (! hash_search(h, (byte *)fun->m_qname.str, fun->m_qname.length))
if (!hash_search(&lex->sroutines, (byte *)key->str, key->length))
{
LEX_STRING *ls= (LEX_STRING *)sql_alloc(sizeof(LEX_STRING));
ls->str= sql_strmake(fun->m_qname.str, fun->m_qname.length);
ls->length= fun->m_qname.length;
my_hash_insert(h, (byte *)ls);
Sroutine_hash_entry *rn=
(Sroutine_hash_entry *)arena->alloc(sizeof(Sroutine_hash_entry) +
key->length);
if (!rn) // OOM. Error will be reported using fatal_error().
return FALSE;
rn->key.length= key->length;
rn->key.str= (char *)rn + sizeof(Sroutine_hash_entry);
memcpy(rn->key.str, key->str, key->length);
my_hash_insert(&lex->sroutines, (byte *)rn);
lex->sroutines_list.link_in_list((byte *)rn, (byte **)&rn->next);
return TRUE;
}
return FALSE;
}
/*
Merge contents of two hashes containing LEX_STRING's
Add routine to the set of stored routines used by statement.
SYNOPSIS
sp_merge_hash()
sp_add_used_routine()
lex - LEX representing statement
arena - arena in which memory for new element of the set
will be allocated
rt - routine name
rt_type - routine type (one of TYPE_ENUM_PROCEDURE/...)
NOTES
Will also add element to end of 'LEX::sroutines_list' list.
To be friendly towards prepared statements one should pass
persistent arena as second argument.
*/
void sp_add_used_routine(LEX *lex, Query_arena *arena,
sp_name *rt, char rt_type)
{
rt->set_routine_type(rt_type);
(void)add_used_routine(lex, arena, &rt->m_sroutines_key);
}
/*
Merge contents of two hashes representing sets of routines used
by statements or by other routines.
SYNOPSIS
sp_update_sp_used_routines()
dst - hash to which elements should be added
src - hash from which elements merged
RETURN VALUE
TRUE - if we have added some new elements to destination hash.
FALSE - there were no new elements in src.
NOTE
This procedure won't create new Sroutine_hash_entry objects,
instead it will simply add elements from source to destination
hash. Thus time of life of elements in destination hash becomes
dependant on time of life of elements from source hash. It also
won't touch lists linking elements in source and destination
hashes.
*/
bool
sp_merge_hash(HASH *dst, HASH *src)
void sp_update_sp_used_routines(HASH *dst, HASH *src)
{
bool res= FALSE;
for (uint i=0 ; i < src->records ; i++)
{
LEX_STRING *ls= (LEX_STRING *)hash_element(src, i);
if (! hash_search(dst, (byte *)ls->str, ls->length))
{
my_hash_insert(dst, (byte *)ls);
res= TRUE;
}
Sroutine_hash_entry *rt= (Sroutine_hash_entry *)hash_element(src, i);
if (!hash_search(dst, (byte *)rt->key.str, rt->key.length))
my_hash_insert(dst, (byte *)rt);
}
return res;
}
/*
Cache all routines implicitly or explicitly used by query
(or whatever object is represented by LEX).
Add contents of hash representing set of routines to the set of
routines used by statement.
SYNOPSIS
sp_cache_routines()
sp_update_stmt_used_routines()
thd - thread context
lex - LEX representing query
lex - LEX representing statement
src - hash representing set from which routines will be added
NOTE
It will also add elements to end of 'LEX::sroutines_list' list.
*/
static void sp_update_stmt_used_routines(THD *thd, LEX *lex, HASH *src)
{
for (uint i=0 ; i < src->records ; i++)
{
Sroutine_hash_entry *rt= (Sroutine_hash_entry *)hash_element(src, i);
(void)add_used_routine(lex, thd->current_arena, &rt->key);
}
}
/*
Cache sub-set of routines used by statement, add tables used by these
routines to statement table list. Do the same for all routines used
by these routines.
SYNOPSIS
sp_cache_routines_and_add_tables_aux()
thd - thread context
lex - LEX representing statement
start - first routine from the list of routines to be cached
(this list defines mentioned sub-set).
NOTE
If some function is missing this won't be reported here.
Instead this fact will be discovered during query execution.
TODO
Currently if after passing through routine hashes we discover
that we have added something to them, we do one more pass to
process all routines which were missed on previous pass because
of these additions. We can avoid this if along with hashes
we use lists holding routine names and iterate other these
lists instead of hashes (since addition to the end of list
does not reorder elements in it).
RETURN VALUE
TRUE - some tables were added
FALSE - no tables were added.
*/
void
sp_cache_routines(THD *thd, LEX *lex)
static bool
sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
Sroutine_hash_entry *start)
{
bool routines_added= TRUE;
bool result= FALSE;
DBUG_ENTER("sp_cache_routines");
DBUG_ENTER("sp_cache_routines_and_add_tables_aux");
while (routines_added)
for (Sroutine_hash_entry *rt= start; rt; rt= rt->next)
{
routines_added= FALSE;
sp_name name(rt->key.str, rt->key.length);
int type= rt->key.str[0];
sp_head *sp;
for (int type= TYPE_ENUM_FUNCTION; type < TYPE_ENUM_TRIGGER; type++)
if (!(sp= sp_cache_lookup((type == TYPE_ENUM_FUNCTION ?
&thd->sp_func_cache : &thd->sp_proc_cache),
&name)))
{
HASH *h= (type == TYPE_ENUM_FUNCTION ? &lex->spfuns : &lex->spprocs);
for (uint i=0 ; i < h->records ; i++)
LEX *oldlex= thd->lex;
LEX *newlex= new st_lex;
thd->lex= newlex;
/* Pass hint pointer to mysql.proc table */
newlex->proc_table= oldlex->proc_table;
newlex->current_select= NULL;
name.m_name.str= strchr(name.m_qname.str, '.');
name.m_db.length= name.m_name.str - name.m_qname.str;
name.m_db.str= strmake_root(thd->mem_root, name.m_qname.str,
name.m_db.length);
name.m_name.str+= 1;
name.m_name.length= name.m_qname.length - name.m_db.length - 1;
if (db_find_routine(thd, type, &name, &sp) == SP_OK)
{
LEX_STRING *ls= (LEX_STRING *)hash_element(h, i);
sp_name name(*ls);
sp_head *sp;
name.m_qname= *ls;
if (!(sp= sp_cache_lookup((type == TYPE_ENUM_FUNCTION ?
&thd->sp_func_cache : &thd->sp_proc_cache),
&name)))
{
LEX *oldlex= thd->lex;
LEX *newlex= new st_lex;
thd->lex= newlex;
/* Pass hint pointer to mysql.proc table */
newlex->proc_table= oldlex->proc_table;
newlex->current_select= NULL;
name.m_name.str= strchr(name.m_qname.str, '.');
name.m_db.length= name.m_name.str - name.m_qname.str;
name.m_db.str= strmake_root(thd->mem_root, name.m_qname.str,
name.m_db.length);
name.m_name.str+= 1;
name.m_name.length= name.m_qname.length - name.m_db.length - 1;
if (db_find_routine(thd, type, &name, &sp) == SP_OK)
{
if (type == TYPE_ENUM_FUNCTION)
sp_cache_insert(&thd->sp_func_cache, sp);
else
sp_cache_insert(&thd->sp_proc_cache, sp);
}
delete newlex;
thd->lex= oldlex;
}
if (type == TYPE_ENUM_FUNCTION)
sp_cache_insert(&thd->sp_func_cache, sp);
else
sp_cache_insert(&thd->sp_proc_cache, sp);
}
delete newlex;
thd->lex= oldlex;
}
if (sp)
{
sp_update_stmt_used_routines(thd, lex, &sp->m_sroutines);
result|= sp->add_used_tables_to_table_list(thd, &lex->query_tables_last);
}
}
DBUG_RETURN(result);
}
/*
Cache all routines from the set of used by statement, add tables used
by those routines to statement table list. Do the same for all routines
used by those routines.
SYNOPSIS
sp_cache_routines_and_add_tables()
thd - thread context
lex - LEX representing statement
RETURN VALUE
TRUE - some tables were added
FALSE - no tables were added.
*/
bool
sp_cache_routines_and_add_tables(THD *thd, LEX *lex)
{
if (sp)
return sp_cache_routines_and_add_tables_aux(thd, lex,
(Sroutine_hash_entry *)lex->sroutines_list.first);
}
/*
Add all routines used by view to the set of routines used by statement.
Add tables used by those routines to statement table list. Do the same
for all routines used by these routines.
SYNOPSIS
sp_cache_routines_and_add_tables_for_view()
thd - thread context
lex - LEX representing statement
aux_lex - LEX representing view
*/
void
sp_cache_routines_and_add_tables_for_view(THD *thd, LEX *lex, LEX *aux_lex)
{
Sroutine_hash_entry **last_cached_routine_ptr=
(Sroutine_hash_entry **)lex->sroutines_list.next;
sp_update_stmt_used_routines(thd, lex, &aux_lex->sroutines);
(void)sp_cache_routines_and_add_tables_aux(thd, lex,
*last_cached_routine_ptr);
}
/*
Add triggers for table to the set of routines used by statement.
Add tables used by them to statement table list. Do the same for
all implicitly used routines.
SYNOPSIS
sp_cache_routines_and_add_tables_for_triggers()
thd - thread context
lex - LEX respresenting statement
triggers - triggers of the table
*/
void
sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,
Table_triggers_list *triggers)
{
if (add_used_routine(lex, thd->current_arena, &triggers->sroutines_key))
{
Sroutine_hash_entry **last_cached_routine_ptr=
(Sroutine_hash_entry **)lex->sroutines_list.next;
for (int i= 0; i < 3; i++)
for (int j= 0; j < 2; j++)
if (triggers->bodies[i][j])
{
routines_added|= sp_merge_hash(&lex->spfuns, &sp->m_spfuns);
routines_added|= sp_merge_hash(&lex->spprocs, &sp->m_spprocs);
(void)triggers->bodies[i][j]->add_used_tables_to_table_list(thd,
&lex->query_tables_last);
sp_update_stmt_used_routines(thd, lex,
&triggers->bodies[i][j]->m_sroutines);
}
}
}
(void)sp_cache_routines_and_add_tables_aux(thd, lex,
*last_cached_routine_ptr);
}
DBUG_VOID_RETURN;
}
/*
* Generates the CREATE... string from the table information.
* Returns TRUE on success, FALSE on (alloc) failure.
......
sql/sp.h
View file @ eb314af4
......@@ -79,15 +79,19 @@ sp_function_exists(THD *thd, sp_name *name);
/*
* For precaching of functions and procedures
*/
void
sp_add_to_hash(HASH *h, sp_name *fun);
bool
sp_merge_hash(HASH *dst, HASH *src);
void
sp_cache_routines(THD *thd, LEX *lex);
Procedures for pre-caching of stored routines and building table list
for prelocking.
*/
void sp_add_used_routine(LEX *lex, Query_arena *arena,
sp_name *rt, char rt_type);
void sp_update_sp_used_routines(HASH *dst, HASH *src);
bool sp_cache_routines_and_add_tables(THD *thd, LEX *lex);
void sp_cache_routines_and_add_tables_for_view(THD *thd, LEX *lex,
LEX *aux_lex);
void sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,
Table_triggers_list *triggers);
extern "C" byte* sp_sroutine_key(const byte *ptr, uint *plen, my_bool first);
//
// Utilities...
......
sql/sp_head.cc
View file @ eb314af4
......@@ -242,8 +242,11 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type,
void
sp_name::init_qname(THD *thd)
{
m_qname.length= m_db.length+m_name.length+1;
m_qname.str= thd->alloc(m_qname.length+1);
m_sroutines_key.length= m_db.length + m_name.length + 2;
if (!(m_sroutines_key.str= thd->alloc(m_sroutines_key.length + 1)))
return;
m_qname.length= m_sroutines_key.length - 1;
m_qname.str= m_sroutines_key.str + 1;
sprintf(m_qname.str, "%*s.%*s",
m_db.length, (m_db.length ? m_db.str : ""),
m_name.length, m_name.str);
......@@ -317,15 +320,12 @@ sp_head::sp_head()
{
extern byte *
sp_table_key(const byte *ptr, uint *plen, my_bool first);
extern byte
*sp_lex_sp_key(const byte *ptr, uint *plen, my_bool first);
DBUG_ENTER("sp_head::sp_head");
m_backpatch.empty();
m_lex.empty();
hash_init(&m_sptabs, system_charset_info, 0, 0, 0, sp_table_key, 0, 0);
hash_init(&m_spfuns, system_charset_info, 0, 0, 0, sp_lex_sp_key, 0, 0);
hash_init(&m_spprocs, system_charset_info, 0, 0, 0, sp_lex_sp_key, 0, 0);
hash_init(&m_sroutines, system_charset_info, 0, 0, 0, sp_sroutine_key, 0, 0);
DBUG_VOID_RETURN;
}
......@@ -528,8 +528,7 @@ sp_head::destroy()
}
hash_free(&m_sptabs);
hash_free(&m_spfuns);
hash_free(&m_spprocs);
hash_free(&m_sroutines);
DBUG_VOID_RETURN;
}
......@@ -1064,11 +1063,10 @@ sp_head::restore_lex(THD *thd)
oldlex->trg_table_fields.push_back(&sublex->trg_table_fields);
/*
Add routines which are used by statement to respective sets for
this routine
Add routines which are used by statement to respective set for
this routine.
*/
sp_merge_hash(&m_spfuns, &sublex->spfuns);
sp_merge_hash(&m_spprocs, &sublex->spprocs);
sp_update_sp_used_routines(&m_sroutines, &sublex->sroutines);
/*
Merge tables used by this statement (but not by its functions or
procedures) to multiset of tables used by this routine.
......@@ -1605,16 +1603,22 @@ sp_instr_set::print(String *str)
int
sp_instr_set_trigger_field::execute(THD *thd, uint *nextp)
{
int res= 0;
DBUG_ENTER("sp_instr_set_trigger_field::execute");
/* QQ: Still unsure what should we return in case of error 1 or -1 ? */
if (!value->fixed && value->fix_fields(thd, &value) ||
trigger_field->fix_fields(thd, 0) ||
(value->save_in_field(trigger_field->field, 0) < 0))
DBUG_RETURN(m_lex_keeper.reset_lex_and_exec_core(thd, nextp, TRUE, this));
}
int
sp_instr_set_trigger_field::exec_core(THD *thd, uint *nextp)
{
int res= 0;
Item *it= sp_prepare_func_item(thd, &value);
if (!it ||
!trigger_field->fixed && trigger_field->fix_fields(thd, 0) ||
(it->save_in_field(trigger_field->field, 0) < 0))
res= -1;
*nextp= m_ip + 1;
DBUG_RETURN(res);
*nextp = m_ip+1;
return res;
}
void
......@@ -2438,72 +2442,3 @@ sp_add_to_query_tables(THD *thd, LEX *lex,
return table;
}
/*
Auxilary function for adding tables used by routines used in query
to table lists.
SYNOPSIS
sp_add_sp_tables_to_table_list_aux()
thd - thread context
lex - LEX to which table list tables will be added
func_hash - routines for which tables should be added
func_cache- SP cache in which this routines should be looked up
NOTE
See sp_add_sp_tables_to_table_list() for more info.
RETURN VALUE
TRUE - some tables were added
FALSE - no tables were added.
*/
static bool
sp_add_sp_tables_to_table_list_aux(THD *thd, LEX *lex, HASH *func_hash,
sp_cache **func_cache)
{
uint i;
bool result= FALSE;
for (i= 0 ; i < func_hash->records ; i++)
{
sp_head *sp;
LEX_STRING *ls= (LEX_STRING *)hash_element(func_hash, i);
sp_name name(*ls);
name.m_qname= *ls;
if ((sp= sp_cache_lookup(func_cache, &name)))
result|= sp->add_used_tables_to_table_list(thd, &lex->query_tables_last);
}
return result;
}
/*
Add tables used by routines used in query to table list.
SYNOPSIS
sp_add_sp_tables_to_table_list()
thd - thread context
lex - LEX to which table list tables will be added
func_lex - LEX for which functions we get tables
(useful for adding tables used by view routines)
NOTE
Elements of list will be allocated in PS memroot, so this
list will be persistent between PS execetutions.
RETURN VALUE
TRUE - some tables were added
FALSE - no tables were added.
*/
bool
sp_add_sp_tables_to_table_list(THD *thd, LEX *lex, LEX *func_lex)
{
return (sp_add_sp_tables_to_table_list_aux(thd, lex, &func_lex->spfuns,
&thd->sp_func_cache) |
sp_add_sp_tables_to_table_list_aux(thd, lex, &func_lex->spprocs,
&thd->sp_proc_cache));
}
sql/sp_head.h
View file @ eb314af4
......@@ -48,24 +48,50 @@ public:
LEX_STRING m_db;
LEX_STRING m_name;
LEX_STRING m_qname;
/*
Key representing routine in the set of stored routines used by statement.
Consists of 1-byte routine type and m_qname (which usually refences to
same buffer). Note that one must complete initialization of the key by
calling set_routine_type().
*/
LEX_STRING m_sroutines_key;
sp_name(LEX_STRING name)
: m_name(name)
{
m_db.str= m_qname.str= 0;
m_db.length= m_qname.length= 0;
m_db.str= m_qname.str= m_sroutines_key.str= 0;
m_db.length= m_qname.length= m_sroutines_key.length= 0;
}
sp_name(LEX_STRING db, LEX_STRING name)
: m_db(db), m_name(name)
{
m_qname.str= 0;
m_qname.length= 0;
m_qname.str= m_sroutines_key.str= 0;
m_qname.length= m_sroutines_key.length= 0;
}
/*
Creates temporary sp_name object from key, used mainly
for SP-cache lookups.
*/
sp_name(char *key, uint key_len)
{
m_sroutines_key.str= key;
m_sroutines_key.length= key_len;
m_name.str= m_qname.str= key + 1;
m_name.length= m_qname.length= key_len - 1;
m_db.str= 0;
m_db.length= 0;
}
// Init. the qualified name from the db and name.
void init_qname(THD *thd); // thd for memroot allocation
void set_routine_type(char type)
{
m_sroutines_key.str[0]= type;
}
~sp_name()
{}
};
......@@ -107,13 +133,13 @@ public:
longlong m_created;
longlong m_modified;
/*
Sets containing names of SP and SF used by this routine.
TODO Probably we should combine these two hashes in one. It will
decrease memory overhead ans simplify algorithms using them. The
same applies to similar hashes in LEX.
Set containing names of stored routines used by this routine.
Note that unlike elements of similar set for statement elements of this
set are not linked in one list. Because of this we are able save memory
by using for this set same objects that are used in 'sroutines' sets
for statements of which this stored routine consists.
*/
HASH m_spfuns, m_spprocs;
HASH m_sroutines;
// Pointers set during parsing
uchar *m_param_begin, *m_param_end, *m_body_begin;
......@@ -474,10 +500,11 @@ class sp_instr_set_trigger_field : public sp_instr
public:
sp_instr_set_trigger_field(uint ip, sp_pcontext *ctx,
Item_trigger_field *trg_fld, Item *val)
Item_trigger_field *trg_fld,
Item *val, LEX *lex)
: sp_instr(ip, ctx),
trigger_field(trg_fld),
value(val)
value(val), m_lex_keeper(lex, TRUE)
{}
virtual ~sp_instr_set_trigger_field()
......@@ -485,11 +512,14 @@ public:
virtual int execute(THD *thd, uint *nextp);
virtual int exec_core(THD *thd, uint *nextp);
virtual void print(String *str);
private:
Item_trigger_field *trigger_field;
Item *value;
sp_lex_keeper m_lex_keeper;
}; // class sp_instr_trigger_field : public sp_instr
......@@ -954,7 +984,5 @@ TABLE_LIST *
sp_add_to_query_tables(THD *thd, LEX *lex,
const char *db, const char *name,
thr_lock_type locktype);
bool
sp_add_sp_tables_to_table_list(THD *thd, LEX *lex, LEX *func_lex);
#endif /* _SP_HEAD_H_ */
sql/sql_base.cc
View file @ eb314af4
......@@ -1802,16 +1802,13 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter)
may be still zero for prelocked statement...
*/
if (!thd->prelocked_mode && !thd->lex->requires_prelocking() &&
(thd->lex->spfuns.records || thd->lex->spprocs.records))
thd->lex->sroutines.records)
{
TABLE_LIST **save_query_tables_last;
sp_cache_routines(thd, thd->lex);
save_query_tables_last= thd->lex->query_tables_last;
TABLE_LIST **save_query_tables_last= thd->lex->query_tables_last;
DBUG_ASSERT(thd->lex->query_tables == *start);
if (sp_add_sp_tables_to_table_list(thd, thd->lex, thd->lex) ||
if (sp_cache_routines_and_add_tables(thd, thd->lex) ||
*start)
{
query_tables_last_own= save_query_tables_last;
......@@ -1847,19 +1844,16 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter)
and add tables used by them to table list.
*/
if (!thd->prelocked_mode && !thd->lex->requires_prelocking() &&
(tables->view->spfuns.records || tables->view->spprocs.records))
tables->view->sroutines.records)
{
// FIXME We should catch recursion for both views and funcs here
sp_cache_routines(thd, tables->view);
/* We have at least one table in TL here */
if (!query_tables_last_own)
query_tables_last_own= thd->lex->query_tables_last;
sp_add_sp_tables_to_table_list(thd, thd->lex, tables->view);
sp_cache_routines_and_add_tables_for_view(thd, thd->lex,
tables->view);
}
/* Cleanup hashes because destructo for this LEX is never called */
hash_free(&tables->view->spfuns);
hash_free(&tables->view->spprocs);
hash_free(&tables->view->sroutines);
continue;
}
......@@ -1914,9 +1908,6 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter)
prelocking list.
If we lock table for reading we won't update it so there is no need to
process its triggers since they never will be activated.
FIXME Now we are simply turning on prelocking. Proper integration
and testing is to be done later.
*/
if (!thd->prelocked_mode && !thd->lex->requires_prelocking() &&
tables->table->triggers &&
......@@ -1924,6 +1915,8 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter)
{
if (!query_tables_last_own)
query_tables_last_own= thd->lex->query_tables_last;
sp_cache_routines_and_add_tables_for_triggers(thd, thd->lex,
tables->table->triggers);
}
free_root(&new_frm_mem, MYF(MY_KEEP_PREALLOC));
}
......
sql/sql_lex.cc
View file @ eb314af4
......@@ -172,10 +172,9 @@ void lex_start(THD *thd, uchar *buf,uint length)
lex->proc_list.first= 0;
lex->query_tables_own_last= 0;
if (lex->spfuns.records)
my_hash_reset(&lex->spfuns);
if (lex->spprocs.records)
my_hash_reset(&lex->spprocs);
if (lex->sroutines.records)
my_hash_reset(&lex->sroutines);
lex->sroutines_list.empty();
DBUG_VOID_RETURN;
}
......@@ -1571,6 +1570,28 @@ void st_select_lex::print_limit(THD *thd, String *str)
}
/*
Initialize LEX object.
SYNOPSIS
st_lex::st_lex()
NOTE
LEX object initialized with this constructor can be used as part of
THD object for which one can safely call open_tables(), lock_tables()
and close_thread_tables() functions. But it is not yet ready for
statement parsing. On should use lex_start() function to prepare LEX
for this.
*/
st_lex::st_lex()
:result(0), sql_command(SQLCOM_END), query_tables_own_last(0)
{
hash_init(&sroutines, system_charset_info, 0, 0, 0, sp_sroutine_key, 0, 0);
sroutines_list.empty();
}
/*
Check whether the merging algorithm can be used on this VIEW
......@@ -1976,10 +1997,8 @@ void st_lex::cleanup_after_one_table_open()
select_lex.cut_subtree();
}
time_zone_tables_used= 0;
if (spfuns.records)
my_hash_reset(&spfuns);
if (spprocs.records)
my_hash_reset(&spprocs);
if (sroutines.records)
my_hash_reset(&sroutines);
}
......
sql/sql_lex.h
View file @ eb314af4
......@@ -807,8 +807,14 @@ typedef struct st_lex
bool sp_lex_in_use; /* Keep track on lex usage in SPs for error handling */
bool all_privileges;
sp_pcontext *spcont;
HASH spfuns; /* Called functions */
HASH spprocs; /* Called procedures */
/* Set of stored routines called by statement. */
HASH sroutines;
/*
List linking elements of 'sroutines' set. Allows you to add new elements
to this set as you iterate through the list of existing elements.
*/
SQL_LIST sroutines_list;
st_sp_chistics sp_chistics;
bool only_view; /* used for SHOW CREATE TABLE/VIEW */
/*
......@@ -841,17 +847,11 @@ typedef struct st_lex
*/
uchar *fname_start, *fname_end;
st_lex() :result(0), sql_command(SQLCOM_END), query_tables_own_last(0)
{
extern byte *sp_lex_sp_key(const byte *ptr, uint *plen, my_bool first);
hash_init(&spfuns, system_charset_info, 0, 0, 0, sp_lex_sp_key, 0, 0);
hash_init(&spprocs, system_charset_info, 0, 0, 0, sp_lex_sp_key, 0, 0);
}
st_lex();
virtual ~st_lex()
{
hash_free(&spfuns);
hash_free(&spprocs);
hash_free(&sroutines);
}
inline void uncacheable(uint8 cause)
......
sql/sql_parse.cc
View file @ eb314af4
......@@ -2302,8 +2302,7 @@ mysql_execute_command(THD *thd)
Don't reset warnings when executing a stored routine.
*/
if ((all_tables || &lex->select_lex != lex->all_selects_list ||
lex->spfuns.records || lex->spprocs.records) &&
!thd->spcont)
lex->sroutines.records) && !thd->spcont)
mysql_reset_errors(thd, 0);
#ifdef HAVE_REPLICATION
......
sql/sql_trigger.cc
View file @ eb314af4
/* Copyright (C) 2004-2005 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "mysql_priv.h"
#include "sp_head.h"
#include "sql_trigger.h"
......@@ -417,6 +434,18 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
table->triggers= triggers;
/*
Construct key that will represent triggers for this table in the set
of routines used by statement.
*/
triggers->sroutines_key.length= 1+strlen(db)+1+strlen(table_name)+1;
if (!(triggers->sroutines_key.str=
alloc_root(&table->mem_root, triggers->sroutines_key.length)))
DBUG_RETURN(1);
triggers->sroutines_key.str[0]= TYPE_ENUM_TRIGGER;
strmov(strmov(strmov(triggers->sroutines_key.str+1, db), "."),
table_name);
/*
TODO: This could be avoided if there is no triggers
for UPDATE and DELETE.
......
sql/sql_trigger.h
View file @ eb314af4
/* Copyright (C) 2004-2005 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
This class holds all information about triggers of table.
......@@ -28,6 +45,14 @@ class Table_triggers_list: public Sql_alloc
used in CREATE/DROP TRIGGER for looking up trigger by name.
*/
List<LEX_STRING> names_list;
/*
Key representing triggers for this table in set of all stored
routines used by statement.
TODO: We won't need this member once triggers namespace will be
database-wide instead of table-wide because then we will be able
to use key based on sp_name as for other stored routines.
*/
LEX_STRING sroutines_key;
public:
/*
......@@ -112,6 +137,8 @@ public:
}
friend class Item_trigger_field;
friend void sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,
Table_triggers_list *triggers);
private:
bool prepare_record1_accessors(TABLE *table);
......
sql/sql_yacc.yy
View file @ eb314af4
......@@ -1531,7 +1531,7 @@ call:
lex->sql_command= SQLCOM_CALL;
lex->spname= $2;
lex->value_list.empty();
sp_add_to_hash(&lex->spprocs, $2);
sp_add_used_routine(lex, YYTHD, $2, TYPE_ENUM_PROCEDURE);
}
'(' sp_cparam_list ')' {}
;
......@@ -4695,7 +4695,7 @@ simple_expr:
sp_name *name= new sp_name($1, $3);
name->init_qname(YYTHD);
sp_add_to_hash(&lex->spfuns, name);
sp_add_used_routine(lex, YYTHD, name, TYPE_ENUM_FUNCTION);
if ($5)
$$= new Item_func_sp(&lex->current_select->context, name, *$5);
else
......@@ -4785,7 +4785,7 @@ simple_expr:
LEX *lex= Lex;
sp_name *name= sp_name_current_db_new(YYTHD, $1);
sp_add_to_hash(&lex->spfuns, name);
sp_add_used_routine(lex, YYTHD, name, TYPE_ENUM_FUNCTION);
if ($3)
$$= new Item_func_sp(&lex->current_select->context, name, *$3);
else
......@@ -7740,12 +7740,6 @@ sys_option_value:
yyerror(ER(ER_SYNTAX_ERROR));
YYABORT;
}
if (lex->query_tables)
{
my_message(ER_SP_SUBSELECT_NYI, ER(ER_SP_SUBSELECT_NYI),
MYF(0));
YYABORT;
}
if ($4)
it= $4;
else
......@@ -7760,7 +7754,8 @@ sys_option_value:
$2.base_name.str)) ||
!(i= new sp_instr_set_trigger_field(lex->sphead->
instructions(),
lex->spcont, trg_fld, it)))
lex->spcont, trg_fld,
it, lex)))
YYABORT;
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7