database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

buildbot issues

Browse Source 
* rpm upgrade fix
* update test results
* valgrind warning
This commit is contained in:
Sergei Golubchik
2016-12-13 12:55:18 +01:00
parent 65b4d7457e
commit 44e799590e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/funcs_1/r/myisam_views-big.result
View File

@@ -23219,7 +23219,7 @@ CREATE OR REPLACE VIEW test1.v20 AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v19 tab2; FROM test3.t1 tab1 NATURAL JOIN test1.v19 tab2;
SHOW CREATE VIEW test1.v20; SHOW CREATE VIEW test1.v20;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v20 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v20` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v19` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) latin1 latin1_swedish_ci v20 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v20` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v19` `tab2` on(`tab1`.`f1` = `tab2`.`f1` and `tab1`.`f2` = `tab2`.`f2`)) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1, SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
CAST(f2 AS CHAR) AS f2 FROM test1.v20; CAST(f2 AS CHAR) AS f2 FROM test1.v20;
f1 f2 f1 f2
@@ -23235,7 +23235,7 @@ CREATE VIEW test1.v21 AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v20 tab2; FROM test3.t1 tab1 NATURAL JOIN test1.v20 tab2;
SHOW CREATE VIEW test1.v21; SHOW CREATE VIEW test1.v21;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v21 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v21` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v20` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) latin1 latin1_swedish_ci v21 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v21` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v20` `tab2` on(`tab1`.`f1` = `tab2`.`f1` and `tab1`.`f2` = `tab2`.`f2`)) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1, SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
CAST(f2 AS CHAR) AS f2 FROM test1.v21; CAST(f2 AS CHAR) AS f2 FROM test1.v21;
f1 f2 f1 f2

2
sql/table.cc
View File

@@ -2875,7 +2875,7 @@ unpack_vcol_info_from_frm(THD *thd, MEM_ROOT *mem_root, TABLE *table,
DBUG_ASSERT(vcol->expr == NULL); DBUG_ASSERT(vcol->expr == NULL);
if (parser_state.init(thd, expr_str->c_ptr(), expr_str->length())) if (parser_state.init(thd, expr_str->c_ptr_safe(), expr_str->length()))
goto end; goto end;
if (init_lex_with_single_table(thd, table, &lex)) if (init_lex_with_single_table(thd, table, &lex))

2
support-files/rpm/server-prein.sh
View File

@@ -4,7 +4,7 @@
installed=`rpm -q --whatprovides mysql-server 2> /dev/null` installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
if [ $? -eq 0 -a -n "$installed" ]; then if [ $? -eq 0 -a -n "$installed" ]; then
installed=`echo "$installed"|sed -n 1p` installed=`echo "$installed"|sed -n 1p`
vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1` vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1 | sed 's/Monty Program AB/MariaDB Foundation/'`
version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1` version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
myvendor='%{mysql_vendor}' myvendor='%{mysql_vendor}'
myversion='%{mysqlversion}' myversion='%{mysqlversion}'