From 4d4c8492b715557c45eb3edd4ccab31ed6f07728 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Mon, 29 Aug 2016 00:03:07 +0200
Subject: [PATCH] Misc: More sync with 3.3.5a and 6.x branches

---
 .travis.yml                                                  | 4 ++--
 contrib/check_updates.sh                                     | 5 +++--
 sql/updates/{ => 4.3.4}/auth/2016_08_28_00_auth.sql          | 0
 sql/updates/{ => 4.3.4}/auth/dummy                           | 0
 .../{ => 4.3.4}/characters/2016_08_28_00_characters.sql      | 0
 sql/updates/{ => 4.3.4}/characters/dummy                     | 0
 sql/updates/{ => 4.3.4}/world/2016_08_28_02_world.sql        | 0
 7 files changed, 5 insertions(+), 4 deletions(-)
 rename sql/updates/{ => 4.3.4}/auth/2016_08_28_00_auth.sql (100%)
 rename sql/updates/{ => 4.3.4}/auth/dummy (100%)
 rename sql/updates/{ => 4.3.4}/characters/2016_08_28_00_characters.sql (100%)
 rename sql/updates/{ => 4.3.4}/characters/dummy (100%)
 rename sql/updates/{ => 4.3.4}/world/2016_08_28_02_world.sql (100%)

diff --git a/.travis.yml b/.travis.yml
index 6fd3d85278..1a316d892e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,9 @@ script:
   - $CXX --version
   - mysql -uroot < sql/create/create_mysql.sql
   - mysql -utrinity -ptrinity auth < sql/base/auth_database.sql
-  - ./contrib/check_updates.sh auth auth
+  - ./contrib/check_updates.sh auth 4.3.4 auth
   - mysql -utrinity -ptrinity characters < sql/base/characters_database.sql
-  - ./contrib/check_updates.sh characters characters
+  - ./contrib/check_updates.sh characters 4.3.4 characters
   - mysql -utrinity -ptrinity world < sql/base/dev/world_database.sql
   - cat sql/updates/world/*.sql | mysql -utrinity -ptrinity world
   - mysql -uroot < sql/create/drop_mysql.sql
diff --git a/contrib/check_updates.sh b/contrib/check_updates.sh
index 017542eb80..6c33d07ae8 100644
--- a/contrib/check_updates.sh
+++ b/contrib/check_updates.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 name=$1
-database=$2
+branch=$2
+database=$3
 
 echo "Database Updater check script:"
 echo "  Checking database '${name}' for missing filenames in tables..."
@@ -9,7 +10,7 @@ echo
 # Select all entries which are in the updates table
 entries=$(mysql -uroot ${database} -e "SELECT name FROM updates" | grep ".sql")
 
-cd sql/updates/${name}
+cd sql/updates/${name}/${branch}
 
 error=0
 updates=0
diff --git a/sql/updates/auth/2016_08_28_00_auth.sql b/sql/updates/4.3.4/auth/2016_08_28_00_auth.sql
similarity index 100%
rename from sql/updates/auth/2016_08_28_00_auth.sql
rename to sql/updates/4.3.4/auth/2016_08_28_00_auth.sql
diff --git a/sql/updates/auth/dummy b/sql/updates/4.3.4/auth/dummy
similarity index 100%
rename from sql/updates/auth/dummy
rename to sql/updates/4.3.4/auth/dummy
diff --git a/sql/updates/characters/2016_08_28_00_characters.sql b/sql/updates/4.3.4/characters/2016_08_28_00_characters.sql
similarity index 100%
rename from sql/updates/characters/2016_08_28_00_characters.sql
rename to sql/updates/4.3.4/characters/2016_08_28_00_characters.sql
diff --git a/sql/updates/characters/dummy b/sql/updates/4.3.4/characters/dummy
similarity index 100%
rename from sql/updates/characters/dummy
rename to sql/updates/4.3.4/characters/dummy
diff --git a/sql/updates/world/2016_08_28_02_world.sql b/sql/updates/4.3.4/world/2016_08_28_02_world.sql
similarity index 100%
rename from sql/updates/world/2016_08_28_02_world.sql
rename to sql/updates/4.3.4/world/2016_08_28_02_world.sql