diff --git a/.gitignore b/.gitignore index 573f586..95ab0d6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,3 @@ nginx/* php/* !php/php.ini -db/mysql -db/performance_schema diff --git a/db/aria_log.00000001 b/db/aria_log.00000001 index a389295..2258f46 100755 Binary files a/db/aria_log.00000001 and b/db/aria_log.00000001 differ diff --git a/db/aria_log_control b/db/aria_log_control index 5c6e5c8..3a60a18 100755 Binary files a/db/aria_log_control and b/db/aria_log_control differ diff --git a/db/ddl_recovery.log b/db/ddl_recovery.log deleted file mode 100644 index 5e30b6d..0000000 Binary files a/db/ddl_recovery.log and /dev/null differ diff --git a/db/egytalk/comment.ibd b/db/egytalk/comment.ibd index 5c81128..1fa56b3 100755 Binary files a/db/egytalk/comment.ibd and b/db/egytalk/comment.ibd differ diff --git a/db/egytalk/post.ibd b/db/egytalk/post.ibd index 5d406e8..8cc3074 100755 Binary files a/db/egytalk/post.ibd and b/db/egytalk/post.ibd differ diff --git a/db/egytalk/user.ibd b/db/egytalk/user.ibd index 5f773a1..30ff146 100755 Binary files a/db/egytalk/user.ibd and b/db/egytalk/user.ibd differ diff --git a/db/ib_buffer_pool b/db/ib_buffer_pool index a13a608..aa9a642 100644 --- a/db/ib_buffer_pool +++ b/db/ib_buffer_pool @@ -1,11 +1,51 @@ -17,4 +48,7 +48,6 +48,5 48,4 -12,3 -17,3 48,3 +23,3 +22,9 +22,8 +22,7 +22,6 +22,5 +22,4 +22,3 +21,34 +21,33 +21,32 +21,31 +21,29 +21,28 +21,26 +21,25 +21,24 +21,23 +21,22 +21,21 +21,20 +21,18 +21,17 +21,16 +21,15 +21,12 +21,11 +21,10 +21,9 +21,8 +21,7 +21,6 +21,5 +21,4 +21,3 +17,4 +17,3 +12,3 7,3 5,3 4,3 +3,2 +1,2 1,45 3,44 2,44 diff --git a/db/ib_logfile0 b/db/ib_logfile0 index f7c5533..37e97da 100755 Binary files a/db/ib_logfile0 and b/db/ib_logfile0 differ diff --git a/db/ibdata1 b/db/ibdata1 index aaed078..89a95ba 100755 Binary files a/db/ibdata1 and b/db/ibdata1 differ diff --git a/db/ibtmp1 b/db/ibtmp1 deleted file mode 100644 index 202d95c..0000000 Binary files a/db/ibtmp1 and /dev/null differ diff --git a/db/tc.log b/db/tc.log deleted file mode 100644 index cc8a34a..0000000 Binary files a/db/tc.log and /dev/null differ diff --git a/db/undo001 b/db/undo001 index 76a89b7..098eaec 100755 Binary files a/db/undo001 and b/db/undo001 differ diff --git a/db/undo003 b/db/undo003 index 1ec4202..31e255b 100755 Binary files a/db/undo003 and b/db/undo003 differ diff --git a/www/public/M6/01/index.php b/www/public/M6/01/index.php index a9156f0..1bccefb 100644 --- a/www/public/M6/01/index.php +++ b/www/public/M6/01/index.php @@ -7,7 +7,7 @@ prepare("SELECT Name, Population FROM country WHERE Name LIKE 'Z%' ORDER BY Population DESC"); diff --git a/www/public/M6/04/login.php b/www/public/M6/04/login.php index 54d21c4..5e3fded 100644 --- a/www/public/M6/04/login.php +++ b/www/public/M6/04/login.php @@ -32,31 +32,5 @@

- - prepare("INSERT INTO user(uid, firstname, surname, username, password) VALUES(UUID(), :fn, :sn,:user,:pwd)"); - - $stmt->bindValue(":fn", $firstName); - $stmt->bindValue(":sn", $surName); - $stmt->bindValue(":user", $username); - $stmt->bindValue(":pwd", $password); - - try{ - $stmt->execute(); - echo "Good"; - }catch(Exception $e){ - echo "Not good"; - } - } - ?> \ No newline at end of file diff --git a/www/public/M6/inc/egytalk_connect.php b/www/public/M6/inc/egytalk_connect.php index 72e9b93..d0eddf9 100644 --- a/www/public/M6/inc/egytalk_connect.php +++ b/www/public/M6/inc/egytalk_connect.php @@ -6,7 +6,7 @@ define('DB_PASSWORD', '12345'); } if (!defined('DB_HOST')) { - define('DB_HOST', 'localhost'); // Use 'mariadb' for Docker, otherwise '127.0.0.1' + define('DB_HOST', 'mariadb'); // Use 'mariadb' for Docker, otherwise '127.0.0.1' } if (!defined('DB_NAME')) { define('DB_NAME', 'egytalk'); diff --git a/www/public/M6/inc/world_connect.php b/www/public/M6/inc/world_connect.php index 709531c..89cbf39 100644 --- a/www/public/M6/inc/world_connect.php +++ b/www/public/M6/inc/world_connect.php @@ -2,7 +2,7 @@ // Definierar konstanter med användarinformation. define ('DB_USER', 'world'); define ('DB_PASSWORD', '12345'); - define ('DB_HOST', 'localhost'); // 'Om docker - 'mariadb', annars 127.0.0.1 + define ('DB_HOST', 'mariadb'); // 'Om docker - 'mariadb', annars 127.0.0.1 define ('DB_NAME', 'world'); // Skapar en anslutning till MySql och databasen world