diff options
| author | ramon <ramongomez@us.es> | 2013-03-26 10:05:30 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2013-03-26 10:05:30 +0000 |
| commit | 97f45b19c55d4c985ddd0452c854ea00713a5965 (patch) | |
| tree | 99b8b7238a4464ae3a73466151063d679c988be8 /admin/Database | |
| parent | 6353837257f4eec9ff1fd0903508126ccd87b4a5 (diff) | |
#565: Corregir errata en actualización de la base de datos.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@3713 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/Database')
| -rw-r--r-- | admin/Database/ogAdmBD-1.0.5pre.sql | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/admin/Database/ogAdmBD-1.0.5pre.sql b/admin/Database/ogAdmBD-1.0.5pre.sql index 020a18be..babba9e3 100644 --- a/admin/Database/ogAdmBD-1.0.5pre.sql +++ b/admin/Database/ogAdmBD-1.0.5pre.sql @@ -88,21 +88,6 @@ INSERT INTO parametros (idparametro, nemonico, descripcion, nomidentificador, no # Actualizar menús para nuevo parámetro "video" del Kernel, que sustituye a "vga" (ticket #573). ALTER TABLE menus MODIFY resolucion VARCHAR(50) DEFAULT NULL; -<<<<<<< .mine -UPDATE menus SET resolucion = CASE resolucion - WHEN '355' THEN 'uvesafb:1152x864-16' - WHEN '788' THEN 'uvesafb:800x600-16' - WHEN '789' THEN 'uvesafb:800x600-24' - WHEN '791' THEN 'uvesafb:1024x768-16' - WHEN '792' THEN 'uvesafb:1024x768-24' - WHEN '794' THEN 'uvesafb:1280x1024-16' - WHEN '795' THEN 'uvesafb:1280x1024-24' - WHEN '798' THEN 'uvesafb:1600x1200-16' - WHEN '799' THEN 'uvesafb:1600x1200-24' - WHEN NULL or '0' THEN 'uvesafb:800x600-16' - ELSE resolucion - END; -======= UPDATE menus SET resolucion = CASE resolucion WHEN '355' THEN 'uvesafb:1152x864-16' @@ -114,10 +99,9 @@ UPDATE menus WHEN '795' THEN 'uvesafb:1280x1024-24' WHEN '798' THEN 'uvesafb:1600x1200-16' WHEN '799' THEN 'uvesafb:1600x1200-24' - WHEN NULL THEN 'uvesafb:800x600-16' + WHEN NULL or '0' THEN 'uvesafb:800x600-16' ELSE resolucion END; ->>>>>>> .r3679 # Cambios para NetBoot con ficheros dinámicos (tickets #534 #582). DROP TABLE IF EXISTS menuboot; |