database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-15 08:21:24 +03:00
Code Activity

Merge hynda.mysql.fi:/home/my/mysql-5.1-main

Browse Source 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel


client/mysqldump.c:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_yacc.yy:
  Manual merge with 5.1 main tree.
This commit is contained in:
unknown
2007-08-22 17:29:38 +03:00
parent 7dd4e78958 edf4fccf98
commit b3dd7d5ca6
143 changed files with 1284 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/t/func_misc.test
View File

@@ -2,6 +2,10 @@
# Testing of misc functions
#
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
select format(1.5555,0),format(123.5555,1),format(1234.5555,2),format(12345.55555,3),format(123456.5555,4),format(1234567.5555,5),format("12345.2399",2);
select inet_ntoa(inet_aton("255.255.255.255.255.255.255.255"));
@@ -48,9 +52,6 @@ drop table t1;
#
# Bug#16501: IS_USED_LOCK does not appear to work
#
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
CREATE TABLE t1 (conn CHAR(7), connection_id INT);
INSERT INTO t1 VALUES ('default', CONNECTION_ID());

4
mysql-test/t/status.test
View File

@@ -59,10 +59,6 @@ connection con1;
reap;
# ++Immediate = 16 + $wait_condition_reps
show status like 'Table_locks_waited';
# ++Immediate = 17 + $wait_condition_reps
--disable_query_log
eval select variable_value - $wait_condition_reps as Immediate from information_schema.session_status where variable_name like 'Table_locks_immediate';
--enable_query_log
drop table t1;
disconnect con2;