~dshrews/drizzle/bugs_626566_637590

« back to all changes in this revision

Viewing changes to client/errname.cc

  • Committer: lbieber
  • Date: 2010-09-10 01:15:48 UTC
  • mfrom: (1752.1.2 build)
  • Revision ID: lbieber@orisndriz03-20100910011548-rirqm1mx03y38zfz
Merge Vijay - fix bug 632589 - change boolean type command line options of embedded_innodb to be the same as other client options

Show diffs side-by-side

added added

removed removed

Lines of Context:
251
251
    { "ER_CANNOT_ADD_FOREIGN",1215 },
252
252
    { "ER_NO_REFERENCED_ROW",1216 },
253
253
    { "ER_ROW_IS_REFERENCED",1217 },
254
 
    { "ER_CONNECT_TO_MASTER",1218 },
 
254
    { "ER_UNUSED1218",1218 },
255
255
    { "ER_UNUSED1219",1219 },
256
256
    { "ER_UNUSED1220",1220 },
257
257
    { "ER_WRONG_USAGE",1221 },
259
259
    { "ER_CANT_UPDATE_WITH_READLOCK",1223 },
260
260
    { "ER_UNUSED1224",1224 },
261
261
    { "ER_UNUSED1225",1225 },
262
 
    { "ER_USER_LIMIT_REACHED",1226 },
 
262
    { "ER_UNUSED1226",1226 },
263
263
    { "ER_UNUSED1227",1227 },
264
264
    { "ER_LOCAL_VARIABLE",1228 },
265
265
    { "ER_GLOBAL_VARIABLE",1229 },
341
341
    { "ER_SP_DOES_NOT_EXIST",1305 },
342
342
    { "ER_UNUSED1306",1306 },
343
343
    { "ER_UNUSED1307",1307 },
344
 
    { "ER_SP_LILABEL_MISMATCH",1308 },
345
 
    { "ER_SP_LABEL_REDEFINE",1309 },
346
 
    { "ER_SP_LABEL_MISMATCH",1310 },
 
344
    { "ER_UNUSED1308",1308 },
 
345
    { "ER_UNUSED1309",1309 },
 
346
    { "ER_UNUSED1310",1310 },
347
347
    { "ER_UNUSED1311",1311 },
348
348
    { "ER_UNUSED1312",1312 },
349
349
    { "ER_UNUSED1313",1313 },
350
350
    { "ER_UNUSED1314",1314 },
351
 
    { "ER_UPDATE_LOG_DEPRECATED_IGNORED",1315 },
352
 
    { "ER_UPDATE_LOG_DEPRECATED_TRANSLATED",1316 },
 
351
    { "ER_UNUSED1315",1315 },
 
352
    { "ER_UNUSED1316",1316 },
353
353
    { "ER_QUERY_INTERRUPTED",1317 },
354
354
    { "ER_UNUSED1318",1318 },
355
355
    { "ER_UNUSED1319",1319 },
363
363
    { "ER_UNUSED1327",1327 },
364
364
    { "ER_UNUSED1328",1328 },
365
365
    { "ER_SP_FETCH_NO_DATA",1329 },
366
 
    { "ER_SP_DUP_PARAM",1330 },
367
 
    { "ER_SP_DUP_VAR",1331 },
368
 
    { "ER_SP_DUP_COND",1332 },
369
 
    { "ER_SP_DUP_CURS",1333 },
 
366
    { "ER_UNUSED1330",1330 },
 
367
    { "ER_UNUSED1331",1331 },
 
368
    { "ER_UNUSED1332",1332 },
 
369
    { "ER_UNUSED1333",1333 },
370
370
    { "ER_UNUSED1334",1334 },
371
 
    { "ER_SP_SUBSELECT_NYI",1335 },
372
 
    { "ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG",1336 },
373
 
    { "ER_SP_VARCOND_AFTER_CURSHNDLR",1337 },
374
 
    { "ER_SP_CURSOR_AFTER_HANDLER",1338 },
 
371
    { "ER_UNUSED1335",1335 },
 
372
    { "ER_UNUSED1336",1336 },
 
373
    { "ER_UNUSED1337",1337 },
 
374
    { "ER_UNUSED1338",1338 },
375
375
    { "ER_UNUSED1339",1339 },
376
376
    { "ER_UNUSED1340",1340 },
377
377
    { "ER_UNUSED1341",1341 },
403
403
    { "ER_ILLEGAL_VALUE_FOR_TYPE",1367 },
404
404
    { "ER_UNUSED1368",1368 },
405
405
    { "ER_UNUSED1369",1369 },
406
 
    { "ER_PROCACCESS_DENIED_ERROR",1370 },
 
406
    { "ER_UNUSED1370",1370 },
407
407
    { "ER_UNUSED1371",1371 },
408
408
    { "ER_UNUSED1372",1372 },
409
409
    { "ER_UNUSED1373",1373 },
430
430
    { "ER_UNUSED1394",1394 },
431
431
    { "ER_UNUSED1395",1395 },
432
432
    { "ER_UNUSED1396",1396 },
433
 
    { "ER_XAER_NOTA",1397 },
434
 
    { "ER_XAER_INVAL",1398 },
 
433
    { "ER_UNUSED1397",1397 },
 
434
    { "ER_UNUSED1398",1398 },
435
435
    { "ER_XAER_RMFAIL",1399 },
436
 
    { "ER_XAER_OUTSIDE",1400 },
437
 
    { "ER_XAER_RMERR",1401 },
438
 
    { "ER_XA_RBROLLBACK",1402 },
439
 
    { "ER_NONEXISTING_PROC_GRANT",1403 },
 
436
    { "ER_UNUSED1400",1400 },
 
437
    { "ER_UNUSED1401",1401 },
 
438
    { "ER_UNUSED1402",1402 },
 
439
    { "ER_UNUSED1403",1403 },
440
440
    { "ER_UNUSED1404",1404 },
441
441
    { "ER_UNUSED1405",1405 },
442
442
    { "ER_DATA_TOO_LONG",1406 },
443
 
    { "ER_SP_BAD_SQLSTATE",1407 },
 
443
    { "ER_UNUSED1407",1407 },
444
444
    { "ER_STARTUP",1408 },
445
445
    { "ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR",1409 },
446
 
    { "ER_CANT_CREATE_USER_WITH_GRANT",1410 },
 
446
    { "ER_UNUSED1410",1410 },
447
447
    { "ER_WRONG_VALUE_FOR_TYPE",1411 },
448
448
    { "ER_TABLE_DEF_CHANGED",1412 },
449
 
    { "ER_SP_DUP_HANDLER",1413 },
450
 
    { "ER_SP_NOT_VAR_ARG",1414 },
 
449
    { "ER_UNUSED1413",1413 },
 
450
    { "ER_UNUSED1414",1414 },
451
451
    { "ER_SP_NO_RETSET",1415 },
452
452
    { "ER_CANT_CREATE_GEOMETRY_OBJECT",1416 },
453
453
    { "ER_UNUSED1417",1417 },
470
470
    { "ER_UNUSED1434",1434 },
471
471
    { "ER_TRG_IN_WRONG_SCHEMA",1435 },
472
472
    { "ER_STACK_OVERRUN_NEED_MORE",1436 },
473
 
    { "ER_TOO_LONG_BODY",1437 },
 
473
    { "ER_UNUSED1437",1437 },
474
474
    { "ER_UNUSED1438",1438 },
475
475
    { "ER_TOO_BIG_DISPLAYWIDTH",1439 },
476
 
    { "ER_XAER_DUPID",1440 },
 
476
    { "ER_UNUSED1440",1440 },
477
477
    { "ER_DATETIME_FUNCTION_OVERFLOW",1441 },
478
478
    { "ER_UNUSED1442",1442 },
479
479
    { "ER_UNUSED1443",1443 },
486
486
    { "ER_UNUSED1450",1450 },
487
487
    { "ER_ROW_IS_REFERENCED_2",1451 },
488
488
    { "ER_NO_REFERENCED_ROW_2",1452 },
489
 
    { "ER_SP_BAD_VAR_SHADOW",1453 },
490
 
    { "ER_TRG_NO_DEFINER",1454 },
 
489
    { "ER_UNUSED1453",1453 },
 
490
    { "ER_UNUSED1454",1454 },
491
491
    { "ER_UNUSED1455",1455 },
492
492
    { "ER_UNUSED1456",1456 },
493
493
    { "ER_UNUSED1457",1457 },
494
 
    { "ER_SP_WRONG_NAME",1458 },
 
494
    { "ER_UNUSED1458",1458 },
495
495
    { "ER_TABLE_NEEDS_UPGRADE",1459 },
496
 
    { "ER_SP_NO_AGGREGATE",1460 },
497
 
    { "ER_MAX_PREPARED_STMT_COUNT_REACHED",1461 },
 
496
    { "ER_UNUSED1460",1460 },
 
497
    { "ER_UNUSED1461",1461 },
498
498
    { "ER_UNUSED1462",1462 },
499
499
    { "ER_NON_GROUPING_FIELD_USED",1463 },
500
500
    { "ER_TABLE_CANT_HANDLE_SPKEYS",1464 },