mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
fixed conflicts
VC++Files/mysys/mysys.dsp: Auto merged include/my_sys.h: Auto merged sql/sql_db.cc: Auto merged
This commit is contained in:
2
mysql-test/r/reserved_win_names.require
Normal file
2
mysql-test/r/reserved_win_names.require
Normal file
@ -0,0 +1,2 @@
|
||||
Variable_name Value
|
||||
lower_case_table_names 1
|
7
mysql-test/r/reserved_win_names.result
Normal file
7
mysql-test/r/reserved_win_names.result
Normal file
@ -0,0 +1,7 @@
|
||||
use COM1;
|
||||
ERROR 42000: Unknown database 'com1'
|
||||
use LPT1;
|
||||
ERROR 42000: Unknown database 'lpt1'
|
||||
use PRN;
|
||||
ERROR 42000: Unknown database 'prn'
|
||||
|
1
mysql-test/t/reserved_win_names-master.opt
Normal file
1
mysql-test/t/reserved_win_names-master.opt
Normal file
@ -0,0 +1 @@
|
||||
--lower_case_table_names=1
|
12
mysql-test/t/reserved_win_names.test
Normal file
12
mysql-test/t/reserved_win_names.test
Normal file
@ -0,0 +1,12 @@
|
||||
#
|
||||
# Test of reserved Windows names
|
||||
#
|
||||
--require r/reserved_win_names.require
|
||||
|
||||
--error 1049
|
||||
use COM1;
|
||||
--error 1049
|
||||
use LPT1;
|
||||
--error 1049
|
||||
use PRN;
|
||||
|
Reference in New Issue
Block a user