database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/t/openssl_1.test:
  Manual merge
ndb/include/util/ndb_opts.h:
  Manual merge
ndb/tools/Makefile.am:
  Manual merge
ndb/tools/restore/restore_main.cpp:
  Manual merge
This commit is contained in:
unknown
2005-09-05 22:49:36 +02:00
parent 4c8361f683 8b1751e5c3
commit dd45e41689
18 changed files with 223 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysqltest.result
View File

@ -179,7 +179,6 @@ source database
echo message echo message
mysqltest: At line 1: Empty variable
mysqltest: At line 1: command "';' 2> /dev/null" failed
mysqltest: At line 1: Missing argument in exec
MySQL
"MySQL"
@ -301,7 +300,6 @@ mysqltest: At line 1: First argument to dec must be a variable (start with $)
mysqltest: At line 1: End of line junk detected: "1000"
mysqltest: At line 1: Missing arguments to system, nothing to do!
mysqltest: At line 1: Missing arguments to system, nothing to do!
mysqltest: At line 1: system command 'NonExistsinfComamdn 2> /dev/null' failed
test
test2
test3