Skip to content

Commit

Permalink
Merge 10.4 into 10.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@dr-m
dr-m committed Jun 13, 2019
2 parents d46db41 + 8e3a4be commit 984d710
Show file tree
Hide file tree
Showing 157 changed files with 3,031 additions and 2,600 deletions.
4 changes: 2 additions & 2 deletions client/CMakeLists.txt
View file
Expand Up @@ -72,10 +72,10 @@ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB})

MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB})
TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB} mysys_ssl)

MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc ../sql/password.c)
TARGET_LINK_LIBRARIES(mysqladmin ${CLIENT_LIB})
TARGET_LINK_LIBRARIES(mysqladmin ${CLIENT_LIB} mysys_ssl)

MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
Expand Down
4 changes: 4 additions & 0 deletions client/mysqldump.c
View file
Expand Up @@ -971,6 +971,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
exit(1);
}
break;
case (int) OPT_DEFAULT_CHARSET:
if (default_charset == disabled_my_option)
default_charset= (char *)mysql_universal_client_charset;
break;
}
return 0;
}
Expand Down
57 changes: 0 additions & 57 deletions debian/po/ar.po
View file
Expand Up @@ -190,60 +190,3 @@ msgstr ""
#: ../mariadb-server-10.5.templates:8001
msgid "The two passwords you entered were not the same. Please try again."
msgstr ""

#~ msgid "Really proceed with downgrade?"
#~ msgstr "هل فعلاً تريد التثبيط؟"

#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام."

#, fuzzy
#~| msgid ""
#~| "Such file is an indication that a mariadb-server package with a higher "
#~| "version has been installed earlier."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "هذا الملف دلالة على أن نسخة أحدث من حزمة mariadb-server تم تثبيتها مسبقاً."

#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "ليست هناك أية ضمانة أن النسخة التي تقوم بتثبيتها ستكون قادرة على استخدام "
#~ "قواعد البيانات الحالية."

#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "تشغيل خادم MariaDB عند الإقلاع؟"

#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "يمكن تشغيل خادم MariaDB آلياً وقت الإقلاع أو يدوياً باستخدام الأمر '/etc/"
#~ "init.d/mysql start'."

#~ msgid ""
#~ "To use MariaDB, the following entries for users and groups should be "
#~ "added to the system:"
#~ msgstr ""
#~ "كي تستخدم MariaDB، يجب إضافة المُدخلات التالية الخاصة بالمستخدمين "
#~ "والمجموعات إلى النظام:"

#~ msgid ""
#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
#~ msgstr ""
#~ "هل تريد دعم اتصالات MySQL من الأجهزة التي تعمل على ديبيان \"sarge\" أو "
#~ "أقدم؟"

#~ msgid ""
#~ "In old versions of MySQL clients on Debian, passwords were not stored "
#~ "securely. This has been improved since then, however clients (such as "
#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to "
#~ "recent accounts or accounts whose password have been changed."
#~ msgstr ""
#~ "في إصدارات عملاء MySQL القديمة من ديبيان، لم تكن كلمات المرور تحفظ بشكل "
#~ "آمن. ولقد حل هذه المشكلة بعدها، غير أن العملاء (مثل PHP) المتصلين من "
#~ "أجهزة تعمل على ديبيان Sarge 3.1 لن يكونوا قادرين على الاتصال باستخدام "
#~ "الحسابات الحديثة أو الحسابات التي تم تغيير كلمة مرورها."
163 changes: 0 additions & 163 deletions debian/po/ca.po
View file
Expand Up @@ -158,166 +158,3 @@ msgstr ""
#: ../mariadb-server-10.5.templates:8001
msgid "The two passwords you entered were not the same. Please try again."
msgstr ""

#, fuzzy
#~| msgid "Should MySQL start on boot?"
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Voleu que el MariaDB s'inici� a l'arrencada ?"

#, fuzzy
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "El MariaDB es pot executar a l'arrencada o nom�s si executeu manualment '/"
#~ "etc/init.d/mysql start'. Seleccioneu 's�' si voleu que s'inicialitzi "
#~ "autom�ticament."

#, fuzzy
#~ msgid ""
#~ "To use mysql you must install an equivalent user and group to the "
#~ "following and ensure yourself that /var/lib/mysql has the right "
#~ "permissions (the uid/gid may be different)."
#~ msgstr ""
#~ "Per utilitzar la base de dades de MySQL heu d'afegir un usuari i grup "
#~ "equivalent al seg�ent i assegurar-vos que el directori /var/lib/mysql "
#~ "tingui els permisos correctes."

#~ msgid ""
#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false"
#~ msgstr ""
#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false"

#~ msgid "/etc/group: mysql:x:101:"
#~ msgstr "/etc/group: mysql:x:101:"

#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql"
#~ msgstr "/var/lib/mysql: drwxr-xr-x mysql mysql"

#, fuzzy
#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"
#~ msgstr ""
#~ "Feu una ullada al document: http://www.mysql.com/doc/en/Upgrade.html"

#, fuzzy
#~ msgid ""
#~ "MySQL will only install if you have a non-numeric hostname that is "
#~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
#~ "myhostname\"."
#~ msgstr ""
#~ "El MySQL nom�s s'instal�la en cas de tenir un nom d'ordinador central que "
#~ "no sigui num�ric i que es pugui resoldre a trav�s del fitxer /etc/hosts. "
#~ "Ex. si l'ordre \"hostname\" retorna \"myhostname\", llavors hi ha d'haver "
#~ "una línia com la següent \"10.0.0.1 myhostname\"."

#, fuzzy
#~ msgid ""
#~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "
#~ "is used in the start/stop and cron scripts. Don't delete."
#~ msgstr ""
#~ "Es crea un nou usuari de mysql \"debian-sys-maint\". S'utilitza per les "
#~ "seq��ncies d'inicialitzaci� i aturada del cron, no el suprimiu."

#, fuzzy
#~ msgid ""
#~ "Please remember to set a PASSWORD for the MySQL root user! If you use a /"
#~ "root/.my.cnf, always write the \"user\" and the \"password\" lines in "
#~ "there, never only the password!"
#~ msgstr ""
#~ "Recordeu posar una contrasenya al superusuari del MySQL. Si utilitzeu un "
#~ "fitxer /root/.my.cnf, escriviu sempre all� les l�nies \"user\" i "
#~ "\"password\".; mai nom�s la contrasenya. Per a m�s informaci� feu una "
#~ "ullada a /usr/share/doc/mysql-server/README.Debian."

#, fuzzy
#~ msgid ""
#~ "Should I remove all databases below /var/lib/mysql as you are purging the "
#~ "mysql-server package?"
#~ msgstr ""
#~ "Voleu suprimir totes les bases de dades en purgar el paquet mysql-server ?"

#~ msgid ""
#~ "Networking is disabled by default for security reasons. You can enable it "
#~ "by commenting out the skip-networking option in /etc/mysql/my.cnf."
#~ msgstr ""
#~ "La xarxa est� inhabilitada per defecte per a raons de seguretat. La podeu "
#~ "habilitar descomentant l'opci� de skip-networking del fitxer /etc/mysql/"
#~ "my.cnf."

#~ msgid "security and update notice"
#~ msgstr "Av�s de seguretat i actualitzaci�"

#~ msgid "Please run mysql_fix_privilege_tables !"
#~ msgstr "Executeu mysql_fix_privilege_tables"

#~ msgid ""
#~ "I will ensure secure permissions of /var/lib/mysql by replacing GIDs "
#~ "other than root and mysql with mysql."
#~ msgstr ""
#~ "S'asseguren els permisos de seguretat de /var/lib/mysql canviant a mysql "
#~ "tots els GIDs diferents a root i mysql."

#~ msgid ""
#~ "Instructions how to enable SSL support are in /usr/share/doc/mysql-server/"
#~ msgstr ""
#~ "Per habilitar el suport de SSL podeu seguir les instruccions de /usr/"
#~ "share/doc/mysql-server/"

#~ msgid "mysql_fix_privileges_tables will be executed"
#~ msgstr "s'executa mysql_fix_privileges_tables"

#~ msgid ""
#~ "The latest MySQL versions have an enhanced, more fine grained, privilege "
#~ "system. To make use of it, some new fields must be added to the tables "
#~ "in the \"mysql\" database. This is done by the "
#~ "mysql_fix_privilege_tables script during this upgrade regardless of if "
#~ "the server is currently running or not!"
#~ msgstr ""
#~ "Les �ltimes versions de MySQL tenen un sistema de privilegis m�s "
#~ "elaborat. Per utilitzar-lo cal afegir nous camps a les taules de la base "
#~ "de dades \"mysql\". Aquesta tasca la realitza la seq��ncia "
#~ "mysql_fix_privilege_tables durant l'actualitzaci� independentment de si "
#~ "el servidor s'est� executant o no!"

#~ msgid ""
#~ "This script is not supposed to give any user more rights that he had "
#~ "before, if you encounter such a case, please contact me."
#~ msgstr ""
#~ "Aquesta seq��ncia no assigna privilegis d'usuari diferents als que ja "
#~ "tenia, en cas que us trob�ssiu en aquesta situaci�, poseu-vos en contacte "
#~ "amb mi."

#~ msgid ""
#~ "Should I remove everything below /var/lib/mysql when you purge the mysql-"
#~ "server package with the \"dpkg --purge mysql-server\" command (i.e. "
#~ "remove everything including the configuration) somewhen? (default is not)"
#~ msgstr ""
#~ "Voleu suprimir tots els continguts de /var/lib/mysql quan es purgui el "
#~ "paquet mysql-server amb l'ordre \"dpkg --purge mysql-server\". (ex. "
#~ "suprimir-ho tot incl�s la configuraci�) ? (per defecte no)"

#~ msgid "Make MySQL reachable via network?"
#~ msgstr "Voleu fer accessible el MySQL via xarxa ?"

#~ msgid ""
#~ "Should MySQL listen on a network reachable TCP port? This is not "
#~ "necessary for use on a single computer and could be a security problem."
#~ msgstr ""
#~ "Voleu que el MySQL escolti a un port TCP accessible des de la xarxa ? "
#~ "Aquesta opci� no �s imprescindible en ordinadors a�llats i podria "
#~ "provocar un problema de seguretat."

#~ msgid "Enable chroot mode?"
#~ msgstr "Permetre el mode chroot ?"

#~ msgid ""
#~ "MySQL is able to jail itself into the /var/lib/mysql_jail directory so "
#~ "that users cannot modify any files outside this directory. This improves "
#~ "resistence against crackers, too, as they are not able to modify system "
#~ "files."
#~ msgstr ""
#~ "El MySQL es pot executar en una entorn tancat al directori /var/lib/"
#~ "mysql_jail perqu� els usuaris no puguin modificar cap fitxer fora del "
#~ "directori.Aquesta opci� tamb� augmenta la seguretat envers els crackers, "
#~ "jaque no poden modificar els fitxers del sistema."

0 comments on commit 984d710

Please sign in to comment.