kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix hang while picking schema in query browser [1]

Browse source 
- Add patch for automatic column width in query browser [2]

PR:		[1] 132352
Submitted by:	[1] Henry Hu <henry.hu.sh@gmail.com>
		[2] Joerg Wunsch <j@uriah.heep.sax.de> (via private e-mail)
Patch from:	[1] http://bugs.mysql.com/bug.php?id=30055
		[2] http://bugs.mysql.com/bug.php?id=11461
This commit is contained in:
Pietro Cerutti 2009-07-16 15:10:58 +00:00
parent b65d272c2f
commit 6dc4e42629
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=237935
3 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
databases/mysql-gui-tools/Makefile
View file

@ -61,7 +61,7 @@ post-patch:
# switch to new directory name not complete
(cd ${WRKSRC} && ${LN} -sf common mysql-gui-common)
# UTF-8 input file
(${TR} -d "\357\273\277" < \
(LC_CTYPE=C ${TR} -d "\357\273\277" < \
${WRKSRC}/common/library/base-library/source/myx_database_model.c > \
${WRKSRC}/common/library/base-library/source/myx_database_model.c.new && \
${MV} ${WRKSRC}/common/library/base-library/source/myx_database_model.c.new \

45
databases/mysql-gui-tools/files/patch-automatic_column_width Normal file
View file

@ -0,0 +1,45 @@
--- query-browser/source/linux/MQResultSetView.cc~ 2007-04-27 14:46:09.000000000 +0200
+++ query-browser/source/linux/MQResultSetView.cc 2009-01-04 20:59:03.000000000 +0100
@@ -474,7 +474,29 @@
PIXCACHE->load("field_overlay_view.png"),
PIXCACHE->load("field_overlay_null.png"));
rend->set_blob_icon(PIXCACHE->load("blob_icon.png"));
- rend->set_max_text_width(prefs.max_blob_length);
+ if (prefs.max_blob_length == 0)
+ {
+ unsigned int w = 1;
+
+ if (result->columns[i].column_type == MYX_RSCT_TEXT)
+ for (unsigned int j = 0; j < result->rows_num; j++)
+ {
+ gchar *gcp;
+ gssize nbytes = result->rows[j].fields[i].value_length;
+
+ if ((gcp = g_utf8_strchr(result->rows[j].fields[i].value,
+ nbytes, g_utf8_get_char("\n"))) != NULL)
+ nbytes = gcp - result->rows[j].fields[i].value;
+ glong this_len = g_utf8_strlen(result->rows[j].fields[i].value, nbytes);
+ if (this_len > w)
+ w = this_len;
+ }
+ rend->set_max_text_width(w);
+ }
+ else
+ {
+ rend->set_max_text_width(prefs.max_blob_length);
+ }
rend->property_column()= i;
rend->set_delegate(this);
--- query-browser/res/linux/qb_preferences.glade~ 2006-05-16 03:04:19.000000000 +0200
+++ query-browser/res/linux/qb_preferences.glade 2009-01-02 19:14:04.000000000 +0100
@@ -116,7 +116,8 @@
<widget class="GtkLabel" id="label35">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;small&gt;BLOB/text columns in resultsets will be truncated
-to this size for display.&lt;/small&gt;</property>
+to this size for display. Value 0 means automatic
+column width (i.e., width of largest value).&lt;/small&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>

12
databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQQueryDispatcher.cc Normal file
View file

@ -0,0 +1,12 @@
--- query-browser/source/linux/MQQueryDispatcher.cc.orig 2009-07-16 16:30:10.000000000 +0200
+++ query-browser/source/linux/MQQueryDispatcher.cc 2009-07-16 16:33:04.000000000 +0200
@@ -558,9 +558,6 @@
Gtk::Main::instance()->run();
- while(!req->is_complete())
- ;
-
return sps;
}