Merge box/lua/misc.lua into src/lua/init.lua

src/box/CMakeLists.txt

@@ -5,7 +5,6 @@ include_directories(${SOPHIA_INCLUDE_DIR})
 set(lua_sources)
 lua_source(lua_sources lua/schema.lua)
 lua_source(lua_sources lua/box_net.lua)
-lua_source(lua_sources lua/misc.lua)
 lua_source(lua_sources lua/tuple.lua)
 set(bin_sources)
 bin_source(bin_sources bootstrap.snap bootstrap.h)

src/box/lua/call.cc

@@ -52,8 +52,8 @@
 #include "box/schema.h"
 
 /* contents of box.lua, misc.lua, box.net.lua respectively */
-extern char schema_lua[], box_net_lua[], misc_lua[] ;
-static const char *lua_sources[] = { schema_lua, box_net_lua, misc_lua, NULL };
+extern char schema_lua[], box_net_lua[];
+static const char *lua_sources[] = { schema_lua, box_net_lua, NULL };
 
 /*
  * Functions, exported in box_lua.h should have prefix

src/box/lua/misc.lua

--- misc.lua (internal file)
-
--- This function automatically called by console client
--- on help command.
-function help()
-	return "server admin commands", {
-		"box.snapshot()",
-		"box.info()",
-		"box.stat()",
-		"box.slab.info()",
-		"box.slab.check()",
-		"box.fiber.info()",
-		"box.plugin.info()",
-		"box.cfg()",
-		"box.cfg.reload()",
-		"box.coredump()"
-	}
-end
-
--- This function automatically called by the server for
--- any new admin client.
-function motd()
-	return "Tarantool " .. box.info.version,
-	       "Uptime: " .. box.info.uptime
-end
-
--- vim: set et ts=4 sts

src/lua/init.lua

@@ -27,3 +27,27 @@ dostring = function(s, ...)
     end
     return chunk(...)
 end
+
+-- This function automatically called by console client
+-- on help command.
+function help()
+	return "server admin commands", {
+		"box.snapshot()",
+		"box.info()",
+		"box.stat()",
+		"box.slab.info()",
+		"box.slab.check()",
+		"box.fiber.info()",
+		"box.plugin.info()",
+		"box.cfg()",
+		"box.cfg.reload()",
+		"box.coredump()"
+	}
+end
+
+-- This function automatically called by the server for
+-- any new admin client.
+function motd()
+	return "Tarantool " .. box.info.version,
+		   "Uptime: " .. box.info.uptime
+end